导航栏显示和隐藏优化，增加摄像头检测等

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

@@ -73,7 +73,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
                     runOnUiThread {
                         activity_update_text_download.setText(R.string.updating)
                     }
-                    if ("rk3288".equals(Build.MODEL)) {
+                    if (BuildConfig.flag.equals(Constant.DEV_W_XHG_RK3288)) {
                         installApkForRk3288()
                     } else if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
                         //a133
@@ -82,7 +82,7 @@ class AppUpdateActivity :BaseActivity<AppUpdatePresenter, UpdateLayBinding>(), A
                         startInstallApk()
                     }
                 } else {
-                    if ("rk3288".equals(Build.MODEL)) {
+                    if (BuildConfig.flag.equals(Constant.DEV_W_XHG_RK3288)) {
                         runOnUiThread {
                             activity_update_text_download.setText(R.string.updating)
                         }

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

@@ -119,6 +119,8 @@ class CallingdoorActivationActivity  : BaseActivity<CallingdoorActivationPresent
         //注册方式
         HardWareFactroy.getHardTools().Registration(this)
 
+        HardWareFactroy.getHardTools().startbar(true)
+
         //xCrash catcher
         XCrashUtils().init(application)
 

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

@@ -208,31 +208,11 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         startActivity(intent)
                     } else {
-                        /*if (SettingConfig.getRecordEnable(BaseApplication.appContext)) {
-                            //通话录音
-                            call.params.recordFile = Environment.getExternalStorageDirectory().path +
-                                    "/" + Environment.DIRECTORY_DOWNLOADS +
-                                    "/" + TimeHandle.getRecTimeFilename() + ".wav"
-
-                            if (Constants.showCall && !call.isRecording) {
-                                call.startRecording();
-                            }
-
-                            Log.e("SipCall", "call recording: " + call.isRecording + ", path: " + call.params.recordFile)
-                        }*/
-
                         EventBus.getDefault().post(MessageEvent("sip_connected", Constant.SIP_CONNECTED))
                     }
                 }
 
                 override fun callEnd(call: Call) {
-                    /*if (SettingConfig.getRecordEnable(BaseApplication.appContext)) {
-                        Log.e("SipCall", "call recording: " + call.isRecording + ", record path: " + call.params.recordFile)
-                        if (call.isRecording) {
-                            call.stopRecording()
-                        }
-                    }*/
-
                     EventBus.getDefault().post(MessageEvent("handoff", Constant.EVENT_END_CALL))
                 }
 
@@ -720,6 +700,13 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         handler.removeCallbacksAndMessages(null)
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (initialized) {
+            HardWareFactroy.getHardTools().startbar(false)
+        }
+    }
 
     override fun destory() {
         SoundPoolManager.getInstance().release()
@@ -884,6 +871,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             showMessage("SIP ID empty")
         }
 
+        //隐藏底部导航栏
+        HardWareFactroy.getHardTools().startbar(false)
 
         if (deviceInfo.frameId != null) {
             Constant.FRAME_ID = deviceInfo.frameId

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

@@ -13,6 +13,7 @@ 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.app.ncs.callingdoor.helper.Utils;
 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;
@@ -37,6 +38,8 @@ public class WDCHHardTools extends HardTools {
     @Override
     public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPortDchDOOR10();
+
+        Utils.checkCameraSupport();
     }
 
 

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

@@ -14,6 +14,7 @@ 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.app.ncs.callingdoor.helper.Utils;
 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;
@@ -50,6 +51,8 @@ public class WDX2HardTools extends HardTools {
                 Log.d("dx_13.3","API Version = " + mMyManager.getApiVersion());
             }
         });
+
+        Utils.checkCameraSupport();
     }
 
 

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

@@ -13,6 +13,7 @@ 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.app.ncs.callingdoor.helper.Utils;
 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;
@@ -41,6 +42,8 @@ public class WDXHardTools extends HardTools {
     @Override
     public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         lztek= Lztek.create(CallingdoorActivationActivity);
+
+        Utils.checkCameraSupport();
     }
 
 
@@ -73,9 +76,11 @@ public class WDXHardTools extends HardTools {
     @Override
     public void startbar(Boolean is) {
         if (is){
-            lztek.showNavigationBar();
+            //lztek.showNavigationBar();
+            lztek.navigationBarSlideShow(true);
         }else {
             lztek.hideNavigationBar();
+            lztek.navigationBarSlideShow(false);
         }
 
     }

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

@@ -17,6 +17,7 @@ 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.app.ncs.callingdoor.helper.Utils;
 import com.wdkl.ncs.android.lib.utils.AppTool;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.utils.AppUtil;
@@ -50,6 +51,8 @@ public class Z3128HardTools extends HardTools {
     public void init(CallingdoorActivationActivity CallingdoorActivationActivity) {
         SerialPortUtil.getInstance().openSerialPort();
         SerialPortUtil.getInstance().startHeartBeat();
+
+        Utils.checkCameraSupport();
     }
 
 

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/sip/core/LinphoneManager.kt

@@ -260,13 +260,21 @@ class LinphoneManager private constructor(private val context: Context) {
             if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
                 Log.w(TAG, "[Context] Enabling low bandwidth mode!")
                 params?.enableLowBandwidth(true)
+
+                //params?.isLowBandwidthEnabled = true
             }
             if (isVideoCall) {
                 params?.enableVideo(true)
                 core.enableVideoCapture(true)
                 core.enableVideoDisplay(true)
+
+                //params?.isVideoEnabled = true
+                //core.isVideoCaptureEnabled = true
+                //core.isVideoDisplayEnabled = true
             } else {
                 params?.enableVideo(false)
+
+                //params?.isVideoEnabled = false
             }
             if (params != null) {
                 core.inviteAddressWithParams(addressToCall!!, params)
@@ -294,9 +302,13 @@ class LinphoneManager private constructor(private val context: Context) {
         if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
             Log.w(TAG, "[Context] Enabling low bandwidth mode!")
             params?.enableLowBandwidth(true)
+
+            //params?.isLowBandwidthEnabled = true
         }
         if (supportVideo) {
             params?.enableVideo(isVideoCall(call))
+
+            //params?.isVideoEnabled = isVideoCall(call)
         }
         call.acceptWithParams(params)
     }
@@ -340,6 +352,8 @@ class LinphoneManager private constructor(private val context: Context) {
 
     fun micEnabled() = core.micEnabled()
 
+    //fun micEnabled() = core.isMicEnabled
+
     fun speakerEnabled() = core.outputAudioDevice?.type == AudioDevice.Type.Speaker
 
     /**
@@ -348,6 +362,8 @@ class LinphoneManager private constructor(private val context: Context) {
      */
     fun enableMic(micEnabled: Boolean) {
         core.enableMic(micEnabled)
+
+        //core.isMicEnabled = micEnabled
     }
 
     /**
@@ -382,6 +398,8 @@ class LinphoneManager private constructor(private val context: Context) {
     fun isVideoCall(call: Call): Boolean {
         val remoteParams = call.remoteParams
         return remoteParams != null && remoteParams.videoEnabled()
+
+        //return remoteParams != null && remoteParams.isVideoEnabled
     }
 
 
@@ -396,6 +414,8 @@ class LinphoneManager private constructor(private val context: Context) {
         }
         if (videoPreview != null) {
             core.enableVideoPreview(true)
+
+            //core.isVideoPreviewEnabled = true
             core.nativePreviewWindowId = videoPreview
         }
     }
@@ -449,6 +469,10 @@ class LinphoneManager private constructor(private val context: Context) {
         //core.isVibrationOnIncomingCallEnabled = true
         core.enableEchoCancellation(true) //回声消除
         core.enableAdaptiveRateControl(true) //自适应码率控制
+
+        //core.isEchoCancellationEnabled = true
+        //core.isAdaptiveRateControlEnabled = true
+
         //core.micGainDb = -3.0f
         //val micGain = SettingConfig.getSipMicGain(BaseApplication.appContext)
         //Log.e("Sip", "mic gain db: $micGain")