Browse Source

<事件页面微调>

weizhengliang 4 years ago
parent
commit
47d5814731

+ 1 - 0
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchEventDetailActivity.kt

@@ -126,6 +126,7 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
         interactionVO = Gson().fromJson(tcpModel?.data.toString(), InteractionVO::class.java)
 
         if (interactionVO!=null) {
+            tv_frame_name.setText(interactionVO?.fromFrameFullName)
             baby_mother_name.setText(interactionVO?.fromMemberName)
 
             if (tcpModel?.type == TcpType.IM){

+ 1 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -56,7 +56,7 @@ class TcpHandleService : Service(){
                 val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                 var eventStr = ""
                 if (interactionVO != null) {
-                    eventStr = interactionVO.fromFrameFullName.replace("-", "") + ", 需要" + interactionVO.data
+                    eventStr = interactionVO.fromFrameFullName.replace("-", "") + ", " + interactionVO.data
                 }
                 SpeechUtil.getInstance().newSpeech("您有新的事件待处理, " + eventStr, false)
             }

+ 12 - 4
home/src/main/res/layout/watch_activity_event_detail.xml

@@ -10,6 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal"
         android:layout_marginTop="11px"
         android:orientation="vertical">
 
@@ -18,14 +19,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/bao_ma_tou_xiang" />
-
         <TextView
             android:id="@+id/baby_mother_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="2px"
-            android:text=""
+            android:text="--"
+            android:textSize="16sp" />
+        <TextView
+            android:id="@+id/tv_frame_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="2px"
+            android:text="--"
             android:textSize="16sp" />
 
         <TextView
@@ -33,8 +41,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="2px"
-            android:text="11"
+            android:layout_marginTop="10px"
+            android:text="--"
             android:textSize="16sp" />
 
     </LinearLayout>