新豪格门口机增加隐藏虚拟导航栏，使用sip通话时去掉可视对讲

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

@@ -133,6 +133,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
     private var mAccountCreator: AccountCreator? = null
 
+    private lateinit var yfRk3288ApiManager: YF_RK3288_API_Manager
+
     //网络异常计数
     private var netErrCount : Int = 0
 
@@ -156,13 +158,16 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     }
 
     override fun init() {
+        yfRk3288ApiManager = YF_RK3288_API_Manager(activity)
+
         //rk3288使用序列号注册，其他使用mac地址注册
         if ("rk3288".equals(Build.MODEL)) {
-            val yfRk3288ApiManager = YF_RK3288_API_Manager(activity)
             //获取设备序列号
             Constant.DEVICE_SN = yfRk3288ApiManager.yfgetSerialNumber()
             Constant.DEVICE_REGISTER_ID = Constant.DEVICE_SN
 
+            yfRk3288ApiManager.yfsetNavigationBarVisibility(true)
+            yfRk3288ApiManager.yfsetNavigationBarCanSwap(true)
             //点亮屏幕并设置为永不休眠
             yfRk3288ApiManager.yfSetLCDOn()
             AppTool.Setting.setScreenOffTimeOut(activity, 2147483647)
@@ -559,7 +564,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 //防止重复点击
                 if (!TextUtils.isEmpty(Constant.SIP_ID)) {
                     //没有摄像头则只能拨打语音
-                    if (Constant.supportCamera) {
+                    if (Constant.supportCamera && !SettingConfig.getSipEnabled(activity)) {
                         MenuDialog.build(this)
                             .config(voiceCall = {
                                 startCall(Constant.VOICE_CALL)
@@ -652,6 +657,11 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 if (clickCount > 7) {
                     clickCount = 1
                     AppTool.Setting.systemSetting(activity)
+
+                    if ("rk3288".equals(Build.MODEL)) {
+                        yfRk3288ApiManager.yfsetNavigationBarVisibility(true)
+                        yfRk3288ApiManager.yfsetNavigationBarCanSwap(true)
+                    }
                 }
                 clickVersionTime = System.currentTimeMillis()
             }
@@ -908,6 +918,11 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
         presenter.loadPartSettings(Constant.PART_ID)
 
+        //正常进入界面后隐藏虚拟导航栏
+        if ("rk3288".equals(Build.MODEL)) {
+            yfRk3288ApiManager.yfsetNavigationBarVisibility(false)
+            yfRk3288ApiManager.yfsetNavigationBarCanSwap(false)
+        }
 
         //检查版本
         Constant.silentUpdate = true

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/adapter/BedItemAdapter.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO;
 import com.wdkl.ncs.android.middleware.utils.CommonUtils;
@@ -40,7 +41,7 @@ public class BedItemAdapter extends RecyclerView.Adapter<BedItemAdapter.BedViewH
         String name = CommonUtils.subStringAfter(data.get(i).getFrameBed().getFullName(), "-");
         bedViewHolder.bedName.setText(name);
         bedViewHolder.name.setText(data.get(i).getCustomerName());
-        if (Constant.supportCamera) {
+        if (Constant.supportCamera && !SettingConfig.getSipEnabled(context)) {
             bedViewHolder.videoCall.setVisibility(View.VISIBLE);
         } else {
             bedViewHolder.videoCall.setVisibility(View.GONE);

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -1,9 +1,7 @@
 package com.wdkl.app.ncs.callingdoor.fragment
 
-import android.graphics.BitmapFactory
 import android.os.Build
 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.activity.CallingdoorActivity
 import com.wdkl.app.ncs.callingdoor.databinding.QrCodeLayBinding

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/CallbedDialogHelper.java

@@ -61,8 +61,8 @@ public class CallbedDialogHelper {
 
 
         alertDialog = builder.create();
-        alertDialog.setCanceledOnTouchOutside(false);
-        alertDialog.setCancelable(false);
+        alertDialog.setCanceledOnTouchOutside(true);
+        alertDialog.setCancelable(true);
         alertDialog.show();
 
         //设置dialog宽高及位置

android_door/src/main/h10_3128/res/layout/callingdoor_main_lay_rk3288.xml

@@ -29,7 +29,8 @@
                 android:focusableInTouchMode="true"
                 android:text="--"
                 android:textColor="@color/main_color"
-                android:textSize="140sp" />
+                android:textSize="140sp"
+                android:textStyle="bold"/>
 
             <ViewFlipper
                 android:id="@+id/view_flipper"

android_door/src/main/h10_3128/res/layout/item_bed_rk3288.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_item_bed"
     android:layout_width="match_parent"
     android:layout_height="480dp"
     android:layout_marginTop="20dp"
@@ -12,17 +13,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#EAF2F9">
-        <TextView
+        <com.wdkl.ncs.android.lib.widget.MarqueeTextView
             android:id="@+id/tv_bed_name_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="2"
             android:padding="10dp"
-            android:singleLine="true"
-            android:ellipsize="end"
             android:text="--"
             android:textColor="@color/main_color"
-            android:textSize="54sp" />
+            android:textSize="60sp"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"/>
+
         <TextView
             android:id="@+id/tv_bed_card_no"
             android:layout_width="wrap_content"

android_door/src/main/h10_3128/res/layout/item_bed_rk3288_800.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_item_bed"
     android:layout_width="match_parent"
     android:layout_height="430dp"
     android:layout_marginTop="10dp"
@@ -18,11 +19,15 @@
             android:layout_height="wrap_content"
             android:layout_weight="2"
             android:padding="10dp"
-            android:singleLine="true"
-            android:ellipsize="end"
             android:text="--"
             android:textColor="@color/main_color"
-            android:textSize="48sp" />
+            android:textSize="48sp"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"/>
+
         <TextView
             android:id="@+id/tv_bed_card_no"
             android:layout_width="wrap_content"