honghengqiang 3 年之前
父節點
當前提交
5d0352205b

+ 1 - 3
app/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Swago">
         <activity android:name=".SplashActivity"
-            android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/Theme.Swago.splashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -49,11 +49,9 @@
         <meta-data android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id"/>
         <activity android:name="com.facebook.FacebookActivity"
-            android:screenOrientation="portrait"
             android:configChanges= "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name" />
         <activity android:name="com.facebook.CustomTabActivity"
-            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

+ 0 - 1
app/src/main/res/values/styles.xml

@@ -2,7 +2,6 @@
 <resources>
     <style name="Theme.Swago.splashTheme" parent="Theme.Swago">
         <item name="windowNoTitle">true</item>
-        <item name="android:windowFullscreen">false</item>
         <item name="android:windowBackground">@drawable/default_splash</item>
         <item name="android:windowTranslucentStatus">true</item>
     </style>

+ 1 - 0
room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -386,6 +386,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
 
     override fun onPause() {
         super.onPause()
+        gameDialog?.dismissAllowingStateLoss()
         msgVm.isReady = false
     }
 

+ 20 - 11
user/src/main/java/com/swago/user/FollowAndFansActivity.kt

@@ -1,6 +1,7 @@
 package com.swago.user
 
 import android.graphics.Rect
+import android.os.Bundle
 import android.view.View
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,7 +27,7 @@ import com.swago.user.adapter.FollowFanAdapter
  */
 
 @Route(path = ARouteConstant.User.followFan)
-class FollowAndFansActivity : BaseListActivity<LayoutListBinding,BlackListModel.ListBean>() {
+class FollowAndFansActivity : BaseListActivity<LayoutListBinding, BlackListModel.ListBean>() {
 
     /**
      * 0 关注列表
@@ -34,7 +35,7 @@ class FollowAndFansActivity : BaseListActivity<LayoutListBinding,BlackListModel.
      */
     @Autowired(required = true)
     @JvmField
-    var type:Int = 0
+    var type: Int = 0
 
     private var position = -1
 
@@ -51,36 +52,44 @@ class FollowAndFansActivity : BaseListActivity<LayoutListBinding,BlackListModel.
         LinearLayoutManager(this)
     }
     override val loadData: (page: Int) -> Unit = {
-        userVm.getFollowList(it+1,type)
+        userVm.getFollowList(it + 1, type)
     }
 
-    override fun initViewData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
         ARouter.getInstance().inject(this)
+        super.onCreate(savedInstanceState)
+    }
+
+
+    override fun initViewData() {
         smartRecyclerView.recyclerView?.addItemDecoration(ListItemDecoration())
 
         setBackView(binding.toolbar.ivBack)
 
-        when(type){
+        when (type) {
             0 -> {
-                binding.toolbar.tvTitle.text = AppContext.getContext().resources.getString(R.string.following)
+                binding.toolbar.tvTitle.text =
+                    AppContext.getContext().resources.getString(R.string.following)
             }
 
             1 -> {
-                binding.toolbar.tvTitle.text = AppContext.getContext().resources.getString(R.string.followers)
+                binding.toolbar.tvTitle.text =
+                    AppContext.getContext().resources.getString(R.string.followers)
             }
         }
 
         adapter.setOnItemChildClickListener { _, _, position ->
             this.position = position
-            userVm.followUser(adapter.data[position].id,1)
+            userVm.followUser(adapter.data[position].id, 1)
         }
 
         adapter.setOnItemClickListener { _, _, position ->
-            if (adapter.data.size>position){
-                PersonDataDFragment.newInstance(adapter.data[position].id,
+            if (adapter.data.size > position && position >= 0) {
+                PersonDataDFragment.newInstance(
+                    adapter.data[position].id,
                     isAnchor = false,
                     inRoom = false
-                ).show(supportFragmentManager,"PersonDataDFragment")
+                ).show(supportFragmentManager, "PersonDataDFragment")
             }
         }
     }