From cf73819ad007c3ad11aac529cbfbc69c717f5bc5 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Thu, 20 Nov 2025 10:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/base/CommonAppContext.java     |  5 ++--
 .../com/xscm/moduleutil/bean/UserInfo.java    |  2 +-
 .../res/layout/me_view_decoration_head.xml    |  6 ++--
 .../src/main/res/layout/activity_login.xml    |  1 +
 .../res/layout/fragment_room_user_info.xml    | 28 +++++++++++--------
 .../res/layout/activity_password_login.xml    |  1 +
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 170922cb..f38dff3d 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -159,12 +159,11 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         }
 
         //设置mqtt环境 false 测试环境 true 正式环境
-//        ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
+//      ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
         //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
-
         initialization();
     }
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
index 6f3a1c5c..8ac96d5b 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -102,7 +102,7 @@ public class UserInfo extends BaseEvent implements Serializable {
           public String pendant;
           public String direction;
           public UserInfo1 user_info1;
-          public UserInfo1 user_info2;
+          public UserInfo2 user_info2;
 
         public static class UserInfo1{
             public String user_id;
diff --git a/BaseModule/src/main/res/layout/me_view_decoration_head.xml b/BaseModule/src/main/res/layout/me_view_decoration_head.xml
index e230ba8c..6fb3583e 100644
--- a/BaseModule/src/main/res/layout/me_view_decoration_head.xml
+++ b/BaseModule/src/main/res/layout/me_view_decoration_head.xml
@@ -19,7 +19,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.8"
+        app:layout_constraintWidth_percent="0.95"
         app:riv_oval="true" />
 
     <ImageView
@@ -40,7 +40,7 @@
         android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintWidth_percent="0.85"
+        app:layout_constraintWidth_percent="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -50,7 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_1"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.53" />
+        app:layout_constraintGuide_percent="0.59" />
 
     <ImageView
         android:id="@+id/iv_frame_bg"
diff --git a/MainModule/src/main/res/layout/activity_login.xml b/MainModule/src/main/res/layout/activity_login.xml
index b3a422c6..9cd7bcc0 100644
--- a/MainModule/src/main/res/layout/activity_login.xml
+++ b/MainModule/src/main/res/layout/activity_login.xml
@@ -306,6 +306,7 @@
                             android:layout_width="@dimen/dp_15"
                             android:layout_height="@dimen/dp_15"
                             android:layout_marginEnd="@dimen/dp_5"
+                            android:checked="true"
                             android:background="@drawable/selector_login_agreement"
                             android:button="@null" />
 
diff --git a/MainModule/src/main/res/layout/fragment_room_user_info.xml b/MainModule/src/main/res/layout/fragment_room_user_info.xml
index 1b96c197..8f184845 100644
--- a/MainModule/src/main/res/layout/fragment_room_user_info.xml
+++ b/MainModule/src/main/res/layout/fragment_room_user_info.xml
@@ -25,8 +25,8 @@
 
             <com.xscm.moduleutil.utils.MeHeadView
                 android:id="@+id/iv_avatar"
-                android:layout_width="@dimen/dp_90"
-                android:layout_height="@dimen/dp_90"
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_84"
                 android:layout_marginVertical="@dimen/dp_32"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -73,15 +73,6 @@
                 app:layout_constraintStart_toEndOf="@+id/tv_name"
                 app:layout_constraintTop_toTopOf="@+id/tv_name" />
 
-            <ImageView
-                android:id="@+id/im_qml"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_22"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:src="@mipmap/qgrml"
-                app:layout_constraintBottom_toBottomOf="@+id/room_m_cz"
-                app:layout_constraintEnd_toStartOf="@+id/room_m_cz"
-                app:layout_constraintTop_toTopOf="@+id/room_m_cz" />
 
 
             <TextView
@@ -185,6 +176,8 @@
                 tools:visibility="visible" />
 
 
+
+
             <ImageView
                 android:id="@+id/im_qing"
                 android:layout_width="@dimen/dp_66"
@@ -213,6 +206,19 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+
+            <ImageView
+                android:id="@+id/im_qml"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_22"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_13"
+                android:src="@mipmap/qgrml"
+                app:layout_constraintBottom_toBottomOf="@+id/room_m_cz"
+                app:layout_constraintEnd_toStartOf="@+id/room_m_cz"
+                app:layout_constraintTop_toTopOf="@+id/room_m_cz" />
+
+
             <ImageView
                 android:id="@+id/room_dian"
                 android:layout_width="@dimen/dp_16"
diff --git a/app/src/main/res/layout/activity_password_login.xml b/app/src/main/res/layout/activity_password_login.xml
index 0c7b2f3b..8b307b38 100644
--- a/app/src/main/res/layout/activity_password_login.xml
+++ b/app/src/main/res/layout/activity_password_login.xml
@@ -339,6 +339,7 @@
                             android:layout_width="@dimen/dp_15"
                             android:layout_height="@dimen/dp_15"
                             android:layout_marginEnd="@dimen/dp_5"
+                            android:checked="true"
                             android:background="@drawable/selector_login_agreement"
                             android:button="@null" />