JaycePC 1 vecka sedan
förälder
incheckning
bc6af0496a

+ 1 - 1
app/build.gradle

@@ -53,7 +53,7 @@ android {
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach { output ->
             def formattedDate = new Date().format('yyyyMMddHHmm')
-            output.outputFileName = "xn_xxp_${variant.versionName}_${formattedDate}.apk"
+            output.outputFileName = "baotou_xxp_${variant.versionName}_${formattedDate}.apk"
         }
     }
 

+ 0 - 27
app/src/main/java/http/config/ConfigCore.kt

@@ -1,27 +0,0 @@
-//package http.config
-//
-//import http.HttpConfig
-//
-//object ConfigCore {
-//
-//    fun initConfig(config: ConfigParam?, baseUrlSp: String?, signInCheckBaseUrlSp: String?, apiVersion: Int) {
-//        if (null != config) {
-//            HttpConfig.API_BASE_URL = if (baseUrlSp.isNullOrEmpty()) config.baseUrl else baseUrlSp
-//            HttpConfig.SIGN_IN_CHECK_BASE_URL =
-//                if (signInCheckBaseUrlSp.isNullOrEmpty()) config.signInCheckBaseUrl else signInCheckBaseUrlSp
-//            HttpConfig.HTTP_STRATEGY = config.httpStrategy
-//
-//            when (apiVersion) {
-//                HttpConfig.ApiVersion.V1.code -> {
-//                    HttpConfig.BASE_PATH_FACE = HttpConfig.BasePathV1.FACE
-//                    HttpConfig.BASE_PATH_SPEAK = HttpConfig.BasePathV1.SPEAK
-//                }
-//                HttpConfig.ApiVersion.V2.code -> {
-//                    HttpConfig.BASE_PATH_FACE = HttpConfig.BasePathV2.ALGORITHM
-//                    HttpConfig.BASE_PATH_SPEAK = HttpConfig.BasePathV2.ALGORITHM
-//                }
-//            }
-//        }
-//    }
-//
-//}

+ 0 - 27
app/src/main/java/http/config/ConfigFactory.kt

@@ -1,27 +0,0 @@
-//package http.config
-//
-//import http.HttpConfig
-//
-//class ConfigFactory {
-//
-//    companion object {
-//        val buildDebugConfig = ConfigParam.Builder()
-//            .baseUrl("http://192.168.1.8/api/")
-//            .signInCheckBaseUrl("http://10.20.10.7/labSystem/algorithm/")
-//            .httpStrategy(HttpConfig.HTTP_STRATEGY_Retrofit)
-//            .mqttServerUri("tcp://192.168.1.8:1883")
-//            .mqttUName("mqtt")
-//            .mqttUPwd("mqtt@zd1883")
-//            .build()
-//
-//        val buildReleaseConfig = ConfigParam.Builder()
-//            .baseUrl("http://172.16.0.65/api/")
-//            .signInCheckBaseUrl("http://192.168.251.2:9015/")
-//            .httpStrategy(HttpConfig.HTTP_STRATEGY_Retrofit)
-//            .mqttServerUri("tcp://172.16.0.65:31072")
-//            .mqttUName("mqtt")
-//            .mqttUPwd("mqtt@zd1883")
-//            .build()
-//    }
-//
-//}

+ 2 - 2
app/src/main/java/xn/xxp/home/setting/SettingActivity.java

@@ -119,9 +119,9 @@ public class SettingActivity extends AppCompatActivity {
             });
 
             binding.testBaseUrlBT.setOnClickListener(v -> binding.httpUriET.setText("http://192.168.1.8/api/"));
-            binding.xnBaseUrlBT.setOnClickListener(v -> binding.httpUriET.setText("http://172.16.0.65/api/"));
+            binding.xnBaseUrlBT.setOnClickListener(v -> binding.httpUriET.setText("http://10.148.100.82/api/"));
             binding.testMqttBT.setOnClickListener(v -> binding.mqttUriET.setText("tcp://192.168.1.8:1883"));
-            binding.xnMqttBT.setOnClickListener(v -> binding.mqttUriET.setText("tcp://172.16.0.65:31072"));
+            binding.xnMqttBT.setOnClickListener(v -> binding.mqttUriET.setText("tcp://10.148.100.82:31072"));
         } catch (Exception e) {
             LogUtils.e(Log.getStackTraceString(e));
         }

+ 2 - 2
app/src/main/java/xn/xxp/room/bean/DeviceConfig.java

@@ -10,10 +10,10 @@ public class DeviceConfig {
 
     private String ip = "";
     private String devId = "";
-    private String baseUrl = "http://172.16.0.65/api/";
+    private String baseUrl = "http://10.148.100.82/api/";
     private String mqttName = "mqtt";
     private String mqttPas = "mqtt@zd1883";
-    private String mqttAddress = "tcp://172.16.0.65:31072";
+    private String mqttAddress = "tcp://10.148.100.82:31072";
     private String adminPas = "admin@098&";
     private String terminalAuth = "";