feat:UI修改

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.37",
             "m-home"          : "0.0.22.67",
-            "m-im"            : "0.0.19.32",
+            "m-im"            : "0.0.19.33",
             "m-dynamic"       : "0.0.7.24",
             "m-article"       : "0.0.0.10",
 
@@ -93,7 +93,7 @@ ext {
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.37",
             "m-home"          : "0.0.22.67",
-            "m-im"            : "0.0.19.32",
+            "m-im"            : "0.0.19.33",
             "m-dynamic"       : "0.0.7.24",
             "m-article"       : "0.0.0.8",
 

m-im/src/main/java/com/yidianling/im/config/NimApplication.java

@@ -96,7 +96,7 @@ public class NimApplication {
         options.shouldHandleReceipt = true;
         options.toolBarOptions = new YDLToolBarOptions();
         options.messageLeftBackground = R.drawable.im_message_receive_content_bg;
-        options.messageRightBackground = R.drawable.im_message_send_content_bg;
+        options.messageRightBackground = R.drawable.im_custom_message_round_1da1f2_6dp_bg;
         return options;
     }
 

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderLingxiWhichQuestion.java

@@ -70,7 +70,6 @@ public class MsgViewHolderLingxiWhichQuestion extends MsgViewHolderBase implemen
     private String questionId;
     private String singleOrMultipletype;
     private ArrayList<AnswersItem> answersItems = new ArrayList<>();
-    private ArrayList<String> multipleAnswers=new ArrayList<>();
     Map<String, Object> mapMessageFromCustom;
     public MsgViewHolderLingxiWhichQuestion(BaseMultiItemFetchLoadAdapter adapter) {
         super(adapter);
@@ -183,19 +182,19 @@ public class MsgViewHolderLingxiWhichQuestion extends MsgViewHolderBase implemen
 
             if (mapMessage != null) {
                 Object questionPaperId=mapMessage.get(customAttachLingxiWhichQuestion.questionPaperId);
-                if (questionPaperId.toString().equals("true")){
-                    //隐藏回答的信息
-                    if (singleOrMultipletype.contains("radio")){
-                        recycleviewWhichQuestion.setVisibility(View.GONE);
-                    }else{
-                        recycleviewMultipleChoice.setVisibility(View.GONE);
-                        confirm_multiple_choice.setVisibility(View.GONE);
+
+                if (questionPaperId != null) {
+                    boolean b = (boolean) questionPaperId;
+                    if (b) {
+                        //隐藏回答的信息
+                        if (singleOrMultipletype.contains("radio")){
+                            recycleviewWhichQuestion.setVisibility(View.GONE);
+                        }else{
+                            recycleviewMultipleChoice.setVisibility(View.GONE);
+                            confirm_multiple_choice.setVisibility(View.GONE);
+                        }
                     }
                 }
-
-            } else {
-                //可点击
-
             }
         } catch (Exception e) {
             LogUtil.e(e.getLocalizedMessage());

m-im/src/main/res/drawable/im_custom_message_round_c2e7ff_6dp_bg.xml → m-im/src/main/res/drawable/im_custom_message_round_1da1f2_6dp_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_c2e7ff" />
+    <solid android:color="@color/platform_color_1DA1F2" />
     <corners
         android:topLeftRadius="@dimen/platform_dp_10"
         android:bottomRightRadius="@dimen/platform_dp_10"

m-im/src/main/res/layout/im_nim_lingxi_answer_question.xml

@@ -5,10 +5,10 @@
     android:maxWidth="263dp"
     xmlns:tools="http://schemas.android.com/tools"
     tools:text="答案"
-    android:background="@drawable/im_custom_message_round_c2e7ff_6dp_bg"
+    android:background="@drawable/im_custom_message_round_1da1f2_6dp_bg"
     android:id="@+id/answer_question"
-    android:textColor="@color/im_color_242424"
-    android:textSize="@dimen/im_sp_14"
+    android:textColor="@color/white"
+    android:textSize="@dimen/im_text_size_17"
     android:paddingTop="@dimen/platform_dp_9"
     android:paddingBottom="@dimen/platform_dp_9"
     android:paddingStart="@dimen/platform_dp_10"

m-im/src/main/res/layout/im_nim_lingxi_multiple_choice.xml

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:maxWidth="263dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/im_custom_message_round_white_6dp_bg"
@@ -11,8 +10,9 @@
     android:paddingTop="@dimen/platform_dp_12"
     >
     <TextView
-        android:layout_width="239dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:maxWidth="263dp"
         android:id="@+id/multiple_choice_title"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"

m-im/src/main/res/layout/im_nim_lingxi_which_question.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="263dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/im_custom_message_round_white_6dp_bg"
     android:paddingLeft="@dimen/platform_dp_12"
@@ -12,14 +12,14 @@
 
     <TextView
         android:id="@+id/which_question_title"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:maxWidth="263dp"
         android:textColor="@color/im_color_242424"
         android:textSize="@dimen/im_text_size_17"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="您想要咨询下类哪类问题您想要咨询下类哪类问题？"
+        tools:text="您想要咨询下类哪类问？"
         android:layout_marginBottom="@dimen/platform_dp_16"
         app:layout_constraintBottom_toTopOf="@id/which_question_rv"
         />

m-im/src/main/res_uikit/layout/im_nim_message_activity_text_layout.xml

@@ -82,7 +82,7 @@
             android:maxHeight="72dp"
             android:maxLines="4"
             android:textColorHint="#CCCCCC"
-            android:textSize="15sp" />
+            android:textSize="17sp" />
     </LinearLayout>
 
     <ImageView

m-im/src/main/res_uikit/layout/im_nim_message_item.xml

@@ -16,10 +16,9 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="13dp"
         android:layout_marginTop="@dimen/im_bubble_time_layout_margin_top"
-        android:background="@drawable/im_nim_bg_message_tip_time"
         android:paddingLeft="6dp"
         android:paddingRight="6dp"
-        android:textColor="#ffffff"
+        android:textColor="#cccccc"
         android:textSize="12dp"
         android:visibility="gone"
         tools:visibility="visible"

m-im/src/main/res_uikit/layout/im_nim_message_item_text.xml

@@ -13,6 +13,6 @@
         android:includeFontPadding="false"
         android:lineSpacingExtra="3dip"
         android:minHeight="40dp"
-        android:textColor="@color/im_color_242424"
+        android:textColor="@color/white"
         android:textSize="17dp"/>
 </LinearLayout>