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" /> @@ -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" /> 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 @@ @@ -73,15 +73,6 @@ app:layout_constraintStart_toEndOf="@+id/tv_name" app:layout_constraintTop_toTopOf="@+id/tv_name" /> - + + + + + +