Merge remote-tracking branch 'origin/main_lvmeng_0131' into main_lvmeng_0131

app/src/main/java/com/sw/inbound/GlobalData.kt

@@ -43,8 +43,9 @@ object GlobalData {
     /**
      * 具体业务baseurl
      */
-    //var appBaseUrl: String = "http://192.168.1.201:14801"
-    var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
+    var testAppBaseUrl: String = "http://192.168.1.201:14801"
+    var proAppBaseUrl: String = "https://dev.yixiong-tech.com:8081"
+    var appBaseUrl: String = ""
 
     /**
      * 设备id

app/src/main/java/com/sw/inbound/activity/InitActivity.kt

@@ -8,6 +8,7 @@ import android.os.Looper
 import android.os.SystemClock
 import android.view.KeyEvent
 import android.view.animation.RotateAnimation
+import com.sw.inbound.GlobalData
 import com.sw.inbound.base.BaseActivity
 import com.sw.inbound.databinding.ActivityInitBinding
 import com.sw.inbound.utils.NetworkUtils
@@ -137,6 +138,11 @@ class InitActivity : BaseActivity() {
      * 跳转到 HomeActivity
      */
     private fun navigateToHome() {
+        GlobalData.appBaseUrl = GlobalData.proAppBaseUrl
+        val list = listOf("5a41a2cf-3cee-3731-911d-a28b10164f7a", "f0bcabbb-0d58-3b14-8bed-9863b7ec61ef")
+        if (list.contains(GlobalData.deviceId)) {
+            GlobalData.appBaseUrl = GlobalData.testAppBaseUrl
+        }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)
         finish()

build.gradle.kts

@@ -28,9 +28,9 @@ buildscript {
         mavenCentral()
     }
 }
-plugins {
-    alias(libs.plugins.kotlin.compose) apply false
-}
+//plugins {
+//    alias(libs.plugins.kotlin.compose) apply false
+//}
 
 allprojects {
     repositories {