Kaynağa Gözat

补充修改

weizhengliang 3 yıl önce
ebeveyn
işleme
82c2fb44b8

+ 2 - 2
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/util/LedHelper.java

@@ -39,8 +39,8 @@ public class LedHelper {
         } else if (interactionVO.getFromDeviceType() == DeviceTypeEnum.EMERGENCY_BUTTON.value()
                 || interactionVO.getFromDeviceType() == DeviceTypeEnum.SIMULATE_EMERGENCY_BUTTON.value()) {
             //紧急呼叫
-            String frameName = CommonUtils.subStringBefore(interactionVO.getFromFrameFullName(), "-");
-            frameName += interactionVO.getFromDeviceName();
+            //String frameName = CommonUtils.subStringBefore(interactionVO.getFromFrameFullName(), "-");
+            String frameName = interactionVO.getFromDeviceName();
             if (isAdd) {
                 //新增led节目
                 LedManagerUtils.getInstance().updateProgram(frameName + "紧急呼叫", 1);

+ 1 - 2
nursehome/src/main/res/layout/adapter_call_records_item.xml

@@ -93,7 +93,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="4dp"
-                    android:gravity="center"
                     android:layout_alignParentRight="true"
                     android:background="@drawable/sp_event_unhandled_bg"
                     android:textSize="16sp"
@@ -103,7 +102,7 @@
                     android:id="@+id/state_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
+                    android:padding="4dp"
                     android:layout_alignParentRight="true"
                     android:textSize="18sp"
                     android:text="开门" />