d

.idea/misc.xml

@@ -14,7 +14,7 @@
       <map>
         <entry key="../../../../layout/custom_preview.xml" value="0.4009259259259259" />
         <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" />
@@ -191,6 +191,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" />

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