Pq 3 tahun lalu
induk
melakukan
269ac3099a

+ 1 - 2
rong_im/common_im_ui/src/main/res/layout/fragment_message_layout.xml

@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9">
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/view_status_bar"

+ 1 - 4
rong_im/kit/src/main/java/io/rong/imkit/conversationlist/viewmodel/ConversationListViewModel.java

@@ -465,13 +465,10 @@ public class ConversationListViewModel extends AndroidViewModel {
         } else if (status.equals(ConnectionStatus.UNCONNECTED)) {
             content = resources.getString(R.string.rc_conversation_list_notice_disconnect);
             resId = R.drawable.rc_ic_error_notice;
-        } else if (status.equals(ConnectionStatus.CONNECTING)
-                || status.equals(ConnectionStatus.SUSPEND)
-        ) {
+        } else {
             content = resources.getString(R.string.rc_conversation_list_notice_connecting);
             resId = R.drawable.rc_conversationlist_notice_connecting_animated;
         }
-
         noticeContent.setContent(content);
         noticeContent.setShowNotice(isShowContent);
         noticeContent.setIconResId(resId);

+ 1 - 1
usercenter/src/main/java/com/cooleshow/usercenter/bean/UserInfo.java

@@ -35,7 +35,7 @@ public class UserInfo {
 
     public Object roles;
     public String username;
-    public boolean delFlag;
+    public int delFlag;
     public int lockFlag;
     public String userType;
     public String password;