Browse Source

门口机没有开启显示分机呼叫时会导致门灯亮一会后自动熄灭问题

weizhengliang 2 years ago
parent
commit
ba7e3a6c54

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

@@ -248,7 +248,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         //3288 10.1寸竖屏:width=800,  height=1280
         Log.d(TAG, "device orientation: ${Constant.DEVICE_ORIENTATION}, width: ${dm.widthPixels}, height: ${dm.heightPixels}")
 
-        startScheduledExecutor()
+        //startScheduledExecutor()
     }
 
     //检查launch版本
@@ -1429,7 +1429,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 val iterator = bedCalls.iterator()
                 while (iterator.hasNext()) {
                     val it = iterator.next()
-                    if (System.currentTimeMillis() - it.time >= 5 * 60 * 1000) {
+                    if (System.currentTimeMillis() - it.time >= 10 * 60 * 1000) {
                         iterator.remove()
                     }
                 }

+ 0 - 9
android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -95,15 +95,6 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
 
             Constant.bedCustomIn = count > 0
 
-            //当前没有呼叫则
-            if (Constant.callNums == 0 && !Constant.sosOn) {
-                DoorLightHelper.resetDoorLight()
-            }
-
-            if (simulateBed) {
-                EventBus.getDefault().post(MessageEvent("remove_call_bed", Constant.EVENT_REMOVE_CALL_BED))
-            }
-
             //var bedNames = ""
             //val bedSize = bedList.size
             //if (bedSize == 1) {

+ 1 - 1
android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -30,7 +30,7 @@ public class SOSHelper {
             Constant.sosOn = true;
 
             //5min之后紧急按钮灯自动复位
-            handler.sendEmptyMessageDelayed(110, 300000);
+            handler.sendEmptyMessageDelayed(110, 600000);
         }
     }