Merge branch 'google' into qiye

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

@@ -22,28 +22,16 @@ class SplashActivity : AppCompatActivity() {
 
     private val splashVm by viewModels<SplashVm>()
 
-    private val gson by lazy {
-        Gson()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
 
-        splashVm.getAppConfig()
-
-        splashVm.appConfigLiveData.observe(this){
-            SpUtil.putString("configModel", gson.toJson(it))
-            UrlConstant.setAgoraId(it.agoral_app_id)
-            UrlConstant.setImId(it.im_app_id)
-            if (UserInfo.getLoginModel() == null){
-                ARouter.getInstance().build(ARouteConstant.Login.login).navigation()
-                finish()
-            }else{
-                splashVm.loginByAuto()
-            }
+        if (UserInfo.getLoginModel() == null){
+            ARouter.getInstance().build(ARouteConstant.Login.login).navigation()
+            finish()
+        }else{
+            splashVm.loginByAuto()
         }
-
     }
 
 

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

@@ -30,18 +30,4 @@ class SplashVm (application: Application) : BaseViewModel(application) {
                 .withFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP).navigation()
         }
     }
-
-
-    val appConfigLiveData by lazy {
-        MutableLiveData<ConfigModel>()
-    }
-    /**
-     * 获取配置
-     */
-    fun getAppConfig(){
-        requestData {
-            val data = ApiManager.configApi.getAppConfig()
-            appConfigLiveData.value = data
-        }
-    }
 }

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

@@ -13,6 +13,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInStatusCodes
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.common.api.CommonStatusCodes
+import com.google.gson.Gson
 import com.permissionx.guolindev.PermissionX
 import com.swago.baseswago.activity.BaseXActivity
 import com.swago.baseswago.constant.ARouteConstant
@@ -36,6 +37,11 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
     private var isAccountLogin = false
 
 
+    private val gson by lazy {
+        Gson()
+    }
+
+
     override fun loadData() {
 
     }
@@ -49,7 +55,6 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
             }
         })
 
-
         binding.clFaceBook.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 if (SwagoShareUtils.isInstall(this@LoginActivity,FACEBOOK)){
@@ -160,7 +165,14 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
         })
     }
 
-    override fun initLiveData() {}
+    override fun initLiveData() {
+        loginVm.appConfigLiveData.observe(this){
+            SpUtil.putString("configModel", gson.toJson(it))
+            UrlConstant.setAgoraId(it.agoral_app_id)
+            UrlConstant.setImId(it.im_app_id)
+
+        }
+    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -205,5 +217,8 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
     }
 
 
-
+    override fun onResume() {
+        super.onResume()
+        loginVm.getAppConfig()
+    }
 }

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

@@ -10,6 +10,7 @@ import com.google.gson.Gson
 import com.swago.baseswago.constant.ARouteConstant
 import com.swago.baseswago.http.SwagoException
 import com.swago.baseswago.inter.ApiManager
+import com.swago.baseswago.model.ConfigModel
 import com.swago.baseswago.util.*
 import com.tencent.imsdk.v2.V2TIMCallback
 import com.tencent.qcloud.tim.uikit.TUIKit
@@ -55,4 +56,17 @@ class LoginVm(application: Application) : BaseViewModel(application) {
         }
     }
 
+
+    val appConfigLiveData by lazy {
+        MutableLiveData<ConfigModel>()
+    }
+    /**
+     * 获取配置
+     */
+    fun getAppConfig(){
+        requestData {
+            val data = ApiManager.configApi.getAppConfig()
+            appConfigLiveData.value = data
+        }
+    }
 }

room/src/main/res/layout/activity_anchor_room.xml

@@ -55,7 +55,7 @@
             android:id="@+id/ivPrepareCamera"
             android:layout_marginTop="40dp"
             android:layout_marginStart="10dp"
-            android:padding="6dp"
+            android:padding="10dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:background="@drawable/shape_20000000_41"