Merge branch 'google' into qiye

.idea/misc.xml

@@ -13,7 +13,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.39375" />
-        <entry key="app/src/main/res/drawable/default_splash.xml" value="0.3932291666666667" />
+        <entry key="app/src/main/res/drawable/default_splash.xml" value="0.33" />
         <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.39375" />
         <entry key="app/src/main/res/drawable/splash.xml" value="0.3932291666666667" />
         <entry key="app/src/main/res/layout/activity_splash.xml" value="0.3259668508287293" />
@@ -183,6 +183,7 @@
         <entry key="tuikit/src/main/res/layout/fragment_face.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/group_apply_manager_activity.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/group_apply_manager_layout.xml" value="0.3776041666666667" />
+        <entry key="tuikit/src/main/res/layout/group_member_layout.xml" value="0.2791666666666667" />
         <entry key="tuikit/src/main/res/layout/group_member_pop_menu.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/item_contact_search.xml" value="0.3776041666666667" />
         <entry key="tuikit/src/main/res/layout/item_converation_search.xml" value="0.39166666666666666" />

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" />

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>

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
     }
 

room/src/main/java/com/swago/room/user/UserRoomActivity.kt

@@ -26,7 +26,6 @@ import com.swago.baseswago.baseroom.ui.AbsUserActivity
 import com.swago.baseswago.constant.ARouteConstant
 import com.swago.baseswago.databinding.ActivityAbsRoomUserBinding
 import com.swago.baseswago.model.MomentModel
-import com.swago.baseswago.model.UserInfoModel
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.LogUtil
 import com.swago.baseswago.util.NoDoubleClickListener
@@ -35,7 +34,6 @@ import com.swago.room.R
 import com.swago.room.base.NoContentFragment
 import com.swago.room.bean.UserRoomModel
 import com.swago.room.data.RoomDataManager
-import com.swago.room.service.AgoraForegroundService
 import com.swago.room.vm.MsgVm
 import com.swago.room.vm.RoomOtherVm
 import com.swago.room.vm.RoomVm
@@ -56,8 +54,6 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
     private val userVm by viewModels<UserVm>()
     private val roomOtherVm by viewModels<RoomOtherVm>()
 
-    private var agoraService: Intent? = null
-
     private val fragments = arrayListOf(NoContentFragment(), UserRoomFragment())
 
     private val adapter = SwagoAdapter(fragments, supportFragmentManager)
@@ -106,7 +102,6 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
         roomVm.init()
         msgVm.init()
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        agoraService = Intent(this, AgoraForegroundService::class.java)
 
         AgoraManager.setVideoConfiguration()
         AgoraManager.setClientRole(RoleType.user)
@@ -198,24 +193,7 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
         SwagoRoomManager.closeRoom()
     }
 
-    override fun onResume() {
-        super.onResume()
-        agoraService?.let {
-            it.action = AgoraForegroundService.ACTION_STOP_FOREGROUND_SERVICE
-            startService(it)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        agoraService?.let {
-            it.action = AgoraForegroundService.ACTION_START_FOREGROUND_SERVICE
-            startService(it)
-        }
-    }
-
     override fun onDestroy() {
-        agoraService?.let { stopService(it) }
         super.onDestroy()
     }
 

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")
             }
         }
     }