honghengqiang 2 anos atrás
pai
commit
4294a843d9

+ 2 - 2
app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swagolite.app"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 1000
-        versionName "1.0.0.0"
+        versionCode 1001
+        versionName "1.0.0.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

+ 2 - 2
app/src/main/java/com/swago/app/SplashVm.kt

@@ -105,8 +105,8 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
-            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
-//            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
+//            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
+            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
 //            UrlConstant.BASE_URL =    "https://api.swagobei.com"
 //            UrlConstant.BASE_URL =   "http://advance.swago.cn"
 //            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"

+ 2 - 2
baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -14,8 +14,8 @@ import java.io.File
 object UrlConstant {
 
     var BASE_URL = if (BuildConfig.DEBUG) {
-            "http:test-api.swago.cn"
-//            "http:huawei.swago.cn"
+//            "http:test-api.swago.cn"
+            "http:huawei.swago.cn"
 //        "https://api.swagobei.com"
 //        "http://advance.swago.cn"
 //        "https://pro-api.swago.cn"

+ 1 - 1
login/src/main/java/com/swago/login/LoginActivity.kt

@@ -124,7 +124,7 @@ class LoginActivity : BaseXActivity<ActivityLoginBinding>() {
                     binding.etAccount.visibility = View.GONE
                     binding.etSecret.visibility = View.GONE
                     binding.ivAccountLogin.visibility = View.GONE
-                    binding.clFaceBook.visibility = View.GONE
+                    binding.clFaceBook.visibility = View.VISIBLE
                     binding.clGoogle.visibility = View.VISIBLE
                     binding.tvAccountLogin.text = AppContext.getContext().resources.getString(R.string.acccount_login)
                 }else{

+ 1 - 1
login/src/main/res/layout/activity_login.xml

@@ -46,7 +46,7 @@
         android:layout_marginBottom="202dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:background="@drawable/shape_white_37"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"