feat: push pkJoinFail

app/src/main/java/com/swago/app/SplashActivity.kt

@@ -33,32 +33,7 @@ class SplashActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
-            PermissionX.init(this@SplashActivity)
-                .permissions(
-                    Manifest.permission.READ_MEDIA_IMAGES,
-                    Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                )
-                .request { allGranted, grantedList, deniedList ->
-                    if (allGranted) {
-                        splashVm.getApiDomain()
-                        splashVm.jumpToLoginLiveData.observe(this){
-                            if (!it){
-                                ARouter.getInstance().build(ARouteConstant.Login.login).navigation()
-                                finish()
-                            }
-                        }
-                    } else {
-                        Toast.makeText(
-                            this@SplashActivity,
-                            getString(R.string.these_permissions_denied)+" $deniedList",
-                            Toast.LENGTH_LONG
-                        ).show()
-                        ARouter.getInstance().build(ARouteConstant.Login.login).navigation()
-                        finish()
-                    }
-                }
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
             PermissionX.init(this@SplashActivity)
                 .permissions(
                     Manifest.permission.READ_MEDIA_IMAGES,

baseswago/src/main/java/com/swago/baseswago/inter/RoomApi.kt

@@ -409,6 +409,13 @@ interface RoomApi {
     @POST("/v1/rtc/broadcast/pk/act")
     suspend fun pkSure(@Field("pk_id") pk_id: String): Any
 
+    /**
+     * 加入pk频道异常回调
+     */
+    @FormUrlEncoded
+    @POST("/v1/rtc/broadcast/pk/join/fail")
+    suspend fun pkJoinFail(@Field("pk_id") pk_id: String): Any
+
 
     /**
      * 获取直播间信息

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -119,57 +119,55 @@ object SwagoInfo {
     }
 
     private fun getUniqueDeviceId():String{
-        if (PermissionX.isGranted(AppContext.getContext(), Manifest.permission.READ_EXTERNAL_STORAGE)){
-           if (AppContext.getContext().getExternalFilesDir(null) == null){
-               return ""
-           }else{
-               val path = "${AppContext.getContext().getExternalFilesDir(null)!!.path}/swagoFile"
-               val pathFile = File("$path/uuid.txt")
-               if (pathFile.exists()){
-                   var br: BufferedReader? = null
-                   var isr: InputStreamReader? = null
-                   try {
-                       isr = InputStreamReader(FileInputStream(pathFile))
-                       br = BufferedReader(isr)
-                       val stringBuilder = StringBuffer()
-                       var line:String?
-                       while (br.readLine().also { line = it } != null) {
-                           stringBuilder.append(line)
-                       }
-                       LogUtil.d("设备唯一标识","本地文件获取："+stringBuilder.toString())
-                       return stringBuilder.toString()
-                   }catch (e:Exception){
-                       e.printStackTrace()
-                   }finally {
-                       try {
-                           isr?.close()
-                           br?.close()
-                       } catch (e: Exception) {
-                           e.printStackTrace()
-                       }
-                   }
-               }else{
-                   File(path).mkdirs()
-                   pathFile.createNewFile()
-                   val rawImei = "${System.currentTimeMillis()}${"Android ${Build.VERSION.RELEASE}"}"
-                   val imei = MD5Util.md5Hex(rawImei)
-                   var writer:FileWriter? = null
-                   try {
-                       writer = FileWriter(pathFile)
-                       writer.write(imei)
-                       LogUtil.d("设备唯一标识","创建的时候获取："+imei)
-                       return imei
-                   }catch (e:Exception){
-                       e.printStackTrace()
-                   }finally {
-                       try {
-                           writer?.close()
-                       } catch (e: Exception) {
-                           e.printStackTrace()
-                       }
-                   }
-               }
-           }
+        if (AppContext.getContext().getExternalFilesDir(null) == null){
+            return ""
+        }else{
+            val path = "${AppContext.getContext().getExternalFilesDir(null)!!.path}/swagoFile"
+            val pathFile = File("$path/uuid.txt")
+            if (pathFile.exists()){
+                var br: BufferedReader? = null
+                var isr: InputStreamReader? = null
+                try {
+                    isr = InputStreamReader(FileInputStream(pathFile))
+                    br = BufferedReader(isr)
+                    val stringBuilder = StringBuffer()
+                    var line:String?
+                    while (br.readLine().also { line = it } != null) {
+                        stringBuilder.append(line)
+                    }
+                    LogUtil.d("设备唯一标识","本地文件获取："+stringBuilder.toString())
+                    return stringBuilder.toString()
+                }catch (e:Exception){
+                      e.printStackTrace()
+                }finally {
+                    try {
+                        isr?.close()
+                        br?.close()
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }else{
+                File(path).mkdirs()
+                pathFile.createNewFile()
+                val rawImei = "${System.currentTimeMillis()}${"Android ${Build.VERSION.RELEASE}"}"
+                val imei = MD5Util.md5Hex(rawImei)
+                var writer:FileWriter? = null
+                try {
+                    writer = FileWriter(pathFile)
+                    writer.write(imei)
+                    LogUtil.d("设备唯一标识","创建的时候获取："+imei)
+                    return imei
+                }catch (e:Exception){
+                    e.printStackTrace()
+                }finally {
+                    try {
+                        writer?.close()
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }
         }
         return ""
     }

login/src/main/java/com/swago/login/LoginActivity.kt

@@ -58,25 +58,7 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
         binding.clFaceBook.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 if (SwagoShareUtils.isInstall(this@LoginActivity,FACEBOOK)){
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
-                        PermissionX.init(this@LoginActivity)
-                            .permissions(
-                                Manifest.permission.READ_MEDIA_IMAGES,
-                                Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                            )
-                            .request { allGranted, grantedList, deniedList ->
-                                if (allGranted) {
-                                    FBLogin.login(this@LoginActivity)
-                                } else {
-                                    FBLogin.login(this@LoginActivity)
-                                    Toast.makeText(
-                                        this@LoginActivity,
-                                        AppContext.getContext().resources.getString(R.string.these_permissions_denied)+ "$deniedList",
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                }
-                            }
-                    }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
                         PermissionX.init(this@LoginActivity)
                             .permissions(
                                 Manifest.permission.READ_MEDIA_IMAGES
@@ -120,25 +102,7 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
         binding.clGoogle.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 if (SwagoShareUtils.isInstall(this@LoginActivity,GOOGLE)) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
-                        PermissionX.init(this@LoginActivity)
-                            .permissions(
-                                Manifest.permission.READ_MEDIA_IMAGES,
-                                Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                            )
-                            .request { allGranted, grantedList, deniedList ->
-                                if (allGranted) {
-                                    GoogleLogin.login(this@LoginActivity)
-                                } else {
-                                    GoogleLogin.login(this@LoginActivity)
-                                    Toast.makeText(
-                                        this@LoginActivity,
-                                        getString(R.string.these_permissions_denied)+"$deniedList",
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                }
-                            }
-                    }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
+                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
                         PermissionX.init(this@LoginActivity)
                             .permissions(
                                 Manifest.permission.READ_MEDIA_IMAGES
@@ -219,31 +183,7 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
 
         binding.ivAccountLogin.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE){
-                    PermissionX.init(this@LoginActivity)
-                        .permissions(
-                            Manifest.permission.READ_MEDIA_IMAGES,
-                            Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                        )
-                        .request { allGranted, grantedList, deniedList ->
-                            if (allGranted) {
-                                SwagoLoading.showLoadingDialog(this@LoginActivity)
-                                val account = binding.etAccount.text.toString()
-                                val secret = binding.etSecret.text.toString()
-                                loginVm.loginByAccount(account, secret)
-                            } else {
-                                SwagoLoading.showLoadingDialog(this@LoginActivity)
-                                val account = binding.etAccount.text.toString()
-                                val secret = binding.etSecret.text.toString()
-                                loginVm.loginByAccount(account, secret)
-                                Toast.makeText(
-                                    this@LoginActivity,
-                                    getString(R.string.these_permissions_denied)+" $deniedList",
-                                    Toast.LENGTH_LONG
-                                ).show()
-                            }
-                        }
-                }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
+                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){
                     PermissionX.init(this@LoginActivity)
                         .permissions(
                             Manifest.permission.READ_MEDIA_IMAGES

room/src/main/java/com/swago/room/anchor/AnchorRoomActivity.kt

@@ -393,8 +393,12 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
     }
 
     override fun onChannelMediaRelayStateChanged(state: Int, code: Int) {
-        if (PKStateManager.roomState == PKStateManager.PK && state == 2 && code == 0) {
-            pkVm.pkSure(PKStateManager.pkId)
+        if (PKStateManager.roomState == PKStateManager.PK) {
+            if (state == 2 && code == 0){
+                pkVm.pkSure(PKStateManager.pkId)
+            } else if (state == 3){
+                pkVm.pkJoinFail(PKStateManager.pkId)
+            }
         }
     }
 

room/src/main/java/com/swago/room/pk/PkVm.kt

@@ -176,7 +176,14 @@ class PkVm(application: Application) : AbsMsgVm(application) {
             ApiManager.roomApi.pkSure(pkId)
         }
     }
-
+    /**
+     * 加入pk频道异常
+     */
+    fun pkJoinFail(pkId: String) {
+        requestData {
+            ApiManager.roomApi.pkJoinFail(pkId)
+        }
+    }
 
     val acceptOrRefuseLiveData by lazy {
         MutableLiveData<Int>()