门口机一些优化

app/build.gradle

@@ -224,8 +224,12 @@ android {
                         outputFileName = "wd_door_v${app_version}_${app_version_code}_${releaseTime()}.apk"
                     } else if (project.rootProject.ext.android_visiting){
                         outputFileName = "wd_visiting_v${app_version}_${app_version_code}_${releaseTime()}.apk"
-                    } else {
+                    } else if (project.rootProject.ext.android_mobile){
+                        outputFileName = "wd_mobile_v${app_version}_${app_version_code}_${releaseTime()}.apk"
+                    } else if (project.rootProject.ext.android_host){
                         outputFileName = "wd_host_v${app_version}_${app_version_code}_${releaseTime()}.apk"
+                    } else {
+                        outputFileName = "wd_unknow_v${app_version}_${app_version_code}_${releaseTime()}.apk"
                     }
                 }
             }
@@ -242,8 +246,12 @@ android {
                         outputFileName = "wd_door_v${app_version}_${app_version_code}_${releaseTime()}.apk"
                     } else if (project.rootProject.ext.android_visiting){
                         outputFileName = "wd_visiting_v${app_version}_${app_version_code}_${releaseTime()}.apk"
-                    } else {
+                    } else if (project.rootProject.ext.android_mobile){
+                        outputFileName = "wd_mobile_v${app_version}_${app_version_code}_${releaseTime()}.apk"
+                    } else if (project.rootProject.ext.android_host){
                         outputFileName = "wd_host_v${app_version}_${app_version_code}_${releaseTime()}.apk"
+                    } else {
+                        outputFileName = "wd_unknow_v${app_version}_${app_version_code}_${releaseTime()}.apk"
                     }
                 }
             }

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

@@ -122,7 +122,7 @@ class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDe
         }
 
         device_sys_save_settings_tv.setOnClickListener(this)
-        device_sys_language_settings_tv.setOnClickListener(this)
+        device_sys_call_settings_tv.setOnClickListener(this)
         device_sys_system_settings_tv.setOnClickListener(this)
         device_sys_software_and_information_tv.setOnClickListener(this)
     }
@@ -162,6 +162,37 @@ class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDe
         view_title_layout_img.visibility = View.VISIBLE
         view_title_layout_tv_no.visibility =View.VISIBLE
         view_title_layout_tv_no.setText(R.string.device_config)
+
+        //网络图标
+        if ( Constant.network_state == 1){
+            view_title_layout_iv_wifi.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.visibility = View.GONE
+            view_title_layout_iv_wifi.setImageResource(R.mipmap.ic_wifi_success)
+        }else if ( Constant.network_state == 2){
+            view_title_layout_iv_wifi.visibility = View.GONE
+            view_title_layout_iv_ethernet.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_success)
+        }else{
+            view_title_layout_iv_wifi.visibility = View.GONE
+            view_title_layout_iv_ethernet.visibility = View.VISIBLE
+            view_title_layout_iv_ethernet.setImageResource(R.mipmap.ic_ethernet_fail)
+        }
+        //蓝牙图标
+        if ( Constant.BT_state == 0){
+            view_title_layout_iv_bt.setImageResource(R.mipmap.ic_bt_success)
+        }
+        //白天/黑夜
+        if (Constant.day_state == 0){
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight)
+        }else{
+            view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
+        }
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
     }
 
 
@@ -218,7 +249,7 @@ class DeviceSystemActivity : BaseActivity<BedTextActivityPresenter, CallingbedDe
                 Handler().postDelayed({ AppUpdateHelper.restartApp(activity) }, 3000)
             }
             //通话设置
-            R.id.device_sys_language_settings_tv -> {
+            R.id.device_sys_call_settings_tv -> {
                 if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
                     CallConfigDialogHelper.showDialog(activity)
                 } else {

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

@@ -164,7 +164,13 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingdoorSettingM
         }else{
             view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
         }
-        view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
+
         //设置二维码
         setQrcode()
         try {

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

@@ -141,7 +141,13 @@ class TextActivity : BaseActivity<TextActivityPresenter, CallingdoorTestMainBind
         }else{
             view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
         }
-        view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+
+        if (Constant.TCP_CONNECTED) {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
+        } else {
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+        }
+
         text_sbaj_button.setBackgroundResource(R.drawable.shape_main_hos_txt_bg)
         sbaj_img.visibility=View.INVISIBLE
         mbhj_button.setBackgroundResource(R.drawable.shape_main_hos_txt_bg)

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

@@ -67,7 +67,6 @@ class WebviewActivity :BaseActivity<WebviewActivityPresenter, WebciewLayBinding>
     override fun bindEvent() {
         back_btn.setOnClickListener {
             finish()
-//            push("/callingbed/main")
         }
     }
 
@@ -93,9 +92,9 @@ class WebviewActivity :BaseActivity<WebviewActivityPresenter, WebciewLayBinding>
 
     override fun onBackPressed() {
         if (webview.canGoBack()) {
-            webview.goBack();
+            webview.goBack()
         } else {
-            this.finish();
+            this.finish()
         }
     }
     private fun webviewSetting(webSettings: WebSettings) {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/NursingWorkFragment.kt

@@ -79,9 +79,12 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
             presenter.DeviceMenulist(Constant.DEVICE_REGISTER_ID)
         }
     }
+
     //点击事件
     override fun bindEvent() {
-
+        menu_device_info.setOnClickListener {
+            SystemDialogHelper.showDialog(activity,1)
+        }
     }
 
     override fun destory() {
@@ -106,14 +109,14 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
                 }
             }
             deviceMenuapter.updateData(allOrders)
-        } else {
+        } /*else {
             showDefaultDeviceMenu()
-        }
+        }*/
     }
 
     override fun onNoneNet() {
         showMessage("None net")
-        showDefaultDeviceMenu()
+        //showDefaultDeviceMenu()
     }
 
     private fun showDefaultDeviceMenu() {
@@ -128,7 +131,7 @@ class NursingWorkFragment : BaseFragment<NursingWorkFragmentPresenter, NursingWo
     }
     override fun onError(message: String, type: Int) {
         showMessage(message)
-        showDefaultDeviceMenu()
+        //showDefaultDeviceMenu()
     }
 
     override fun complete(message: String, type: Int) {

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

@@ -66,7 +66,13 @@ public class Wa133HardTools extends HardTools {
 
     @Override
     public void startbar(Boolean is) {
-        ZhylManager.getInstance(BaseApplication.appContext).disp_setNavigationBar(is);
+        try {
+            ZhylManager.getInstance(BaseApplication.appContext).disp_setNavigationBar(is);
+            ZhylManager.getInstance(BaseApplication.appContext).disp_setGestureBar(is);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
         super.startbar(is);
     }
     @Override
@@ -90,7 +96,6 @@ public class Wa133HardTools extends HardTools {
             //红色
             SerialPortHelper.setDoorLight(1, "200"); //红色闪烁
         }else if (type==4){
-            //红色
             SerialPortHelper.setDoorLight(0, "000"); //关闭
         }
     }

callingdoor/src/main/res/layout-land/callingbed_device_sys.xml

@@ -331,14 +331,14 @@
                     android:textStyle="bold" />
 
                 <TextView
-                    android:id="@+id/device_sys_language_settings_tv"
+                    android:id="@+id/device_sys_call_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
                     android:layout_marginRight="@dimen/d24"
                     android:background="@drawable/shape_bed_bg"
-                    android:drawableLeft="@mipmap/kssz_yu"
+                    android:drawableLeft="@mipmap/kssz_xi"
                     android:drawablePadding="@dimen/d15"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d200"

callingdoor/src/main/res/layout-land/view_title_layout.xml

@@ -3,8 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="42dp">
 
-
-    <!--设备号-->
     <LinearLayout
         android:id="@+id/view_title_layout_return"
         android:layout_width="wrap_content"

callingdoor/src/main/res/layout/callingbed_device_sys.xml

@@ -329,18 +329,18 @@
                     android:textStyle="bold" />
 
                 <TextView
-                    android:id="@+id/device_sys_language_settings_tv"
+                    android:id="@+id/device_sys_call_settings_tv"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d60"
                     android:layout_marginLeft="@dimen/d24"
                     android:layout_marginTop="@dimen/d15"
                     android:layout_marginRight="@dimen/d24"
                     android:background="@drawable/shape_bed_bg"
-                    android:drawableLeft="@mipmap/kssz_yu"
+                    android:drawableLeft="@mipmap/kssz_xi"
                     android:drawablePadding="@dimen/d15"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/d200"
-                    android:text="@string/language_settings"
+                    android:text="@string/call_config"
                     android:textColor="#000000"
                     android:textSize="18sp"
                     android:textStyle="bold" />

callingdoor/src/main/res/layout/nursing_work_lay.xml

@@ -6,10 +6,52 @@
         android:layout_height="match_parent"
         android:background="#EAF2F9">
 
+        <LinearLayout
+            android:id="@+id/ll_default_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/menu_device_info"
+                android:layout_width="260dp"
+                android:layout_height="120dp"
+                android:layout_marginLeft="@dimen/d10"
+                android:layout_marginRight="@dimen/d10"
+                android:layout_marginTop="@dimen/d20"
+                android:background="@drawable/shape_other_item_bg"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/d80"
+                    android:layout_height="@dimen/d80"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:src="@drawable/ic_device_info"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:layout_marginLeft="@dimen/d16"
+                    android:text="@string/str_device_info"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/line_view"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_below="@+id/ll_default_menu"
+            android:layout_marginTop="20dp"
+            android:background="@color/gray"/>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_below="@+id/line_view"
             android:clipChildren="true"
             android:padding="@dimen/font_size_20" />
     </RelativeLayout>

callingdoor/src/main/res/layout/view_title_layout.xml

@@ -7,18 +7,6 @@
     android:paddingTop="6dp"
     android:paddingBottom="6dp">
 
-    <TextView
-        android:id="@+id/view_title_layout_tv_no"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="10dp"
-        android:text="ID:"
-        android:textColor="@color/black"
-        android:textSize="@dimen/font_size_18"
-        android:visibility="gone" />
-
     <LinearLayout
         android:id="@+id/view_title_layout_return"
         android:layout_width="@dimen/d105"
@@ -167,4 +155,17 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/view_title_layout_tv_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/ll_date_time_title"
+        android:layout_marginTop="10dp"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:text="ID:"
+        android:textColor="@color/black"
+        android:textSize="@dimen/font_size_18"
+        android:visibility="gone" />
+
 </RelativeLayout>

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

@@ -394,7 +394,7 @@
     <string name="str_device_info">设备信息</string>
 
     <string name="sip_service_not_running">SIP服务未启动</string>
-    <string name="device_test">设备调试</string>
+    <string name="device_test">设备测试</string>
     <string name="str_record_playing">播放中</string>
     <string name="str_record_play_complete">播放完毕</string>
     <string name="str_recording">录音中</string>