Jelajahi Sumber

禁用返回按钮,3128串口操作过滤

weizhengliang 3 tahun lalu
induk
melakukan
c92c5c1daf

+ 12 - 0
app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -15,6 +15,7 @@ import com.wdkl.core.voip.VoipEvent
 import com.wdkl.net.HttpRequestPresenter
 import com.wdkl.net.urlconn.UrlConnRequest
 import com.wdkl.skywebrtc.SkyEngineKit
+import me.jessyan.autosize.AutoSizeConfig
 import serialporttest.utils.SerialPortUtil
 
 /**
@@ -95,6 +96,17 @@ class Application : BaseApplication() {
             SerialPortUtil.getInstance().openSerialPort()
         }
 
+        //屏幕适配方案
+        /*if ("rk3288".equals(Build.MODEL)) {
+            AutoSizeConfig.getInstance()
+                .setDesignWidthInDp(1080)
+                .setDesignHeightInDp(1920)
+        } else {
+            AutoSizeConfig.getInstance()
+                .setDesignWidthInDp(1024)
+                .setDesignHeightInDp(600)
+        }*/
+
         // 初始化网络请求
         HttpRequestPresenter.init(UrlConnRequest())
         // 初始化信令

+ 9 - 3
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -182,7 +182,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         room_action_nurse.setOnClickListener {
             if (Constant.inNursing) {
                 Constant.inNursing = false
-                SerialPortHelper.setDoorLight(1, "111") //白色
+                if ("rk3128".equals(Build.MODEL)) {
+                    SerialPortHelper.setDoorLight(1, "111") //白色
+                }
                 room_action_nurse.text = "进入护理"
                 room_action_nurse.setBackgroundResource(R.mipmap.bg_bottom_btn)
                 tv_nursing.visibility = View.GONE
@@ -191,7 +193,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 }
             } else {
                 Constant.inNursing = true
-                SerialPortHelper.setDoorLight(1, "010") //绿色
+                if ("rk3128".equals(Build.MODEL)) {
+                    SerialPortHelper.setDoorLight(1, "010") //绿色
+                }
                 room_action_nurse.text = "退出护理"
                 room_action_nurse.setBackgroundResource(R.mipmap.ic_bottom_btn_bg)
                 tv_nursing.visibility = View.VISIBLE
@@ -653,7 +657,9 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                             val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                             nursingInteId = interactionVO.id
                         } else {
-                            DoorLightHelper.handleDoorLight(tcpModel)
+                            if ("rk3128".equals(Build.MODEL)) {
+                                DoorLightHelper.handleDoorLight(tcpModel)
+                            }
                         }
                     }
                 }

+ 3 - 1
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/AppUpdateHelper.java

@@ -214,7 +214,9 @@ public class AppUpdateHelper {
             intent.putExtra("window", 0);
             context.sendBroadcast(intent);
 
-            SerialPortHelper.resetDevice();
+            if ("rk3128".equals(Build.MODEL)) {
+                SerialPortHelper.resetDevice();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 11 - 6
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -1,5 +1,6 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -21,15 +22,19 @@ public class SOSHelper {
     };
 
     public static void sosStart() {
-        SerialPortHelper.setSosLight("2");
-        OtherUtil.sendSosCall(Constant.DEVICE_ID);
+        if ("rk3128".equals(Build.MODEL)) {
+            SerialPortHelper.setSosLight("2");
+            OtherUtil.sendSosCall(Constant.DEVICE_ID);
 
-        //60s之后紧急按钮灯自动复位
-        handler.sendEmptyMessageDelayed(110, 60000);
+            //60s之后紧急按钮灯自动复位
+            handler.sendEmptyMessageDelayed(110, 60000);
+        }
     }
 
     public static void sosStop() {
-        handler.removeCallbacksAndMessages(null);
-        SerialPortHelper.setSosLight("0");
+        if ("rk3128".equals(Build.MODEL)) {
+            handler.removeCallbacksAndMessages(null);
+            SerialPortHelper.setSosLight("0");
+        }
     }
 }

+ 21 - 2
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseActivity.kt

@@ -57,6 +57,13 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
      */
     protected val disposableManager by lazy { DisposableManager() }
 
+    private val FULL_SCREEN_FLAG = (
+            View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    or View.SYSTEM_UI_FLAG_FULLSCREEN)
+
     /**
      * @author  LDD
      * @From   com.wdkl.ncs.android.lib.base.BaseActivity
@@ -72,8 +79,10 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
         /**父类初始化*/
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
-        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or
+                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
 
         /**执行生命周期监听*/
         lifeCycleDo(LIFE_CYCLE_CREATE)
@@ -105,6 +114,11 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
         lifeCycleDo(LIFE_CYCLE_RESUME)
     }
 
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        window.decorView.systemUiVisibility = FULL_SCREEN_FLAG
+    }
+
     /**
      * @author LDD
      * @From   BaseActivity
@@ -262,6 +276,11 @@ abstract class BaseActivity<PresenterType : BaseContract.BasePresenter, DataBind
         resultHandle(resultCode,data)
     }
 
+    override fun onBackPressed() {
+        //禁用返回键
+        //super.onBackPressed()
+    }
+
 //    /**
 //     * 修改默认加载Dialog
 //     */