From 12a94fdec7b3bdd6695782f284c89c83832685ab Mon Sep 17 00:00:00 2001
From: hwf452 <hwf452@163.com>
Date: Thu, 27 Feb 2025 21:03:09 +0800
Subject: [PATCH] 20250227

---
 app/build.gradle                                          | 1 -
 .../main/java/com/rehome/meetingbook/contans/Contans.java | 2 +-
 .../com/rehome/meetingbook/ui/activity/LoginActivity.java | 8 ++++----
 app/src/main/res/layout/activity_login.xml                | 6 +++---
 app/src/main/res/xml/network_security_config.xml          | 1 +
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0219088..18dc195 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,6 @@ android {
             //修改生成的apk名字
             android.applicationVariants.all { variant ->
                 variant.outputs.all {
-                    //outputFileName = "meetingbook302.apk"
                     outputFileName = "meetingbook303.apk"
                     //outputFileName = "meetingbook105.apk"
                 }
diff --git a/app/src/main/java/com/rehome/meetingbook/contans/Contans.java b/app/src/main/java/com/rehome/meetingbook/contans/Contans.java
index 572d2e2..d0fb2d2 100644
--- a/app/src/main/java/com/rehome/meetingbook/contans/Contans.java
+++ b/app/src/main/java/com/rehome/meetingbook/contans/Contans.java
@@ -9,7 +9,7 @@ public class Contans {
 
 //    public static String IP = "http://10.55.54.200:8500/";
 //    public static String IP = "http://192.168.2.105:1700/";
-    public static String IP = "http://10.55.54.200:1700/";
+    public static String IP = "http://10.55.53.200:1700/";
 
 
 
diff --git a/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java b/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java
index a51d906..497fcc3 100644
--- a/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java
+++ b/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java
@@ -49,9 +49,11 @@ public class LoginActivity extends BaseActivity2<ActivityLoginBinding> {
     private long exitTime = 0;
     //private String meetingRoomName = "报告厅";
     //private String meetingRoomName = "3楼多媒体会议室";
+    //private String meetingRoomName = "302 #2会议室"; //id=5
+
+
 
 
-    //private String meetingRoomName = "302 #2会议室"; //id=5
     //private String meetingRoomName = "105 报告厅";  //id=1
     private String meetingRoomName = "303 多功能会议室";  //id=3
 
@@ -232,9 +234,7 @@ public class LoginActivity extends BaseActivity2<ActivityLoginBinding> {
         if("303 多功能会议室".equals(meetingRoomName)){
             id=3;
         }
-        if("302 #2会议室".equals(meetingRoomName)){
-            id=5;
-        }
+
         String json = getPhoneInfo(id);
         String url = Contans.IP + Contans.GET_MEETING_STATUS;
         Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 00095fc..af8bb2b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -19,7 +19,7 @@
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="180px"
+        android:layout_marginTop="130px"
         android:orientation="vertical">
 
         <TextView
@@ -50,7 +50,7 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/linearLayout"
         android:layout_above="@+id/tv_version"
-        android:layout_marginTop="180px"
+        android:layout_marginTop="130px"
         android:layout_marginBottom="20dp"
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
@@ -77,7 +77,7 @@
             android:id="@+id/ll_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="110px"
+            android:layout_marginTop="90px"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 95f9dee..7f49b3d 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -3,5 +3,6 @@
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">192.168.2.105</domain>
         <domain includeSubdomains="true">10.19.0.73</domain>
+        <domain includeSubdomains="true">10.55.53.200</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file