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 5505fc02..170922cb 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio //设置mqtt环境 false 测试环境 true 正式环境 // ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false); //设置http环境 false 测试环境 true 正式环境 - ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false); + ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true); currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH(); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLogger.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLogger.java index abebba41..433c279f 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLogger.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/logger/DataLogger.java @@ -65,7 +65,12 @@ public final class DataLogger implements DataLoggingInterceptor.Logger { if (message.startsWith(DataLoggingInterceptor.sLogEndFlag)) { if (mMessage.toString().contains("Xintiao/keep_xintiao")) return; - LogUtils.d(mMessage.toString()); + try { + LogUtils.d(mMessage.toString()); + } catch (StringIndexOutOfBoundsException e) { + // 处理异常,记录日志或使用默认值 + LogUtils.e("打印 JSON 数据时出错:" + e.getMessage()); + } return; } @@ -75,8 +80,11 @@ public final class DataLogger implements DataLoggingInterceptor.Logger { message = formatJson(decodeUnicode(message)); } // 追加消息 - try { mMessage.append(message.concat("\n")); - } catch (Exception ignored) {} + try { + mMessage.append(message.concat("\n")); + } catch (Exception ignored) { + LogUtils.e("打印 JSON append时出错:" + ignored.getMessage()); + } } @Override diff --git a/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml b/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml index 0181a088..93efb45e 100644 --- a/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml +++ b/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml @@ -18,6 +18,7 @@ android:id="@+id/riv" android:layout_width="0dp" android:layout_height="0dp" + android:adjustViewBounds="true" android:layout_marginTop="@dimen/dp_12" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="parent" @@ -35,6 +36,7 @@ android:layout_marginEnd="-4dp" android:layout_marginTop="-4dp" android:layout_marginBottom="-4dp" + android:adjustViewBounds="true" app:layout_constraintStart_toStartOf="@id/riv" app:layout_constraintEnd_toEndOf="@id/riv" app:layout_constraintTop_toTopOf="@id/riv" @@ -45,9 +47,9 @@ android:id="@+id/iv_ripple" android:layout_width="0dp" android:layout_height="0dp" + android:adjustViewBounds="true" app:autoPlay="false" - app:layout_constraintHeight_percent="0.95" - app:layout_constraintWidth_percent="1" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintBottom_toBottomOf="@id/iv_frame" app:layout_constraintEnd_toEndOf="@id/iv_frame" app:layout_constraintStart_toStartOf="@id/iv_frame" diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index fd6a382f..800f2e60 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -894,7 +894,7 @@ class RoomActivity : BaseMvpActivity(), AppStateManager.getInstance().roomInfo = resp this.mRoomInfoResp = resp val roomBean = resp.room_info - LogUtils.e("setView_mRoomBean", roomBean.toString()) + LogUtils.e("setView_mRoomBean", resp.toString()) this.mRoomUserBean = resp.user_info this.mRoomOwnerBean = resp.room_owner this.roomId = roomBean.room_id diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index 71951386..5d4cd703 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -346,6 +346,7 @@ public class ChatRoomFragment extends BaseMvpFragment