Browse Source

feat: im升级

tongmengxiao 2 weeks ago
parent
commit
87f26f244e

+ 1 - 1
baseswago/build.gradle

@@ -104,7 +104,7 @@ dependencies {
     //google
     api 'com.google.android.gms:play-services-auth:19.0.0'
     //im
-    api 'com.tencent.imsdk:imsdk-plus:5.9.1872'
+    api 'com.tencent.imsdk:imsdk-plus:7.9.5680'
     //agora
     api "io.agora.rtc:full-rtc-basic:3.7.0.2"
     //支付

+ 1 - 1
baseswago/src/main/java/com/swago/baseswago/http/SwagoInterceptor.kt

@@ -56,7 +56,7 @@ class SwagoInterceptor : Interceptor {
             .addHeader("app-secret", secret)
             .addHeader("app-client-device-id",SwagoInfo.getIMEI())
             .addHeader("app-os",SwagoInfo.getAndroidOS())
-            .addHeader("app-client-operate" , URLEncoder.encode(SwagoInfo.getNetworkOperatorName(),"utf-8"))
+            .addHeader("app-client-operate" , MD5Util.md5Hex("${SwagoInfo.getNetworkOperatorName()}meliv"))
             .build()
         return chain.proceed(finalRequest)
     }

+ 12 - 0
baseswago/src/main/java/com/swago/baseswago/util/BaseViewModel.kt

@@ -35,6 +35,12 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
                                 .withFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                                 .navigation()
                         }
+                    } else if (e.code == 500){
+                        Toast.makeText(
+                            AppContext.getContext(),
+                            e.message,
+                            Toast.LENGTH_SHORT
+                        ).show()
                     }
                 }
             }
@@ -80,6 +86,12 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
                                 .withFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                                 .navigation()
                         }
+                    } else if (e.code == 500){
+                        Toast.makeText(
+                            AppContext.getContext(),
+                            e.message,
+                            Toast.LENGTH_SHORT
+                        ).show()
                     }
                     block.requestError.invoke(e)
                 }else{

+ 3 - 3
room/src/main/java/com/swago/room/game/GamePlayDialog.kt

@@ -92,9 +92,9 @@ class GamePlayDialog : BaseXDFragment<DialogGamePlayBinding>(), IRoomActiveListe
 
                 val imageViewLayoutParams = ConstraintLayout.LayoutParams(DpPxUtil.dip2px(40f),DpPxUtil.dip2px(40f))
                 imageViewLayoutParams.bottomToBottom = R.id.cl
-                imageViewLayoutParams.startToStart = R.id.cl
-                imageViewLayoutParams.marginStart = DpPxUtil.dip2px(35f)
-                imageViewLayoutParams.bottomMargin = DpPxUtil.dip2px(310f)
+                imageViewLayoutParams.leftToLeft = R.id.cl
+                imageViewLayoutParams.leftMargin = DpPxUtil.dip2px(10f)
+                imageViewLayoutParams.bottomMargin = DpPxUtil.dip2px(320f)
                 val imageView = ImageView(activity)
                 imageView.setBackgroundResource(R.drawable.shape_80000000_20)
                 imageView.setImageResource(R.mipmap.live_chat)