Bläddra i källkod

[WallPadSecurity]
1. 거동 수상자 시나리오 이슈 정리
- 거동수상자 딜레이 기간동안, 사용 설정으로 인하여 초기화 되는 경우 방지
2. 거동 수상자 리스트에서 아래 하단 한픽셀씩 밀리는 이슈 수정

jglee 2 år sedan
förälder
incheckning
565814c25c

+ 17 - 11
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/PopupSmartIOTCam.java

@@ -1,6 +1,7 @@
 package kr.co.icontrols.wallpadsecurity.screen;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
@@ -429,23 +430,28 @@ public class PopupSmartIOTCam extends WpadScreen {
 
 
                 // 상태, LED 제어
-                int cam, led;
+                int cam =-1, led = -1;
 
                 if(bCurrentRecordingSet)
                 {
-                    String[] retData = smartKeyRfDoorAPI.SetSensorConfig((byte)0x05, (byte)0x01).split(define.DEVCTR_CMD_SPLITER);
-                    if (retData != null) {
-                        if (retData[0].contains("SUCCESS")) {
-                            Log.d(TAG, "[changeRecordingSet] SetSensorConfig SUCCESS!!!");
-                            bRet = true;
-                        }
-                    }
-                    cam = ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
-                    led = ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_ON);
+//                    String[] retData = smartKeyRfDoorAPI.SetSensorConfig((byte)0x05, (byte)0x01).split(define.DEVCTR_CMD_SPLITER);
+//                    if (retData != null) {
+//                        if (retData[0].contains("SUCCESS")) {
+//                            Log.d(TAG, "[changeRecordingSet] SetSensorConfig SUCCESS!!!");
+//                            bRet = true;
+//                        }
+//                    }
+//                    cam = ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
+//                    led = ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_ON);
+
+                    Intent Newintent = new Intent();
+                    Newintent.setAction("StrangeRecordDelayInit");
+                    mContext.sendBroadcast(Newintent);
+
                 }
                 else
                 {
-                    String[] retData = smartKeyRfDoorAPI.SetSensorConfig((byte)0x05, (byte)0x10).split(define.DEVCTR_CMD_SPLITER);
+                    String[] retData = smartKeyRfDoorAPI.SetSensorConfig((byte)0x05, (byte)0x240).split(define.DEVCTR_CMD_SPLITER);
                     if (retData != null) {
                         if (retData[0].contains("SUCCESS")) {
                             Log.d(TAG, "[changeRecordingSet] SetSensorConfig SUCCESS!!!");

+ 8 - 3
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/VisitorVideoScreen.java

@@ -123,24 +123,29 @@ public class VisitorVideoScreen extends WpadScreen {
             for (int i = 0; i < LIST_CNT; i++) {
                 bVideoCheck[i] = false;
 
+                int index = i;
+
                 if (i == 3) {
                     nPicGuide_X = Common.ImgPosion.GetX(72);
                     nPicGuide_Y += 271;
                     nTextGuide_X = Common.ImgPosion.GetX(72);
                     nTextGuide_Y += 271;
                 }
+
+                // jglee - 화면 좌표가 i가 3일경우부터 밀리기 때문에 좌표 조정 필요
+                if(index >= 3) index = index-3;
 //                Log.e(TAG, "[VideoListBox] i [" + i + "], nPicGuide_X [" + nPicGuide_X + "]");
 
                 mVideoPreview[i] = new WpadImageView(context, WpadImageView.TOUCH_KIND.NONE, 287, 216, R.drawable.video_list_viewer, 0, ID.VisitorVideoMainID.image.VIDEO_PREVIEW_01 + i);
-                ViewRegistration(layout, mVideoPreview[i], nPicGuide_X + (i * 1), nPicGuide_Y);
+                ViewRegistration(layout, mVideoPreview[i], nPicGuide_X + (index * 1), nPicGuide_Y);
                 mVideoPreview[i].setVisibility(View.INVISIBLE);
 
                 mVideoCheck[i] = new WpadImageView(context, WpadImageView.TOUCH_KIND.BUTTON, 288, 216, R.drawable.video_check_normal, R.drawable.video_check_pressed, ID.VisitorVideoMainID.button.CHECK_01 + i);
-                ViewRegistration(layout, mVideoCheck[i], nPicGuide_X + (i * 1), nPicGuide_Y);
+                ViewRegistration(layout, mVideoCheck[i], nPicGuide_X + (index * 1), nPicGuide_Y);
                 mVideoCheck[i].setVisibility(View.INVISIBLE);
 
                 mVideoInfoText[i] = new WpadTextView(context, false, 287, 54, Gravity.CENTER, Color.WHITE, Common.fontsize._21, false, ID.VisitorVideoMainID.text.VIDEO_TEXT_01 + i);
-                ViewRegistration(layout, mVideoInfoText[i], nTextGuide_X + (i * 1), nTextGuide_Y);
+                ViewRegistration(layout, mVideoInfoText[i], nTextGuide_X + (index * 1), nTextGuide_Y);
 
                 nPicGuide_X += 289;
                 nTextGuide_X += 289;