Переглянути джерело

[WallPadMain]
1. 현관문 현재 사용 여부 파악 Intent로 받기(IDC-840SB 이슈 처리)
2. 딜레이 시간 90초로 변경(거동수상자)

jglee 2 роки тому
батько
коміт
e2fa9fe080

+ 1 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -10143,7 +10143,7 @@ public class MainActivity extends WpadActivity {
             Log.d(TAG, "[RecordDelay]");
             Common.bRecordDelay = true;
             Message msg = recordDelayHandler.obtainMessage();
-            recordDelayHandler.sendMessageDelayed(msg, 10 * 1000); // 녹화 종료 후 10초 동안 녹화를 막는다.
+            recordDelayHandler.sendMessageDelayed(msg, 90 * 1000); // 녹화 종료 후 90초 동안 녹화를 막는다.
         }
         catch (Exception e)
         {

+ 4 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/declare/Common.java

@@ -25,7 +25,10 @@ public final class Common {
     public final static boolean DEBUG_LOG_ON = true;
 
     public static boolean bWallPadCallLive = false;
-
+    /**
+     * jglee 현재 콜 현관문 실행여부
+     */
+    public static boolean bWallPadCallFrontLive = false;
     /***
      * 거동 수상자 녹화 상태 확인 변수
      */

+ 18 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -984,6 +984,17 @@ public class iMapServer extends Service {
                         case define.NOTIFY_SMART_DCAM_DETECT:
                             // 스마트현관카메라 거동수상자 발생
 //                            Toast.makeText(getApplicationContext(), "Front camera sensor: DETECTED!!", Toast.LENGTH_SHORT).show();
+                            //jglee - 현관문인경우 파악을 위해
+                            if(Common.bWallPadCallFrontLive || bBlockFrontCall)
+                            {
+                                //현관문일 경우만 return 함
+                                Log.i(TAG, "[mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> bWallPadCallLive [" + bWallPadCallLive + "] return");
+                                Intent Newintent = new Intent();
+                                Newintent.setAction(Common.BR_RECORD_DELAY);
+                                getApplicationContext().sendBroadcast(Newintent);
+                                Log.w(TAG, "jglee - StrangeRecord Delay by Call");
+                                return;
+                            }
                             Log.i(TAG, "jglee - [mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
                             if (!bWallPadCallLive && !bBlockFrontCall) {
                                 if (getStrangerRecordingManagerSetting()) {
@@ -15552,6 +15563,8 @@ public class iMapServer extends Service {
                 bWallPadCallLive = false;
                 bWallPadRecoder  = false;
                 Common.bWallPadCallLive = bWallPadCallLive;
+                //jglee - 현관문 변수 초기화
+                Common.bWallPadCallFrontLive = false;
             }
 
             if (bWallPadCallLive != getCallAppRunning()) {
@@ -15600,6 +15613,11 @@ public class iMapServer extends Service {
                     }
                     nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT;
                     Log.w(TAG,"[WallPadCallLiveBRCheck] bWallPadCallLive [" + bWallPadCallLive + "]");
+
+                    //jglee 여기서 Extra변수값을 적용
+                    boolean isFront = false;
+                    isFront = intent.getBooleanExtra("isFront", false);
+                    Common.bWallPadCallFrontLive = isFront;
                 }
                 else {
                     Log.w(TAG,"[WallPadCallLiveBRCheck] Not supported strActionName [" + strActionName + "]");