1.增加云派设备app升级服务是否启动显示

2.调整下方按钮显示，加大呼叫按钮显示

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -24,6 +24,8 @@ class Constants {
 
         var app_updating = false
 
+        var yunpai_plugin = false
+
         //0--白天，1--夜晚
         var day_state = -1
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -233,6 +233,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                     } else {
                         startService(intent)
                     }
+                    Constants.yunpai_plugin = true
                     needInstall = false
                     break
                 } else {

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -73,7 +73,15 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             radio_tts_off.isChecked = true
         }
 
-        //todo 这里实际是应该从服务器拿或者本地拿数据显示
+        if ("YUNPAI_H6".equals(Build.MODEL)) {
+            yunpai_update_plugin_tv.visibility = View.VISIBLE
+            if (Constants.yunpai_plugin) {
+                yunpai_update_plugin_tv.setText("升级服务插件已启动")
+            } else {
+                yunpai_update_plugin_tv.setText("升级服务未启动，可能需要重启应用")
+            }
+        }
+
         //语音播报次数
         call_number_tv.text = SettingConfig.getCallNumber(this.activity).toString()
         call_number_seekb.setProgress((SettingConfig.getCallNumber(this.activity)))

nursehome/src/main/res/drawable/ic_call_out.xml

@@ -0,0 +1,5 @@
+<vector android:height="40dp" android:tint="#02FF0F"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
+</vector>

nursehome/src/main/res/layout/activity_nurse_home.xml

@@ -173,8 +173,7 @@
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="广播"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/visit_an_extension_radio_bt"
@@ -187,8 +186,7 @@
                             android:textColor="#FFFFFF"
                             android:text="探视管理"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/doctor_host_radio_bt"
@@ -201,8 +199,7 @@
                             android:textColor="#FFFFFF"
                             android:text="医生机"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
@@ -216,8 +213,7 @@
                             android:textColor="#FFFFFF"
                             android:text="病区"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/sickbed_radio_bt"
@@ -230,8 +226,7 @@
                             android:textColor="#FFFFFF"
                             android:text="病床"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/nurse_move_radio_bt"
@@ -244,8 +239,7 @@
                             android:textColor="#FFFFFF"
                             android:text="护士移动"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/other_host_radio_bt"
@@ -258,8 +252,7 @@
                             android:textColor="#FFFFFF"
                             android:text="其它主机"
                             android:textSize="16sp"
-                            android:visibility="invisible"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/collocation_radio_bt"
@@ -272,8 +265,7 @@
                             android:textColor="#FFFFFF"
                             android:text="托管"
                             android:textSize="16sp"
-                            android:visibility="gone"
-                             />
+                            android:visibility="gone" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/led_settings_radio_bt"
@@ -301,6 +293,11 @@
                             android:text="设置"
                             android:textSize="24sp" />
 
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="5"/>
+
                     </RadioGroup>
                 </LinearLayout>
             </LinearLayout>

nursehome/src/main/res/layout/fragment_system_settings.xml

@@ -1262,10 +1262,22 @@
                     android:gravity="center"
                     android:orientation="vertical">
                     <TextView
+                        android:id="@+id/yunpai_update_plugin_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="4dp"
+                        android:gravity="center"
+                        android:textColor="#000000"
+                        android:textSize="16sp"
+                        android:visibility="gone"/>
+
+                    <TextView
                         android:id="@+id/system_settings_tv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="8dp"
+                        android:layout_marginTop="10dp"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
                         android:gravity="center"
                         android:background="@color/white"
                         android:text="系统设置"
@@ -1276,8 +1288,9 @@
                         android:id="@+id/save_settings_tv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:padding="8dp"
+                        android:layout_marginTop="20dp"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
                         android:gravity="center"
                         android:background="@color/white"
                         android:text="保存设置"
@@ -1288,8 +1301,9 @@
                         android:id="@+id/software_and_information_tv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:padding="8dp"
+                        android:layout_marginTop="20dp"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
                         android:gravity="center"
                         android:background="@color/white"
                         android:text="v1.0"

nursehome/src/main/res/layout/right_basic_information.xml

@@ -9,11 +9,11 @@
         <LinearLayout
             android:id="@+id/call_the_voice_linlyout"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="70dp"
             android:layout_alignParentBottom="true"
             android:gravity="center"
             android:orientation="horizontal"
-            android:layout_marginBottom="6dp"
+            android:layout_marginBottom="16dp"
             android:background="#F3F9FE">
 
             <TextView
@@ -22,23 +22,26 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:paddingLeft="20dp"
-                android:drawableLeft="@drawable/hu_jiao"
-                android:drawablePadding="6dp"
-                android:textSize="20sp"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_call_out"
+                android:textSize="28sp"
                 android:text="语音"
                 android:textColor="@drawable/selector_action_button_text_color"/>
 
+            <View
+                android:layout_width="2dp"
+                android:layout_height="match_parent"
+                android:background="@color/white"/>
+
             <TextView
                 android:id="@+id/call_the_video_tv"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:paddingLeft="20dp"
-                android:drawableLeft="@drawable/hu_jiao"
-                android:drawablePadding="6dp"
-                android:textSize="20sp"
+                android:paddingLeft="10dp"
+                android:drawableLeft="@drawable/ic_call_out"
+                android:textSize="28sp"
                 android:text="视频"
                 android:textColor="@drawable/selector_action_button_text_color"/>
         </LinearLayout>