分机

1.修改生产线测试功能
2.宿舍版本rtc视频呼叫界面
门口机
1,增加鼎信 13。3以及 15。6 的适配

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivationActivity.kt

@@ -729,6 +729,10 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
                 EventBus.getDefault().post(MessageEvent("button2", Constant.EVENT_SERIAL_TEST))
             } else if (status==";") {
                 EventBus.getDefault().post(MessageEvent("button1", Constant.EVENT_SERIAL_TEST))
+            } else if (status=="7") {
+                EventBus.getDefault().post(MessageEvent("call_sos", Constant.EVENT_SERIAL_TEST))
+            } else if (status=="@") {
+                EventBus.getDefault().post(MessageEvent("sos_cancel", Constant.EVENT_SERIAL_TEST))
             }
             return
         }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedDormitoryActivity.kt

@@ -999,6 +999,10 @@ class CallingbedDormitoryActivity :BaseActivity<BedCallingbedActivityPresenter,
                 EventBus.getDefault().post(MessageEvent("button2", Constant.EVENT_SERIAL_TEST))
             } else if (status==";") {
                 EventBus.getDefault().post(MessageEvent("button1", Constant.EVENT_SERIAL_TEST))
+            } else if (status=="7") {
+                EventBus.getDefault().post(MessageEvent("call_sos", Constant.EVENT_SERIAL_TEST))
+            } else if (status=="@") {
+                EventBus.getDefault().post(MessageEvent("sos_cancel", Constant.EVENT_SERIAL_TEST))
             }
             return
         }

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/TextActivity.kt

@@ -113,7 +113,7 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
                 //
             }
         }
-        loar_button.setOnClickListener {
+        others_button.setOnClickListener {
             finish()
             val intent = Intent()
             intent.setClass(activity, AppTextActivity::class.java)
@@ -152,12 +152,10 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
             text_sbqx_button.text = "按键2测试"
             mbhj_button.text = "按键3测试"
             mbhjqx_button.text = "SOS按键测试"
-            sos_button.text = "相机测试"
         }else if (BuildConfig.FLAVOR.equals("dch_7")){
             text_ll_4.visibility =View.GONE
         }else {
             text_ll_2.visibility =View.GONE
-            loar_button.text = "其他测试"
         }
 
 
@@ -294,6 +292,11 @@ class TextActivity : BaseActivity<BedTextActivityPresenter, CallingbedTestMainBi
                SerialPortHelper.setSosLight("2")
                sos_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
                sos_img.visibility=View.VISIBLE
+           }else if(message == "sos_cancel"){
+               //紧急按钮
+               SerialPortHelper.setSosLight("0")
+               sos_no_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)
+               sos_no_img.visibility=View.VISIBLE
            }else if(message == "call2"|| message == "dch_sb_h"|| message == "button1"){
                //手柄按键或者呼叫
                text_sbaj_button.setBackgroundResource(R.drawable.shape_reinforcements_dialog_bt_bg)

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/DormSkyCallFragment.kt

@@ -490,6 +490,8 @@ class DormSkyCallFragment: BaseCallFragment(), CallSessionCallback {
         } else {
             //显示视频画面
             fullscreen_video_frame.visibility = View.VISIBLE
+            dorm_sky_rl_2.background  = null
+            main_rl_1.background  = null
             pip_video_frame.visibility = View.VISIBLE
             ll_voice_call.visibility = View.GONE
         }

android_bed/src/main/res/layout-land/callingbed_test_main.xml

@@ -80,234 +80,294 @@
 
             </LinearLayout>
 
-            <LinearLayout
+            <ScrollView
                 android:layout_width="@dimen/d491"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/d16"
-                android:layout_marginTop="@dimen/d10"
-                android:layout_marginRight="@dimen/d28"
-                android:layout_marginBottom="@dimen/d20"
-                android:background="@drawable/shape_bed_bg"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:text="@string/test_peripheral"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d7"
-                    android:gravity="center"
-                    android:text="@string/test_peripheral_connect_check"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_13" />
-
+                android:layout_height="match_parent">
                 <LinearLayout
-                    android:id="@+id/text_ll_1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d15"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/text_sbaj_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                    android:layout_width="@dimen/d491"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/d16"
+                    android:layout_marginTop="@dimen/d10"
+                    android:layout_marginRight="@dimen/d28"
+                    android:layout_marginBottom="@dimen/d20"
+                    android:background="@drawable/shape_bed_bg"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
                         android:gravity="center"
-                        android:text="@string/test_handle_call_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sbaj_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d15"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/text_sbqx_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="@string/test_peripheral"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d7"
                         android:gravity="center"
-                        android:text="@string/test_handle_cancel_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sbqx_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/mbhj_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:text="@string/test_peripheral_connect_check"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_13" />
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d15"
                         android:gravity="center"
-                        android:text="@string/test_device_call_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/mbh_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_4"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/mbhjqx_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/text_sbaj_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_handle_call_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sbaj_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d15"
                         android:gravity="center"
-                        android:text="@string/test_device_cancel_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/mbhjjqx_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-
-
-
-                <LinearLayout
-                    android:id="@+id/text_ll_5"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/sos_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/text_sbqx_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_handle_cancel_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sbqx_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
                         android:gravity="center"
-                        android:text="@string/test_sos_button"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/sos_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/text_ll_7"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/lycs_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/mbhj_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_device_call_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/mbh_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/mbhjqx_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_device_cancel_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/mbhjjqx_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+
+
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_5"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/sos_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="@string/test_sos_button"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sos_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/text_ll_9"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/sos_no_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:gravity="center"
+                            android:text="紧急取消按钮"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/sos_no_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/text_ll_7"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
                         android:clickable="true"
-                        android:drawableLeft="@mipmap/lu"
-                        android:drawablePadding="@dimen/d16"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="@dimen/d88"
-                        android:text="@string/test_mic_record"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/lycs_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/text_ll_6"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/d16"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/loar_button"
-                        android:layout_width="@dimen/d383"
-                        android:layout_height="@dimen/d48"
-                        android:background="@drawable/shape_main_hos_txt_bg"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/lycs_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:drawableLeft="@mipmap/lu"
+                            android:drawablePadding="@dimen/d16"
+                            android:gravity="center_vertical"
+                            android:paddingLeft="@dimen/d88"
+                            android:text="@string/test_mic_record"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/lycs_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/text_ll_6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
                         android:clickable="true"
                         android:gravity="center"
-                        android:text="loar信号测试"
-                        android:textColor="@drawable/selector_bottom_btn_text_color"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:id="@+id/loar_img"
-                        android:layout_width="@dimen/d16"
-                        android:layout_height="@dimen/d16"
-                        android:layout_marginLeft="@dimen/d8"
-                        android:background="@mipmap/gou"
-                        android:visibility="invisible" />
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/loar_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:text="loar信号测试"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/loar_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/text_ll_8"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/d16"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/others_button"
+                            android:layout_width="@dimen/d383"
+                            android:layout_height="@dimen/d48"
+                            android:background="@drawable/shape_main_hos_txt_bg"
+                            android:clickable="true"
+                            android:gravity="center"
+                            android:text="其他测试"
+                            android:textColor="@drawable/selector_bottom_btn_text_color"
+                            android:textSize="16sp" />
+
+                        <ImageView
+                            android:id="@+id/others_img"
+                            android:layout_width="@dimen/d16"
+                            android:layout_height="@dimen/d16"
+                            android:layout_marginLeft="@dimen/d8"
+                            android:background="@mipmap/gou"
+                            android:visibility="invisible" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
+            </ScrollView>
+
+
 
         </LinearLayout>
 

android_bed/src/main/res/layout/dorm_sky_voice_call_layout.xml

@@ -5,7 +5,8 @@
         android:id="@+id/dorm_calling_bed_layout_call_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/theme_4">
+        android:background="@mipmap/theme_4"
+         >
 
         <RelativeLayout
             android:id="@+id/main_rl_1"
@@ -46,7 +47,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            />
 
         <!--小窗视频画面-->
         <FrameLayout
@@ -59,6 +61,7 @@
             android:visibility="gone"/>
 
         <RelativeLayout
+            android:id="@+id/dorm_sky_rl_2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_toRightOf="@+id/main_rl_1"
@@ -326,5 +329,6 @@
                 </com.wdkl.ncs.android.lib.widget.VerticalSeekBarWrapper>
             </LinearLayout>
         </RelativeLayout>
+
     </RelativeLayout>
 </layout>

android_host/src/main/res/values-es/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">NCS-Host_device_rk</string>
     <string name="wdkl_app_name">Host_device</string>
-
     <string name="download_error">Error de descarga!</string>
     <string name="download_cancel">Cancelar descarga</string>
     <string name="update_success">Actualización exitosa</string>
@@ -14,8 +13,8 @@
     <string name="plugin_start_failed">start plugin service failed:</string>
     <string name="plugin_start_success">plugin service started</string>
     <string name="plugin_start_error">plugin service start failed, please restart app</string>
-    <string name="enable_debug">Enable debug</string>
 
+    <string name="enable_debug">Enable debug</string>
     <string name="permission_grant_tips">Otorgue todos los permisos</string>
     <string name="device_init_fail">Error de datos de inicialización, ?verifíquelo!</string>
     <string name="device_disabled">Dispositivo desactivado</string>
@@ -29,6 +28,7 @@
     <string name="net_error">Error de red</string>
     <string name="voice_call_speech">%s llamando</string>
     <string name="sos_call_speech">%s llamada de emergencia</string>
+
     <string name="reinforce_call_speech">%s llamada de refuerzo</string>
     <string name="emergency_call">llamada de emergencia</string>
     <string name="event_todo">necesita manejar</string>
@@ -36,10 +36,10 @@
     <string name="event_todo_tips">Llamada entrante, primera tarea</string>
     <string name="voice_message">Mensaje de voz</string>
     <string name="video_message">Video msg</string>
-
     <string name="call_video">%s Videollamada</string>
     <string name="call_visiting">Solicitud de visita</string>
     <string name="call_entrance_guard">Solicitud de guardia de entrada</string>
+
     <string name="call_sos">Llamada de emergencia</string>
     <string name="call_reinforce">Reforzar llamada</string>
     <string name="call_door">Máquina de puerta</string>
@@ -48,16 +48,14 @@
     <string name="extension_connect_fail">extension connect fail</string>
     <string name="extension_call_busy">extension busy</string>
     <string name="extension_call_error">extension error</string>
-
     <string name="cost_subtotal">Subtotal: %f</string>
     <string name="exam_desc">Descripción: %s</string>
     <string name="exam_time">Hora: %s</string>
-
     <string name="call_wait">Por favor espere</string>
     <string name="no_custom">Cama vacía o sin dispositivo, llamada fallida</string>
     <string name="no_device">No device</string>
-    <string name="not_support_video_call">Not support video call</string>
 
+    <string name="not_support_video_call">Not support video call</string>
     <string name="led_auto_sync_time">Sincronización automátiva de led:</string>
     <string name="led_time_show_seconds">Time show seconds:</string>
     <string name="led_type">Tipo de LED: </string>
@@ -83,8 +81,8 @@
     <string name="led_default_info">Información predeterminada:</string>
     <string name="led_show_date">Solo fecha hora</string>
     <string name="led_add_info">A?adir información personalizada</string>
-
     <string name="no_response">Sin respuesta</string>
+
     <string name="call_video_call">Videollamada</string>
     <string name="call_in_calling">Llamando</string>
     <string name="call_connecting">Conectando…</string>
@@ -104,6 +102,7 @@
     <string name="invalid_password">contrase?a no válida</string>
     <string name="confirm_down_time">Confirmar(%d)</string>
     <string name="visiting_call">%s visitando…</string>
+
     <string name="str_home">Inicio</string>
     <string name="str_broadcast">Transmitir</string>
     <string name="str_visiting">Visitando</string>
@@ -134,15 +133,28 @@
     <string name="iot_device_warning">¡Advertencia de error del dispositivo NB!</string>
     <string name="str_nurse_settings">Estación de enfermería - Configuración</string>
     <string name="str_doctor_settings">Host de doctor - Configuración</string>
-
     <string name="str_visit">Visita con cita</string>
     <string name="str_settings">Configuración</string>
     <string name="str_delete">Eliminar</string>
     <string name="str_save">Guardar</string>
+
     <string name="str_upload">Upload</string>
     <string name="str_upload_done">Upload done</string>
     <string name="str_video_record">Record</string>
     <string name="str_record_stop">Stop</string>
+    <string name="str_manager_host">Manager host</string>
+    <string name="server_config">Configuración del servidor</string>
+
+    <string name="broadcast_init_error">Broadcast init error</string>
+    <string name="broadcast_init_success">Broadcast init success</string>
+    <string name="broadcast_start_warning">Please start broadcast</string>
+    <string name="broadcast_start">Start</string>
+    <string name="broadcast_record_start">Start record</string>
+    <string name="broadcast_record_stop">Stop record</string>
+    <string name="broadcast_playing">Broadcast playing…</string>
+    <string name="broadcast_preview">Broadcast preview…</string>
+    <string name="broadcast_stop">Broadcast stop</string>
+
     <string name="setting_day_night_time">Configuración de horario de día y noche</string>
     <string name="setting_call_type">Tipo de llamada:</string>
     <string name="setting_call_type_tts">TTS</string>
@@ -211,25 +223,14 @@
     <string name="nursing_configs">Proyectos de enfermería:</string>
     <string name="orders">Pedidos:</string>
     <string name="illness">Información de la enfermedad:</string>
+    <string name="responsible_bed">responsible bed</string>
+    <string name="none_warning">Nadie alerta</string>
     <string name="reboot_conform">configuración exitosa, ?reiniciar ahora?</string>
     <string name="new_event_title">Nuevo evento</string>
-    <string name="responsible_bed">responsible bed</string>
-    <string name="str_manager_host">Manager host</string>
-    <string name="server_config">Configuración del servidor</string>
 
-    <string name="broadcast_init_error">Broadcast init error</string>
-    <string name="broadcast_init_success">Broadcast init success</string>
-    <string name="broadcast_start_warning">Please start broadcast</string>
-    <string name="broadcast_start">Start</string>
-    <string name="broadcast_record_start">Start record</string>
-    <string name="broadcast_record_stop">Stop record</string>
-    <string name="broadcast_playing">Broadcast playing…</string>
-    <string name="broadcast_preview">Broadcast preview…</string>
-    <string name="broadcast_stop">Broadcast stop</string>
 
     <string name="str_warning">alerta</string>
     <string name="str_fall_alarm">fall alarm</string>
-    <string name="none_warning">Nadie alerta</string>
 
     <string name="call_stay_time">Incoming Call timeout</string>
     <string name="device_managed">El dispositivo está gestionado</string>
@@ -237,19 +238,17 @@
     <string name="is_managed">Determinar el alojamiento</string>
     <string name="trusteeship_confirm">Se administrará el dispositivo y las llamadas se transferirán al dispositivo administrado.</string>
     <string name="cancel_managed_btn">Mantenga presionada cancelar</string>
-
     <string name="no_data">Datos no </string>
     <string name="information">Información Básica</string>
     <string name="inspection">Inspección</string>
     <string name="patient_information">Información del Paciente</string>
     <string name="nnursing_care_project">Proyecto de Cuidados de Enfermería</string>
-    <string name="str_br_more">Más</string>
 
+    <string name="str_br_more">Más</string>
     <string name="str_br_list_bt">Lista de Transmisiones</string>
     <string name="str_br_hh_bt">Transmisión de Anuncios</string>
     <string name="str_br_more_bt">Más Funciones</string>
     <string name="str_br_play_no">No hay archivo para reproducir</string>
-
     <string name="br_list_st_bt">Previsualizar</string>
     <string name="br_list_delete_bt">Eliminar</string>
     <string name="br_list_startup">Activar</string>
@@ -285,7 +284,6 @@
     <string name="br_message_12">Haga clic en el botón para empezar a transmitir</string>
     <string name="br_message_13">Comenzar a transmitir</string>
     <string name="br_message_14">Has seleccionado todas las áreas, por favor, deselecciona antes de seleccionar</string>
-
     <string name="str_docotor_title">Lista de Doctores</string>
     <string name="docotor_message_1">¿Confirmar llamada al anfitrión del doctor?</string>
     <string name="docotor_message_2">Confirmar llamada</string>
@@ -324,18 +322,10 @@
     <string name="visit_unit_5">Ver</string>
     <string name="trusteeship_title">Lista de Anfitriones de Tutela</string>
     <string name="trusteeship_message">Confirmar llamada al anfitrión</string>
-
     <string name="str_alarm_title">ALARMA</string>
     <string name="str_alarm_list">LISTA DE ALARMAS</string>
     <string name="str_emergency_list">Lista de Emergencias</string>
     <string name="str_blue_code_list">Lista de Códigos Azules</string>
-
     <string name="str_message_hint">Ingrese su mensaje</string>
     <string name="str_message_list">Lista de mensajes</string>
-
-
-
-
-
-
 </resources>

android_host/src/main/res/values-ru/strings.xml

@@ -1,8 +1,6 @@
 <resources>
     <string name="app_name">NCS-Host_device_rk</string>
-
     <string name="wdkl_app_name">Host_device</string>
-
     <string name="download_error">Ошибка загрузки!</string>
     <string name="download_cancel">Отмена загрузки</string>
     <string name="update_success">Обновление выполнено</string>
@@ -30,6 +28,7 @@
     <string name="call_failed">Вызов не удался</string>
     <string name="voice_call_speech">%s вызывает</string>
     <string name="sos_call_speech">экстренный вызов %s</string>
+
     <string name="reinforce_call_speech">%s просит помощи</string>
     <string name="emergency_call">экстренный вызов</string>
     <string name="event_todo">Задачи</string>
@@ -37,10 +36,10 @@
     <string name="event_todo_tips">Сначала входящий вызов</string>
     <string name="voice_message">Голосовое сообщение</string>
     <string name="video_message">Video msg</string>
-
     <string name="call_video">%s video call</string>
     <string name="call_visiting">Запрос на посещение</string>
     <string name="call_entrance_guard">Охранник на входе</string>
+
     <string name="call_sos">Экстренный вызов</string>
     <string name="call_reinforce">Вызов усиления</string>
     <string name="call_door">Дверной звонок</string>
@@ -49,16 +48,14 @@
     <string name="extension_connect_fail">extension connect fail</string>
     <string name="extension_call_busy">extension busy</string>
     <string name="extension_call_error">extension error</string>
-
     <string name="cost_subtotal">Итого: %f</string>
     <string name="exam_desc">Описание: %s</string>
     <string name="exam_time">Время: %s</string>
-
     <string name="call_wait">Пожалуйста, подождите</string>
     <string name="no_custom">Нет пользовательских настроек или устройств, ошибка вызова</string>
     <string name="no_device">Нет устройства</string>
-    <string name="not_support_video_call">Not support video call</string>
 
+    <string name="not_support_video_call">Not support video call</string>
     <string name="led_auto_sync_time">Auto sync led time:</string>
     <string name="led_time_show_seconds">Time show seconds:</string>
     <string name="led_type">Led Type: </string>
@@ -105,6 +102,7 @@
     <string name="invalid_password">неверный пароль</string>
     <string name="confirm_down_time">Подтвердить(%d)</string>
     <string name="visiting_call">%s посещение…</string>
+
     <string name="str_home">Главная</string>
     <string name="str_broadcast">Трансляция</string>
     <string name="str_visiting">Посещение</string>
@@ -135,15 +133,27 @@
     <string name="iot_device_warning">Предупреждение об ошибке устройства NB!</string>
     <string name="str_nurse_settings">Медицинская станция - Настройки</string>
     <string name="str_doctor_settings">Хост доктора - Настройки</string>
-
     <string name="str_visit">Назначенный визит</string>
     <string name="str_settings">Настройки</string>
     <string name="str_delete">Удалить</string>
     <string name="str_save">Сохранить</string>
+
     <string name="str_upload">Upload</string>
     <string name="str_upload_done">Upload done</string>
     <string name="str_video_record">Record</string>
     <string name="str_record_stop">Stop</string>
+    <string name="str_manager_host">Manager host</string>
+    <string name="server_config">Конфигурация сервера</string>
+
+    <string name="broadcast_init_error">Broadcast init error</string>
+    <string name="broadcast_init_success">Broadcast init success</string>
+    <string name="broadcast_start_warning">Please start broadcast</string>
+    <string name="broadcast_start">Start</string>
+    <string name="broadcast_record_start">Start record</string>
+    <string name="broadcast_record_stop">Stop record</string>
+    <string name="broadcast_playing">Broadcast playing…</string>
+    <string name="broadcast_preview">Broadcast preview…</string>
+    <string name="broadcast_stop">Broadcast stop</string>
     <string name="setting_day_night_time">Установка дневного и ночного времени</string>
     <string name="setting_call_type">Тип звонка:</string>
     <string name="setting_call_type_tts">ТТС</string>
@@ -175,7 +185,6 @@
     <string name="setting_bed_device_night_volume">Расширение: ночная громкость</string>
     <string name="setting_bed_device_call_volume">Расширение: громкость звонков</string>
     <string name="setting_conversion_box_volume">Объем коробки конвертации</string>
-
     <string name="language_set_title">Язык:</string>
     <string name="language_set_mode">Синхронизировать язык с сервером:</string>
     <string name="str_yes">Да</string>
@@ -207,31 +216,19 @@
     <string name="inspection_info">Осмотр</string>
     <string name="indate">Дата:</string>
     <string name="mobile">Мобильный:</string>
+
     <string name="duty_doctor">Доктор:</string>
     <string name="duty_nurse">Медсестра:</string>
     <string name="nursing_configs">Тип ухода:</string>
     <string name="orders">Заказы:</string>
     <string name="illness">Болезнь:</string>
     <string name="responsible_bed">основная кровать</string>
-    <string name="reboot_conform">установка завершена, перезагрузить сейчас?</string>
-    <string name="new_event_title">Новое мероприятие</string>
-    <string name="call_stay_time">Время ожидания входящего вызова</string>
-    <string name="str_manager_host">Manager host</string>
-    <string name="server_config">Конфигурация сервера</string>
-
-    <string name="broadcast_init_error">Broadcast init error</string>
-    <string name="broadcast_init_success">Broadcast init success</string>
-    <string name="broadcast_start_warning">Please start broadcast</string>
-    <string name="broadcast_start">Start</string>
-    <string name="broadcast_record_start">Start record</string>
-    <string name="broadcast_record_stop">Stop record</string>
-    <string name="broadcast_playing">Broadcast playing…</string>
-    <string name="broadcast_preview">Broadcast preview…</string>
-    <string name="broadcast_stop">Broadcast stop</string>
-
     <string name="str_warning">тревога</string>
     <string name="str_fall_alarm">fall alarm</string>
     <string name="none_warning">Никто не предупреждает</string>
+    <string name="reboot_conform">установка завершена, перезагрузить сейчас?</string>
+    <string name="new_event_title">Новое мероприятие</string>
+    <string name="call_stay_time">Время ожидания входящего вызова</string>
     <string name="device_managed">The device is managed</string>
     <string name="cancel_managed">Unescrowed…</string>
     <string name="is_managed">Устанавливать, установить опекунство</string>
@@ -244,7 +241,6 @@
     <string name="nnursing_care_project">Проект ухода за пациентом</string>
 
     <string name="str_br_more">Ещё</string>
-
     <string name="str_br_list_bt">Список Вещаний</string>
     <string name="str_br_hh_bt">Голосовое Объявление</string>
     <string name="str_br_more_bt">Дополнительные Функции</string>
@@ -285,14 +281,13 @@
     <string name="br_message_13">Начать вещание</string>
     <string name="br_message_14">Вы выбрали все области, пожалуйста, снимите выделение перед выбором</string>
 
-
     <string name="str_docotor_title">Список врачей</string>
     <string name="docotor_message_1">Подтвердить вызов врача?</string>
     <string name="docotor_message_2">Подтвердить</string>
     <string name="yd_title">Мобильная информация</string>
     <string name="yd_title_1">Список мобильных медсестер</string>
     <string name="visit_title_1">Визит в процессе</string>
-    <string name="visit_title_2"> 审核探视</string>
+    <string name="visit_title_2"> Аудиторский визит</string>
     <string name="visit_title_3">Все визиты</string>
     <string name="visit_title_4">Установить причину отказа</string>
     <string name="visit_title_5">Подтвердить проверку</string>
@@ -301,7 +296,6 @@
     <string name="visit_title_8">Посетитель: </string>
     <string name="visit_title_9">Время посещения: </string>
     <string name="visit_title_10">Выберите койку для посещения (один выбор)</string>
-
     <string name="visit_message">Оба участника еще не начали звонок</string>
     <string name="visit_message_1">Номер комнаты пуст</string>
     <string name="visit_message_2">Недостаток данных</string>
@@ -311,7 +305,6 @@
     <string name="visit_message_6">Проверка неуспешна</string>
     <string name="visit_message_7">Подтвердить проверку</string>
     <string name="visit_message_8">Введите</string>
-
     <string name="visit_txt_1">Пациенту нужно отдыхать</string>
     <string name="visit_txt_2">Предотвращение распространения инфекции</string>
     <string name="visit_txt_3">Пациент проходит специальное лечение</string>
@@ -319,7 +312,6 @@
     <string name="visit_txt_5">Соблюдение правил больницы</string>
     <string name="visit_txt_6">Защита частной жизни пациента</string>
     <string name="visit_txt_7">Срочное обращение</string>
-
     <string name="visit_unit_1">"Отношение: "</string>
     <string name="visit_unit_2">Кровать</string>
     <string name="visit_unit_3">Отклонено</string>
@@ -328,15 +320,15 @@
 
     <string name="trusteeship_title">Список хостов управления</string>
     <string name="trusteeship_message">Подтвердить вызов хоста</string>
-
-
     <string name="str_alarm_title">ALARM</string>
     <string name="str_alarm_list">Alarm List</string>
     <string name="str_emergency_list">Emergency List</string>
     <string name="str_blue_code_list">BlueCode List</string>
-
     <string name="str_message_hint">Введите ваше сообщение</string>
     <string name="str_message_list">Список сообщений</string>
+    <string name="push_message_bt">Обычное сообщение</string>
+    <string name="push_message_bt_1">Сообщение шаблона</string>
+    <string name="push_message_bt_2">Записи сообщений</string>
 
 
 

android_host/src/main/res/values-zh/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">NCS-护士主机RK版</string>
+    <string name="app_name">NCS-护士主机</string>
     <string name="wdkl_app_name">Host_device</string>
     <string name="download_error">下载路径异常</string>
     <string name="download_cancel">取消下载</string>
@@ -13,8 +13,8 @@
     <string name="plugin_start_failed">启动升级插件服务失败:</string>
     <string name="plugin_start_success">升级服务插件已启动</string>
     <string name="plugin_start_error">升级服务插件启动失败，需要重启应用</string>
-    <string name="enable_debug">打开调试</string>
 
+    <string name="enable_debug">打开调试</string>
     <string name="permission_grant_tips">请重新授权</string>
     <string name="device_init_fail">初始化数据不全，请联系管理员</string>
     <string name="device_disabled">设备未启用</string>
@@ -28,6 +28,7 @@
     <string name="net_error">网络错误</string>
     <string name="voice_call_speech">%s呼叫</string>
     <string name="sos_call_speech">%s紧急呼叫</string>
+
     <string name="reinforce_call_speech">%s请求增援</string>
     <string name="emergency_call">紧急报警</string>
     <string name="event_todo">未处理</string>
@@ -35,10 +36,10 @@
     <string name="event_todo_tips">请先处理未接来电</string>
     <string name="voice_message">语音留言</string>
     <string name="video_message">视频留言</string>
-
     <string name="call_video">%s请求视频</string>
     <string name="call_visiting">探视请求</string>
     <string name="call_entrance_guard">门禁请求</string>
+
     <string name="call_sos">紧急呼叫</string>
     <string name="call_reinforce">增援请求</string>
     <string name="call_door">门口机</string>
@@ -47,16 +48,14 @@
     <string name="extension_connect_fail">分机连线失败</string>
     <string name="extension_call_busy">分机正在通话中</string>
     <string name="extension_call_error">分机通话异常</string>
-
     <string name="cost_subtotal">小计: %f</string>
     <string name="exam_desc">描述: %s</string>
     <string name="exam_time">检验时间: %s</string>
-
     <string name="call_wait">请稍后</string>
     <string name="no_custom">床位未入住或未绑定设备，无法呼叫</string>
     <string name="no_device">没有设备，无法呼叫</string>
-    <string name="not_support_video_call">不支持视频通话</string>
 
+    <string name="not_support_video_call">不支持视频通话</string>
     <string name="led_auto_sync_time">自动校准点阵屏时间:</string>
     <string name="led_time_show_seconds">时间显示秒:</string>
     <string name="led_type">点阵屏类型: </string>
@@ -93,7 +92,6 @@
     <string name="call_reject">对方拒绝</string>
     <string name="call_busy">对方忙线中</string>
     <string name="call_incoming">新来电…</string>
-
     <string name="settings_success">设置成功</string>
     <string name="settings_failed">设置失败</string>
     <string name="led_show_reinforce">%s请求增援</string>
@@ -139,6 +137,7 @@
     <string name="str_settings">设置</string>
     <string name="str_delete">删除</string>
     <string name="str_save">保存</string>
+
     <string name="str_upload">上传</string>
     <string name="str_upload_done">上传完成</string>
     <string name="str_video_record">录制</string>
@@ -146,9 +145,6 @@
     <string name="str_manager_host">总控主机</string>
     <string name="server_config">服务器配置</string>
 
-
-
-
     <string name="broadcast_init_error">广播初始化异常</string>
     <string name="broadcast_init_success">广播初始化完成</string>
     <string name="broadcast_start_warning">请先启动广播</string>
@@ -159,20 +155,6 @@
     <string name="broadcast_preview">广播试听…</string>
     <string name="broadcast_stop">广播停止</string>
 
-    <string name="str_voice_msg_btn_title">松开保存，滑动取消</string>
-    <string name="str_voice_msg_btn_text">按住说话</string>
-    <string name="str_voice_msg_record_loss">说话时间太短</string>
-    <string name="str_voice_msg_record_cancel">语音留言已取消</string>
-    <string name="str_empty_voice_msg">未录制语音</string>
-    <string name="str_delete_tip">确认删除?</string>
-    <string name="str_message_content_error">留言内容为空</string>
-    <string name="str_voice_message_invalid">语音留言文件无效</string>
-    <string name="str_video_message_invalid">视频文件无效</string>
-    <string name="str_message_save_success">留言成功!</string>
-    <string name="str_record_message_success">语音录制成功!</string>
-    <string name="str_invalid_creator_name">请先选择创建人</string>
-
-
     <string name="setting_day_night_time">白天-晚上时间设置</string>
     <string name="setting_call_type">播报模式:</string>
     <string name="setting_call_type_tts">TTS</string>
@@ -205,8 +187,6 @@
     <string name="setting_bed_device_call_volume">分机通话音量</string>
     <string name="setting_conversion_box_volume">转换盒系统音量</string>
 
-
-
     <string name="language_set_title">语言:</string>
     <string name="language_set_mode">同步语言设置:</string>
     <string name="str_yes">是</string>
@@ -244,11 +224,9 @@
     <string name="orders">医嘱:</string>
     <string name="illness">病情描述:</string>
     <string name="responsible_bed">管理床位</string>
-
     <string name="str_warning">紧急报警</string>
     <string name="str_fall_alarm">跌倒报警</string>
     <string name="none_warning">无人警报</string>
-
     <string name="reboot_conform">设置成功，重启生效</string>
     <string name="new_event_title">事件待处理</string>
     <string name="call_stay_time">来电超时时间</string>
@@ -257,13 +235,11 @@
     <string name="is_managed">确定托管</string>
     <string name="trusteeship_confirm">该设备将会被托管，托管成功后呼叫信息将会被转移到托管的设备.</string>
     <string name="cancel_managed_btn">长按取消</string>
-
     <string name="no_data">暂无</string>
     <string name="information">基础信息</string>
     <string name="inspection">检验</string>
     <string name="patient_information">患者信息</string>
     <string name="nnursing_care_project">护理项目</string>
-
     <string name="str_br_more">期待更多</string>
     <string name="str_br_list_bt">广播列表</string>
     <string name="str_br_hh_bt">喊话广播</string>
@@ -280,7 +256,6 @@
     <string name="br_list_region"> "广播区域: "</string>
     <string name="br_list_region_1"> "广播区域: 暂无设置 "</string>
     <string name="br_list_time"> "广播时间 "</string>
-
     <string name="br_set_title">广播模式</string>
     <string name="br_set_title_1">手动模式</string>
     <string name="br_set_title_2">自动模式</string>
@@ -305,7 +280,6 @@
     <string name="br_message_12">点击按钮进行喊话广播</string>
     <string name="br_message_13">开始喊话</string>
     <string name="br_message_14">您已选择全部区域，请取消后在选择</string>
-
     <string name="str_docotor_title">医生列表</string>
     <string name="docotor_message_1">确认呼叫医生主机?</string>
     <string name="docotor_message_2">确认呼叫</string>
@@ -321,7 +295,6 @@
     <string name="visit_title_8">探视人: </string>
     <string name="visit_title_9">探视时间： </string>
     <string name="visit_title_10">请选择探视床位（单选）</string>
-
     <string name="visit_message">双方暂未开启通话</string>
     <string name="visit_message_1">房间号为空</string>
     <string name="visit_message_2">数据不全</string>
@@ -331,7 +304,6 @@
     <string name="visit_message_6">审核失败</string>
     <string name="visit_message_7">确认审核</string>
     <string name="visit_message_8">请输入</string>
-
     <string name="visit_txt_1">病人需要休息</string>
     <string name="visit_txt_2">防止感染传播</string>
     <string name="visit_txt_3">病人特殊治疗中</string>
@@ -339,24 +311,19 @@
     <string name="visit_txt_5">遵守医院规定</string>
     <string name="visit_txt_6">保护病人隐私</string>
     <string name="visit_txt_7">急情况处理</string>
-
     <string name="visit_unit_1">"关系："</string>
     <string name="visit_unit_2">床</string>
     <string name="visit_unit_3">已拒绝</string>
     <string name="visit_unit_4">已完成</string>
     <string name="visit_unit_5">查看</string>
-
     <string name="trusteeship_title">托管主机列表</string>
     <string name="trusteeship_message">确认呼叫主机</string>
-
     <string name="str_alarm_title">提醒</string>
     <string name="str_alarm_list">提醒列表</string>
     <string name="str_emergency_list">紧急列表</string>
     <string name="str_blue_code_list">BlueCode列表</string>
-
     <string name="str_message_hint">输入您的留言</string>
     <string name="str_message_list">留言列表</string>
-
     <string name="push_message_bt">普通消息</string>
     <string name="push_message_bt_1">模版消息</string>
     <string name="push_message_bt_2">消息记录</string>

android_host/src/main/res/values/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">NurseHome</string>
     <string name="wdkl_app_name">Host_device</string>
-
     <string name="download_error">Download error!</string>
     <string name="download_cancel">Download cancel</string>
     <string name="update_success">Update success</string>
@@ -29,6 +28,7 @@
     <string name="call_failed">Call failed</string>
     <string name="voice_call_speech">%s calling</string>
     <string name="sos_call_speech">%s emergency call</string>
+
     <string name="reinforce_call_speech">%s reinforce</string>
     <string name="emergency_call">emergency call</string>
     <string name="event_todo">Todo</string>
@@ -36,10 +36,10 @@
     <string name="event_todo_tips">Incoming call todo first</string>
     <string name="voice_message">Voice msg</string>
     <string name="video_message">Video msg</string>
-
     <string name="call_video">%s video call</string>
     <string name="call_visiting">Visiting</string>
     <string name="call_entrance_guard">Entrance guard</string>
+
     <string name="call_sos">Emergency call</string>
     <string name="call_reinforce">Reinforce call</string>
     <string name="call_door">Door call</string>
@@ -48,16 +48,14 @@
     <string name="extension_connect_fail">extension connect fail</string>
     <string name="extension_call_busy">extension busy</string>
     <string name="extension_call_error">extension error</string>
-
     <string name="cost_subtotal">Subtotal: %f</string>
     <string name="exam_desc">Desc: %s</string>
     <string name="exam_time">Time: %s</string>
-
     <string name="call_wait">Please wait</string>
     <string name="no_custom">No custom or no device, call fail</string>
     <string name="no_device">No device</string>
-    <string name="not_support_video_call">Not support video call</string>
 
+    <string name="not_support_video_call">Not support video call</string>
     <string name="led_auto_sync_time">Auto sync led time:</string>
     <string name="led_time_show_seconds">Time show seconds:</string>
     <string name="led_type">Led Type: </string>
@@ -94,7 +92,6 @@
     <string name="call_reject">Call reject</string>
     <string name="call_busy">Call busy</string>
     <string name="call_incoming">Incoming call…</string>
-
     <string name="settings_success">Set success</string>
     <string name="settings_failed">Set failed</string>
     <string name="led_show_reinforce">%s Reinforce</string>
@@ -140,6 +137,7 @@
     <string name="str_settings">Settings</string>
     <string name="str_delete">Delete</string>
     <string name="str_save">Save</string>
+
     <string name="str_upload">Upload</string>
     <string name="str_upload_done">Upload done</string>
     <string name="str_video_record">Record</string>
@@ -156,7 +154,6 @@
     <string name="broadcast_playing">Broadcast playing…</string>
     <string name="broadcast_preview">Broadcast preview…</string>
     <string name="broadcast_stop">Broadcast stop</string>
-
     <string name="setting_day_night_time">Day-night time set</string>
     <string name="setting_call_type">Call type:</string>
     <string name="setting_call_type_tts">TTS</string>
@@ -188,8 +185,6 @@
     <string name="setting_bed_device_night_volume">Extension: night volume</string>
     <string name="setting_bed_device_call_volume">Extension: call volume</string>
     <string name="setting_conversion_box_volume">Conversion box volume</string>
-
-
     <string name="language_set_title">Language:</string>
     <string name="language_set_mode">Sync language from server:</string>
     <string name="str_yes">Yes</string>
@@ -221,17 +216,16 @@
     <string name="inspection_info">Inspection</string>
     <string name="indate">In date:</string>
     <string name="mobile">Mobile:</string>
+
     <string name="duty_doctor">Doctor:</string>
     <string name="duty_nurse">Nurse:</string>
     <string name="nursing_configs">Nursing projects:</string>
     <string name="orders">Orders:</string>
     <string name="illness">Illness:</string>
     <string name="responsible_bed">responsible bed</string>
-
     <string name="str_warning">warning</string>
     <string name="str_fall_alarm">fall alarm</string>
     <string name="none_warning">No one alerts</string>
-
     <string name="reboot_conform">set success, reboot now?</string>
     <string name="new_event_title">New event</string>
     <string name="call_stay_time">Incoming Call timeout</string>
@@ -240,19 +234,17 @@
     <string name="is_managed">Determine escrow</string>
     <string name="trusteeship_confirm">The device will be managed, and the calls will be transferred to the managed device.</string>
     <string name="cancel_managed_btn">Long press cancel</string>
-
     <string name="no_data">No data</string>
     <string name="information">Basic Information</string>
     <string name="inspection">Inspection</string>
     <string name="patient_information">Patient Information</string>
     <string name="nnursing_care_project">Nursing Care Project</string>
-    <string name="str_br_more">Expect more</string>
 
+    <string name="str_br_more">Expect more</string>
     <string name="str_br_list_bt">Broadcast List</string>
     <string name="str_br_hh_bt">Announcement Broadcast</string>
     <string name="str_br_more_bt">More Functions</string>
     <string name="str_br_play_no">No file to play</string>
-
     <string name="br_list_st_bt">Preview</string>
     <string name="br_list_delete_bt">Delete</string>
     <string name="br_list_startup">Enable</string>
@@ -289,7 +281,6 @@
     <string name="br_message_13">Start shouting</string>
     <string name="br_message_14">You have selected all areas, please deselect before selecting</string>
 
-
     <string name="str_docotor_title">Doctor List</string>
     <string name="docotor_message_1">Confirm calling doctor host?</string>
     <string name="docotor_message_2">Confirm call</string>
@@ -305,7 +296,6 @@
     <string name="visit_title_8">Visitor: </string>
     <string name="visit_title_9">Visit Time: </string>
     <string name="visit_title_10">Please select visit bed (single selection)</string>
-
     <string name="visit_message">Both parties have not started the call yet</string>
     <string name="visit_message_1">Room number is empty</string>
     <string name="visit_message_2">Data incomplete</string>
@@ -315,7 +305,6 @@
     <string name="visit_message_6">Review failed</string>
     <string name="visit_message_7">Confirm Review</string>
     <string name="visit_message_8">Please enter</string>
-
     <string name="visit_txt_1">Patient needs rest</string>
     <string name="visit_txt_2">Prevent infection spread</string>
     <string name="visit_txt_3">Patient undergoing special treatment</string>
@@ -323,7 +312,6 @@
     <string name="visit_txt_5">Adhere to hospital regulations</string>
     <string name="visit_txt_6">Protect patient privacy</string>
     <string name="visit_txt_7">Handle emergencies</string>
-
     <string name="visit_unit_1">"Relationship: "</string>
     <string name="visit_unit_2">Bed</string>
     <string name="visit_unit_3">Refused</string>
@@ -332,21 +320,13 @@
 
     <string name="trusteeship_title">Trusteeship Host List</string>
     <string name="trusteeship_message">Confirm calling host</string>
-
     <string name="str_alarm_title">ALARM</string>
     <string name="str_alarm_list">Alarm List</string>
     <string name="str_emergency_list">Emergency List</string>
     <string name="str_blue_code_list">BlueCode List</string>
-
     <string name="str_message_hint">Enter your message</string>
     <string name="str_message_list">Message List</string>
-
     <string name="push_message_bt">Normal Message</string>
     <string name="push_message_bt_1">Template Message</string>
     <string name="push_message_bt_2">Message Records</string>
-
-
-
-
-
 </resources>

app/build.gradle

@@ -132,10 +132,18 @@ android {
             buildConfigField 'String', 'flag', '"12"'
         }
 
-        ZC_3568D {//外购21.5寸横屏分机
+        ZC_3568D {//外购21.5寸横屏分机 卓策
             dimension "app"
             buildConfigField 'String', 'flag', '"13"'
         }
+        DX_156C {//外购 鼎信15.5寸竖屏门口机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"14"'
+        }
+        DX_133C {//外购 鼎信13.3寸竖屏门口机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"15"'
+        }
     }
 
     sourceSets {

build.gradle

@@ -47,8 +47,8 @@ buildscript {
     /**
      * 配置要打包的模块
      */
-    ext.callingdoor = false
-    ext.android_bed = true
+    ext.callingdoor = true
+    ext.android_bed = false
     ext.android_host = false
     ext.android_mobile = false
     ext.android_visiting = false
@@ -65,13 +65,13 @@ buildscript {
     ext.open_433 = false
 
     //设备类型  0 医院 1 月子中心 2 养老院 3 公寓 4 宿舍
-    ext.device_type = 4
+    ext.device_type = 0
 
     //睡眠设备类型  0 4g 1 串口 2 蓝牙 3 wifi
     ext.sleep_type = "3"
 
     //功能板  0 不带k6 k7 旧版本   1 带k6 k7 新版本
-    ext.feature_type = "1"
+    ext.feature_type = "0"
 
     //护士主机——声网探视
     ext.is_agora = false
@@ -83,16 +83,16 @@ buildscript {
 
     if (callingdoor) {
         //门口机
-        ext.app_version_code =118
-        ext.app_version = "1.4.8"
+        ext.app_version_code =119
+        ext.app_version = "1.4.9"
     } else if (android_bed) {
         //分机
         ext.app_version_code =118
         ext.app_version = "1.4.8"
     } else if (android_host) {
         //主机
-        ext.app_version_code = 120
-        ext.app_version = "1.3.20"
+        ext.app_version_code = 121
+        ext.app_version = "1.3.21"
     } else if (android_mobile) {
         ext.home_app = true
         //移动端

callingdoor/build.gradle

@@ -60,6 +60,14 @@ android {
             dimension "app"
             buildConfigField 'String', 'flag', '"7"'
         }
+        DX_156C {//外购 鼎信15.5寸竖屏门口机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"14"'
+        }
+        DX_133C {//外购 鼎信13.3寸竖屏门口机
+            dimension "app"
+            buildConfigField 'String', 'flag', '"15"'
+        }
     }
     lintOptions {
         abortOnError false
@@ -147,6 +155,10 @@ dependencies {
     compile files('libs/rk3288_api.jar')
     //志合sdk
     compile files('libs/zhylapi.jar')
+    //鼎信15.6
+    compile files('libs/sdkapi.jar')
+    //鼎信13.3
+    compile files('libs/ysapi.jar')
 
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/AppUpdateActivity.kt

@@ -92,6 +92,10 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
                     } else if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
                         //a133
                         startInstallA133()
+                    } else if (BuildConfig.flag.equals(Constant.DEV_W_DX)) {
+                        startInstallDX()
+                    }else if (BuildConfig.flag.equals(Constant.DEV_W_DX_2)) {
+                        startInstallDX2()
                     } else {
                         AppUpdateHelper.installAPK(activity)
                     }
@@ -152,6 +156,41 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
         }.start()
     }
 
+    fun startInstallDX() {
+        Thread {
+            AppUpdateHelper.updateAppDX(this, object : AppUpdateHelper.UpdateCallBack {
+                override fun onFailed() {
+                    runOnUiThread {
+                        showMessage(R.string.update_fail)
+                    }
+                }
+
+                override fun onSuccess() {
+                    runOnUiThread {
+                        showMessage(R.string.update_success)
+                    }
+                }
+            })
+        }.start()
+    }
+    fun startInstallDX2() {
+        Thread {
+            AppUpdateHelper.updateAppDX2(this, object : AppUpdateHelper.UpdateCallBack {
+                override fun onFailed() {
+                    runOnUiThread {
+                        showMessage(R.string.update_fail)
+                    }
+                }
+
+                override fun onSuccess() {
+                    runOnUiThread {
+                        showMessage(R.string.update_success)
+                    }
+                }
+            })
+        }.start()
+    }
+
 
     fun installApkForRk3288() {
         val path = AppUpdateHelper.FILE_APK_PATH + "/" + AppUpdateHelper.FILE_APK_NAME

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivationActivity.kt

@@ -111,7 +111,7 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
         NetHelper.getInstance().init()
 
         //初始化串口
-        HardWareFactroy.getHardTools().init()
+        HardWareFactroy.getHardTools().init(this)
 
         //是否卸载旧版本apk
         HardWareFactroy.getHardTools().uninstallApp(this,uninstallApk,APP_NAME)

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -1468,7 +1468,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                         }
 
                         try {
-                            AppUtil.setSystemTime(BaseApplication.appContext, time, timeZone)
+                            HardWareFactroy.getHardTools().setTime(this, time, timeZone)
                             Log.d("setTime", "set sys time1: $time, $timeZone")
                         } catch (e: Exception) {
                             //"20211213:092314"

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/SystemActivity.kt

@@ -8,10 +8,13 @@ import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.databinding.CallingdoorSettingMainBinding
-import com.wdkl.app.ncs.callingdoor.dialog.*
+import com.wdkl.app.ncs.callingdoor.dialog.NetworkDialogHelper
+import com.wdkl.app.ncs.callingdoor.dialog.RebootDialogHelper
+import com.wdkl.app.ncs.callingdoor.dialog.ServicesDialogHelper
+import com.wdkl.app.ncs.callingdoor.dialog.UpdataDialogHelper
+import com.wdkl.app.ncs.callingdoor.hardware.HardWareFactroy
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper
 import com.wdkl.app.ncs.callingdoor.helper.UpdateTipsDialogHelper
-import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseActivity
@@ -109,7 +112,8 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
 
             if (clickTimes > 15) {
                 showMessage("enable status bar")
-                Utils.hideStatusBar(activity, false)
+                //打开底部导航栏
+                HardWareFactroy.getHardTools().startbar(true)
                 clickTimes = 1
             }
             clickTime = time

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/dialog/SystemDialogHelper.java

@@ -75,12 +75,7 @@ public class SystemDialogHelper {
                     } else if (type==2){
                         //打开底部导航栏
                         HardWareFactroy.getHardTools().startbar(true);
-
-                        if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
-                            //关闭守护进程
-                            ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("",10000,false);
-                        }
-
+                        HardWareFactroy.getHardTools().CloseDaemon(true);
 
                         Intent intent = new Intent(Settings.ACTION_SETTINGS);
                         activity.startActivity(intent);

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/HardTools.java

@@ -5,6 +5,7 @@ import android.app.Application;
 import android.content.Context;
 
 import com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity;
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity;
 
 public  class HardTools {
@@ -13,7 +14,7 @@ public  class HardTools {
 
     }
     //初始化
-    public void init(){}
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity){}
     //退出
     public void unInit(){}
     //是否卸载旧版本
@@ -38,8 +39,13 @@ public  class HardTools {
     public void installApk(AppUpdateActivity context ){}
     //安装方式2
     public void startInstallApk(AppUpdateActivity context ){}
+    public void setTime(Context context , long timeMills, String timeZone){}
 
     public void startbar(Boolean is){}
+    //关闭守护
+    public void CloseDaemon(Context context){}
+
+
 
     public void CallConfigg(int mic,int yl){}
     //提供卡号

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/HardWareFactroy.java

@@ -3,6 +3,7 @@ package com.wdkl.app.ncs.callingdoor.hardware;
 import com.wdkl.app.ncs.callingdoor.BuildConfig;
 import com.wdkl.app.ncs.callingdoor.hardware.imp.W3288HardTools;
 import com.wdkl.app.ncs.callingdoor.hardware.imp.WDCHHardTools;
+import com.wdkl.app.ncs.callingdoor.hardware.imp.WDXHardTools;
 import com.wdkl.app.ncs.callingdoor.hardware.imp.Wa133HardTools;
 import com.wdkl.app.ncs.callingdoor.hardware.imp.Z3128HardTools;
 import com.wdkl.app.ncs.callingdoor.hardware.imp.Z3368HardTools;
@@ -27,6 +28,10 @@ public  class HardWareFactroy {
                 hardTools = WDCHHardTools.getInstance();
             }else if(BuildConfig.flag.equals(Constant.DEV_W_A133)){
                 hardTools = Wa133HardTools.getInstance();
+            }else if(BuildConfig.flag.equals(Constant.DEV_W_DX)){
+                hardTools = WDXHardTools.getInstance();
+            }else if(BuildConfig.flag.equals(Constant.DEV_W_DX_2)){
+                hardTools = WDXHardTools.getInstance();
             }
         }
         return hardTools ;

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/W3288HardTools.java

@@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
 import android.util.Log;
 
 import com.example.yf_rk3288_api.YF_RK3288_API_Manager;
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper;
@@ -44,7 +45,7 @@ public class W3288HardTools extends HardTools {
     }
 
     @Override
-    public void init() {
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         Utils.checkCameraSupport();
     }
 
@@ -61,6 +62,16 @@ public class W3288HardTools extends HardTools {
     public void setSOSStop() {
 
     }
+
+
+
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        AppUtil.setSystemTime(context, timeMills, timeZone);
+        super.setTime(context, timeMills, timeZone);
+    }
+
+
     @Override
     public void setDoorLight(int type) {
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/WDCHHardTools.java

@@ -6,12 +6,16 @@ import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper;
+import com.wdkl.app.ncs.callingdoor.helper.SOSHelper;
 import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper;
 import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
 import com.wdkl.ncs.android.middleware.common.Constant;
+import com.wdkl.ncs.android.middleware.utils.AppUtil;
 
 import serialporttest.utils.SerialPortUtil;
 
@@ -30,12 +34,13 @@ public class WDCHHardTools extends HardTools {
     public static WDCHHardTools getInstance(){
         return Z3128HardToolsHolder.z3128HardTools;
     }
-
     @Override
-    public void init() {
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPortDchDOOR10();
     }
 
+
+
     @Override
     public void unInit() {
         SerialPortUtil.getInstance().closeSerialPort();
@@ -44,12 +49,12 @@ public class WDCHHardTools extends HardTools {
 
     @Override
     public void setSOSStart() {
-
+        SOSHelper.sosStart();
     }
 
     @Override
     public void setSOSStop() {
-
+        SOSHelper.sosStop();
     }
     @Override
     public void setDoorLight(int type) {
@@ -75,6 +80,12 @@ public class WDCHHardTools extends HardTools {
 
     }
     @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        AppUtil.setSystemTime(context, timeMills, timeZone);
+        super.setTime(context, timeMills, timeZone);
+    }
+
+    @Override
     public void resetDevicex(Application application) {
         //重新启动app
         Intent mStartActivity = new Intent(application.getApplicationContext(), WelcomeActivity.class);

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/WDX2HardTools.java

@@ -0,0 +1,194 @@
+package com.wdkl.app.ncs.callingdoor.hardware.imp;
+
+
+import android.app.AlarmManager;
+import android.app.Application;
+import android.app.PendingIntent;
+import android.app.zhyl.ZhylManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.util.Log;
+
+
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
+import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
+import com.wdkl.app.ncs.callingdoor.helper.SOSHelper;
+import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.core.locale.SettingConfigNew;
+import com.wdkl.ncs.android.middleware.common.Constant;
+import com.ys.rkapi.MyManager;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import serialporttest.utils.SerialPortUtil;
+
+/**
+ * 外购鼎信13.3 硬件控制类
+ *
+ * */
+public class WDX2HardTools extends HardTools {
+
+    public static final String HARDWDT_SERVICE = "WDXHardTools";
+    public MyManager mMyManager ;
+    private static class WDXHardToolsHolder{
+        private final  static WDX2HardTools wdxHardTools = new WDX2HardTools();
+    }
+
+    public static WDX2HardTools getInstance(){
+        return WDXHardToolsHolder.wdxHardTools;
+    }
+
+    @Override
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
+        mMyManager = MyManager.getInstance(CallingdoorActivationActivity);
+        mMyManager.setConnectClickInterface(new MyManager.ServiceConnectedInterface() {
+            @Override
+            public void onConnect() {
+                Log.d("dx_13.3","API Version = " + mMyManager.getApiVersion());
+            }
+        });
+    }
+
+
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @Override
+    public void setSOSStart() {
+
+        SOSHelper.sosStart();
+    }
+
+    @Override
+    public void setSOSStop() {
+        SOSHelper.sosStop();
+    }
+
+    @Override
+    public void startbar(Boolean is) {
+
+        if (is){
+            mMyManager.hideNavBar(false);
+        }else {
+            mMyManager.hideNavBar(true);
+        }
+    }
+
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        if (timeMills!=0){
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date(timeMills));
+            int year = calendar.get(Calendar.YEAR);
+            int month = calendar.get(Calendar.MONTH) + 1;
+            int day = calendar.get(Calendar.DAY_OF_MONTH);
+            int hour = calendar.get(Calendar.HOUR_OF_DAY);
+            int minute = calendar.get(Calendar.MINUTE);
+            int sec = calendar.get(Calendar.SECOND);
+            mMyManager.setTime( year, month, day, hour, minute,sec);
+        }else {
+            mMyManager.setTime( 0, 0, 0, 0, 0,0);
+        }
+
+        super.setTime(context, timeMills, timeZone);
+    }
+
+    @Override
+    public void setDoorLight(int type) {
+        if (type==1){
+            //绿色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0402000a");
+        }else if (type==2){
+            //关闭
+            SerialPortUtil.getInstance().startLight("fbee0002000a");
+        }else if (type==3){
+            //红色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0102000a");
+        }else if (type==4){
+            //关闭
+            SerialPortUtil.getInstance().startLight("fbee0002000a");
+        }else if (type==5){
+            //黄色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0202000a") ;
+        }
+    }
+    @Override
+    public void resetDevice() {
+        //关机
+//        mMyManager.shutdown();
+        //重启
+        mMyManager.reboot();
+    }
+
+    @Override
+    public void CloseDaemon(Context context) {
+        mMyManager.daemon("none",1);
+
+    }
+
+    @Override
+    public void resetDevicex(Application application) {
+        //重新启动app
+        Intent mStartActivity = new Intent(application.getApplicationContext(), WelcomeActivity.class);
+        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(application.getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager) application.getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 2000, mPendingIntent);
+
+        android.os.Process.killProcess(android.os.Process.myPid());
+        System.exit(0);
+    }
+    @Override
+    public void Registration(Context context) {
+        //获取mac地址
+        Constant.LOCAL_MAC = mMyManager.getSn();
+        Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC;
+        //隐藏导航栏
+        mMyManager.hideNavBar(true);
+        //关闭休眠
+        mMyManager.setDormantInterval(context,2147483647);
+        //开机自启
+        mMyManager.selfStart("com.wdkl.app.ncs.callingdoor");
+        //开启守护
+        mMyManager.daemon("com.wdkl.app.ncs.callingdoor",1);
+        //系统默认语言
+        switch (SettingConfigNew.getLanguageId(context)) {
+            case 1: {
+                //英语
+                mMyManager.setLanguage("US", "en");
+                break;
+            }
+
+            case 2: {
+                //中文
+                mMyManager.setLanguage("CN", "zh");
+                break;
+            }
+
+            case 3: {
+                //西班牙语
+                mMyManager.setLanguage("ES", "es");
+                break;
+            }
+
+            case 4: {
+                //俄语
+                mMyManager.setLanguage("RU", "ru");
+                break;
+            }
+        }
+    }
+    @Override
+    public void uninstallApp(Context context, boolean isuninstall, String name) {
+
+    }
+
+
+}

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/WDXHardTools.java

@@ -0,0 +1,144 @@
+package com.wdkl.app.ncs.callingdoor.hardware.imp;
+
+
+import android.app.AlarmManager;
+import android.app.Application;
+import android.app.PendingIntent;
+import android.app.zhyl.ZhylManager;
+import android.content.Context;
+import android.content.Intent;
+
+import com.lztek.toolkit.Lztek;
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
+import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
+import com.wdkl.app.ncs.callingdoor.helper.NetHelper;
+import com.wdkl.app.ncs.callingdoor.helper.SOSHelper;
+import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.middleware.common.Constant;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import serialporttest.utils.SerialPortUtil;
+
+/**
+ * 外购鼎信 硬件控制类
+ *
+ * */
+public class WDXHardTools extends HardTools {
+
+    public static final String HARDWDT_SERVICE = "WDXHardTools";
+    public Lztek lztek;
+    private static class WDXHardToolsHolder{
+        private final  static WDXHardTools wdxHardTools = new WDXHardTools();
+    }
+
+    public static WDXHardTools getInstance(){
+        return WDXHardToolsHolder.wdxHardTools;
+    }
+
+    @Override
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
+        lztek= Lztek.create(CallingdoorActivationActivity);
+    }
+
+
+
+    @Override
+    public void unInit() {
+
+    }
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        if (timeMills!=0){
+
+            lztek.setSystemTime( timeMills);
+        }
+        super.setTime(context, timeMills, timeZone);
+    }
+
+    @Override
+    public void setSOSStart() {
+
+        SOSHelper.sosStart();
+    }
+
+    @Override
+    public void setSOSStop() {
+        SOSHelper.sosStop();
+    }
+
+
+    @Override
+    public void startbar(Boolean is) {
+        if (is){
+            lztek.showNavigationBar();
+        }else {
+            lztek.hideNavigationBar();
+        }
+
+    }
+    @Override
+    public void setDoorLight(int type) {
+        if (type==1){
+            //绿色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0402000a");
+        }else if (type==2){
+            //关闭
+            SerialPortUtil.getInstance().startLight("fbee0002000a");
+        }else if (type==3){
+            //红色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0102000a");
+        }else if (type==4){
+            //关闭
+            SerialPortUtil.getInstance().startLight("fbee0002000a");
+        }else if (type==5){
+            //黄色闪烁
+            SerialPortUtil.getInstance().startLight("fbee0202000a") ;
+        }
+    }
+    @Override
+    public void resetDevice() {
+        lztek.softReboot();
+    }
+    @Override
+    public void resetDevicex(Application application) {
+        //重新启动app
+        Intent mStartActivity = new Intent(application.getApplicationContext(), WelcomeActivity.class);
+        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(application.getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager) application.getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 2000, mPendingIntent);
+
+        android.os.Process.killProcess(android.os.Process.myPid());
+        System.exit(0);
+    }
+    @Override
+    public void Registration(Context context) {
+        //获取mac地址 无api 使用系统api 读序列号
+        Constant.LOCAL_MAC = NetHelper.getInstance().getIMEI();
+        Constant.DEVICE_REGISTER_ID = Constant.LOCAL_MAC;
+        //自重启 广播
+        //守护
+        Intent intent = new Intent("com.lztek.tools.action.KEEPALIVE_SETUP");
+        intent.putExtra("packageName", "com.wdkl.app.ncs.callingdoor");
+        intent.putExtra("delaySeconds", 5); // 应用退出后 5 秒重新启动
+        context.sendBroadcast(intent);
+    }
+    @Override
+    public void uninstallApp(Context context, boolean isuninstall, String name) {
+
+    }
+    @Override
+    public void CloseDaemon(Context context) {
+        Intent intent = new Intent("com.lztek.tools.action.KEEPALIVE_UNSET");
+        intent.putExtra("packageName", "com.wdkl.app.ncs.callingdoor");
+        context.sendBroadcast(intent);
+
+    }
+
+
+
+}

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/Wa133HardTools.java

@@ -7,9 +7,11 @@ import android.app.PendingIntent;
 import android.app.zhyl.ZhylManager;
 import android.content.Context;
 import android.content.Intent;
+import android.os.RemoteException;
 
 import com.example.yf_rk3288_api.YF_RK3288_API_Manager;
 import com.wdkl.app.ncs.callingdoor.BuildConfig;
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity;
 import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper;
@@ -22,6 +24,9 @@ import com.wdkl.ncs.android.lib.core.locale.SettingConfigNew;
 import com.wdkl.ncs.android.lib.utils.AppTool;
 import com.wdkl.ncs.android.middleware.common.Constant;
 
+import java.util.Calendar;
+import java.util.Date;
+
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import serialporttest.utils.SerialPortUtil;
@@ -42,9 +47,8 @@ public class Wa133HardTools extends HardTools {
     public static Wa133HardTools getInstance(){
         return Wa133HardToolsHolder.wa133HardTools;
     }
-
     @Override
-    public void init() {
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPortA133();
         if (Boolean.parseBoolean(BuildConfig.open_433)){
             SerialPortUtil433.getInstance().openSerialPort();
@@ -52,6 +56,8 @@ public class Wa133HardTools extends HardTools {
         Utils.checkCameraSupport();
     }
 
+
+
     @Override
     public void unInit() {
         SerialPortUtil.getInstance().closeSerialPort();
@@ -94,6 +100,29 @@ public class Wa133HardTools extends HardTools {
     }
 
     @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        try {
+            if (timeMills!=0){
+                ZhylManager.getInstance(BaseApplication.appContext).sys_setTimeZone(timeZone);
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new Date(timeMills));
+                int year = calendar.get(Calendar.YEAR);
+                int month = calendar.get(Calendar.MONTH) + 1;
+                int day = calendar.get(Calendar.DAY_OF_MONTH);
+                int hour = calendar.get(Calendar.HOUR_OF_DAY);
+                int minute = calendar.get(Calendar.MINUTE);
+                ZhylManager.getInstance(BaseApplication.appContext).sys_setTime(BaseApplication.appContext, year, month, day, hour, minute);
+            }else {
+                ZhylManager.getInstance(BaseApplication.appContext).sys_setTimeZone(timeZone);
+            }
+
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+        super.setTime(context, timeMills, timeZone);
+    }
+
+    @Override
     public void setSerial(CallingdoorActivity callingdoorActivity) {
         try {
             Thread.sleep(1500); // 延时1500毫秒 (1.5秒)
@@ -109,6 +138,12 @@ public class Wa133HardTools extends HardTools {
     }
 
     @Override
+    public void CloseDaemon(Boolean is) {
+        ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("",10000,false);
+        super.CloseDaemon(is);
+    }
+
+    @Override
     public void resetDevicex(Application application) {
         //重新启动app
         Intent mStartActivity = new Intent(application.getApplicationContext(), WelcomeActivity.class);
@@ -129,6 +164,9 @@ public class Wa133HardTools extends HardTools {
             ZhylManager zhylManager = ZhylManager.getInstance(BaseApplication.appContext);
             //设置开机自启动
             zhylManager.sys_setSystemBootApp("com.wdkl.app.ncs.callingdoor/com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity");
+            if (!BuildConfig.DEBUG) {
+                zhylManager.sys_setDaemonsActivity("com.wdkl.app.ncs.callingdoor/com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity",5000,true);
+            }
             //隐藏虚拟导航栏
             zhylManager.disp_setNavigationBar(false);
 //            喇叭功放设置

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/Z3128HardTools.java

@@ -10,6 +10,7 @@ import android.util.Log;
 
 import com.umeng.socialize.net.e;
 import com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity;
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity;
 import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
@@ -46,13 +47,13 @@ public class Z3128HardTools extends HardTools {
     }
 
     @Override
-    public void init() {
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPort();
         SerialPortUtil.getInstance().startHeartBeat();
-        //打开433串口0
-//        SerialPortUtil433.getInstance().openSerialPort();
     }
 
+
+
     @Override
     public void unInit() {
         SerialPortUtil.getInstance().closeHeart();
@@ -120,6 +121,12 @@ public class Z3128HardTools extends HardTools {
     }
 
     @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        AppUtil.setSystemTime(context, timeMills, timeZone);
+        super.setTime(context, timeMills, timeZone);
+    }
+
+    @Override
     public void setSOSStart() {
         SOSHelper.sosStart();
     }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/hardware/imp/Z3368HardTools.java

@@ -6,6 +6,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivationActivity;
 import com.wdkl.app.ncs.callingdoor.activity.CallingdoorActivity;
 import com.wdkl.app.ncs.callingdoor.hardware.HardTools;
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper;
@@ -38,15 +39,13 @@ public class Z3368HardTools extends HardTools {
     public static Z3368HardTools getInstance(){
         return Z3128HardToolsHolder.z3128HardTools;
     }
-
     @Override
-    public void init() {
+    public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPort();
         //打开433串口0
         SerialPortUtil433.getInstance().openSerialPort();
         Utils.checkCameraSupport();
     }
-
     @Override
     public void unInit() {
         SerialPortUtil.getInstance().closeHeart();
@@ -66,6 +65,13 @@ public class Z3368HardTools extends HardTools {
     public void resetDevice() {
 
     }
+
+    @Override
+    public void setTime(Context context, long timeMills, String timeZone) {
+        AppUtil.setSystemTime(context, timeMills, timeZone);
+        super.setTime(context, timeMills, timeZone);
+    }
+
     @Override
     public void Registration(Context context) {
         //获取mac地址

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/AppUpdateHelper.java

@@ -14,11 +14,13 @@ import android.os.Environment;
 
 import android.util.Log;
 
+import com.lztek.toolkit.Lztek;
 import com.wdkl.app.ncs.callingdoor.BuildConfig;
 import com.wdkl.app.ncs.callingdoor.hardware.HardWareFactroy;
 import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.utils.AppUtil;
+import com.ys.rkapi.MyManager;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -80,6 +82,36 @@ public class AppUpdateHelper {
         ZhylManager zhylManager = ZhylManager.getInstance(context);
         zhylManager.sys_doSilentInstallApp(path, context);
     }
+    public static void updateAppDX(Context context, UpdateCallBack callBack) {
+        if (checkApkExit(context)) {
+            Log.d(TAG, "文件存在");
+        } else {
+            Log.d(TAG, "文件不存在");
+            if (callBack != null) {
+                callBack.onFailed();
+            }
+            return;
+        }
+
+        String path = FILE_APK_PATH + "/" + FILE_APK_NAME;
+        Lztek  lztek= Lztek.create(context);
+        lztek.installApplication(path);
+    }
+    public static void updateAppDX2(Context context, UpdateCallBack callBack) {
+        if (checkApkExit(context)) {
+            Log.d(TAG, "文件存在");
+        } else {
+            Log.d(TAG, "文件不存在");
+            if (callBack != null) {
+                callBack.onFailed();
+            }
+            return;
+        }
+
+        String path = FILE_APK_PATH + "/" + FILE_APK_NAME;
+        MyManager lztek= MyManager.getInstance(context);
+        lztek.silentInstallApk(path,true);
+    }
 
     public static void updateApp(Context context, UpdateCallBack callBack) {
         if (checkApkExit(context)) {

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -43,9 +43,10 @@ public class Constant {
     public static final String DEV_W_ZX_8 = "8";//外购 中兴8寸
     public static final String DEV_W_PW_10 = "10";//外购普威10寸
     public static final String DEV_W_DCHK_10 = "11";//外购大成慧康10寸，带手柄
-    public static final String DEV_W_RK3288_YM = "12";//外购21.5寸竖屏分机
-    public static final String DEV_W_RK3568_ZC = "13";//外购21.5寸横屏探视分机
-
+    public static final String DEV_W_RK3288_YM = "12";//外购21.5寸竖屏分机(魏，大佬刘-外购)
+    public static final String DEV_W_RK3568_ZC = "13";//外购21.5寸横屏 探视分机(卓策)
+    public static final String DEV_W_DX = "14";//外购鼎信15.6寸竖屏门口机
+    public static final String DEV_W_DX_2 = "15";//外购鼎信13.3寸竖屏门口机
     public static Integer TTSSTATE = 1;
     public static boolean OPEN_DEBUG = true;
     //红色按键按下时发送广播： com.key.home_down