donggaosheng před 2 měsíci
rodič
revize
4d617205d6

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

@@ -15,10 +15,10 @@
 //            .build()
 //
 //        val buildReleaseConfig = ConfigParam.Builder()
-//            .baseUrl("http://172.16.0.65/api/")
+//            .baseUrl("http://172.21.0.2/api/")
 //            .signInCheckBaseUrl("http://192.168.251.2:9015/")
 //            .httpStrategy(HttpConfig.HTTP_STRATEGY_Retrofit)
-//            .mqttServerUri("tcp://172.16.0.65:31072")
+//            .mqttServerUri("tcp://172.21.0.2:31072")
 //            .mqttUName("mqtt")
 //            .mqttUPwd("mqtt@zd1883")
 //            .build()

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

@@ -128,9 +128,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://172.21.0.2/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://172.21.0.2:31072"));
         } catch (Exception e) {
             LogUtils.e(Log.getStackTraceString(e));
         }

+ 1 - 1
app/src/main/java/xn/xxp/home/sign/SafetyCheckFragment.kt

@@ -185,7 +185,7 @@ class SafetyCheckFragment :
             .logger(loggers(logcat(), fileLogger(requireActivity())))
             .build()
          // 👇 加这一行:旋转预览视图,解决前置摄像头上下颠倒
-         //viewBinding.cameraView.rotation = 180f
+         viewBinding.cameraView.rotation = 180f
 
         // 开始检测
         viewBinding.startCheck.setOnClickListener {

+ 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://172.21.0.2/api/";
     private String mqttName = "mqtt";
     private String mqttPas = "mqtt@zd1883";
-    private String mqttAddress = "tcp://172.16.0.65:31072";
+    private String mqttAddress = "tcp://172.21.0.2:31072";
     private String adminPas = "admin@098&";
     private String terminalAuth = "";
 

+ 1 - 1
app/src/main/res/layout/activity_setting.xml

@@ -292,7 +292,7 @@
                                 android:drawableStart="@drawable/ic_http"
                                 android:drawablePadding="20dp"
                                 android:gravity="start"
-                                android:hint="http://192.168.1.8/api/"
+                                android:hint="http://172.21.0.2/api/"
                                 android:paddingEnd="20dp"
                                 android:text="" />
 

+ 7 - 2
gradle.properties

@@ -14,9 +14,14 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.enableJetifier=true
+android.enableJetifier=true
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=file:///C:/Users/Administrator/.gradle/wrapper/dists/gradle-8.7-bin/af3un6e4ivqgjcdo5lfa5efog/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+android.useAndroidX=true