ソースを参照

[WallPadMain]
1. 거동수상자 감지시 현관버튼을 연속으로 눌렀을 때 '딩동' 소리는 재생되지만 월패드는 거동수상자 녹화모드가 진행되는 문제 수정
- Call 앱 중복실행을 막기 위해 new call br을 진행하지 않지만 그 전에 '딩동' 소리를 출력.

jigsjjang 2 年 前
コミット
194f95ceb8

+ 23 - 22
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -2370,29 +2370,7 @@ public class iMapServer extends Service {
                         Log.i(TAG, "[WallPadInterface.BTN_DOOR] bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
 
                         if (!bWallPadCallLive && !bBlockFrontCall) {
-                            bBlockFrontCall = true;
-                            handlerCallCtrl.removeMessages(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL);
-                            handlerCallCtrl.sendEmptyMessageDelayed(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL, 3000);
-                            mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
-
                             try {
-                                if (ModelType == MODEL_TYPE.IHN_1020GL) {
-                                    mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
-                                    mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.BELL_CONT, true);
-                                }
-                                else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
-                                        || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
-                                        || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
-                                        || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
-                                        || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
-                                    mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.DOOR_POWER, true);
-                                    mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.BELL_CONT, true);
-                                }
-
-                                if (!Version.getGatewayUsage()) {
-                                    mDingDongHandler.sendEmptyMessage(0); // 띵똥
-                                }
-
                                 Log.w(TAG, "[WallPadInterface.BTN_DOOR] New Call App!!!");
 
                                 //여기서 확인
@@ -2421,6 +2399,29 @@ public class iMapServer extends Service {
                                     return;
                                 }
                                 Log.d(TAG, "jglee - Call Front");
+
+                                bBlockFrontCall = true;
+                                handlerCallCtrl.removeMessages(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL);
+                                handlerCallCtrl.sendEmptyMessageDelayed(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL, 3000);
+                                mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
+
+                                if (ModelType == MODEL_TYPE.IHN_1020GL) {
+                                    mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
+                                    mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.BELL_CONT, true);
+                                }
+                                else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
+                                        || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
+                                        || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
+                                        || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
+                                        || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
+                                    mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.DOOR_POWER, true);
+                                    mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.BELL_CONT, true);
+                                }
+
+                                if (!Version.getGatewayUsage()) {
+                                    mDingDongHandler.sendEmptyMessage(0); // 띵똥
+                                }
+
                                 runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus);
                             } catch (RuntimeException re) {
                                 LogUtil.errorLogInfo("", TAG, re);