Browse Source

[버그 수정]
1. 영상 메모 화면 안나옴 - 영상 메모를 클릭하면 영상은 나오지 않고 녹음만 됩니다.
-> 영상메모 기능 삭제 진행 ( 음성만 활성화)
-> 수정완료(영상 나오지 않게)

2. 메모 화면에서 메뉴 버튼이 동작하지 않습니다. Home 키만 동작합니다.
-> 수정 필요
-> 수정완료 (메뉴 기능 정상 동작 하도록)

3. 외출모드 연동 설정에서 외출 시, 엘레베이터 호출이 빠져야 함.
-> 수정 필요
-> 수정완료(기본 설정을 엘레베이터 호출 사용하지 않음으로 하며, 엘레베이터 사용하지 않을 경우 외출모드 설정에서 빠짐)

4. 월패드 FW version 표시에서 단자대 FW version이 표시되지 않습니다.
-> 단자대 version을 가지고 1000A 현장 대체 유무 판단한다고 합니다. 수정필요
-> 수정완료(뉴스 버전으로 표시 하며, 버전/빌드데이트/펌웨어 버전 을 표시)

5. 월패드 관리자 점검화면에서 대체품 월패드 단자대 통신 점검화면이 빠져 있습니다.
-> 기존 IHN-1030-A2-ALT 은 존재함. 수정 필요
-> 수정완료(추가함)

6. IHN-1000 대체품 월패드에서 서브폰 통신속도가 9600bps로 되어 있습니다.
-> 디폴트를 1200bps로 수정필요
-> 수정완료 (기본값을 1200bps로 수정)

7. 도어락 설정도 설정정보와 동기화 필요
-> 수정 필요
-> 수정완료(사용안함을 제거)

DESKTOP-FBA840V\icontrols 4 years ago
parent
commit
5aae1fdf17

BIN
ManagerSetting/libs/WallPadAPI.jar


+ 1 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/dao/MainDatabaseManager.java

@@ -1744,7 +1744,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_SUBPHONE_BAUDRATE:
-                        devInfo = "1(1:서브폰통신속도(사용함)종류(9600))";
+                        devInfo = "1(1:서브폰통신속도(사용함)종류(1200))";
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_CALL_TIMEOUT:

+ 5 - 4
ManagerSetting/src/main/java/com/artncore/managersetting/domain/Const.java

@@ -1,10 +1,6 @@
 package com.artncore.managersetting.domain;
 
 
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-
 public class Const {
 
     public static final String ARG_ITEM_ID = "item_id";
@@ -167,6 +163,9 @@ public class Const {
 
     public static final String IP_TYPE = "IP";
 
+    //추가
+    public static final String CONTROL_TYPE_HOMEAUTOMATION        = "대체품월패드단자대";
+
 
 
     public static final int CONTROLLER_MAX_COUNT = 8;
@@ -302,6 +301,8 @@ public class Const {
     public static final int CONTROLLER_TYPE_LOUVER = CONTROLLER_TYPE_BASE + 341; // 전동루버
     public static final int CONTROLLER_TYPE_BIOMETICS = CONTROLLER_TYPE_BASE + 342; // 생체인식
 
+    public static final int CONTROLLER_TYPE_HOMEAUTOMATION = CONTROLLER_TYPE_BASE + 343; // 대체품월패드 단자대
+
     public static final String CONTENTS_ROOT = "/storage/emulated/0/wallpaddata/";
     //public static final String CONTENTS_ROOT = "/storage/sdcard0/wallpaddata";
     public static final String BESTIN_CONTENTS_ROOT = "/storage/emulated/0/Bestin/";

+ 21 - 0
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java

@@ -333,6 +333,8 @@ public class CheckControllerFragment extends Fragment {
         }
 
         if (DEBUG)  Log.d(TAG, "mControllerList.size() : " + mControllerList.size());
+
+        addControllerVO(Const.CONTROLLER_TYPE_HOMEAUTOMATION);
     }
 
 
@@ -876,6 +878,17 @@ public class CheckControllerFragment extends Fragment {
             }
             break;
 
+            case Const.CONTROLLER_TYPE_HOMEAUTOMATION:
+            {
+                String controllerName = "대체품월패드 단자대";
+
+                controllerVO = new ControllerVO(type
+                        , controllerName
+                        , 0
+                        , 0);
+            }
+            break;
+
         }
 
         if (controllerVO != null)
@@ -1090,6 +1103,10 @@ public class CheckControllerFragment extends Fragment {
                 title += mControllerList.get(idx).getName() + " " + mActivity.getString(R.string.test) + " : ";
                 result = title + resultTestCommonController(type, DEFAULT_CONTROLLER_INDEX);
                 break;
+            case Const.CONTROLLER_TYPE_HOMEAUTOMATION:
+                title += mControllerList.get(idx).getName() + " " + mActivity.getString(R.string.test) + " : ";
+                result = title + resultTestCommonController(type, DEFAULT_CONTROLLER_INDEX);
+                break;
 
 
             default:
@@ -1322,6 +1339,10 @@ public class CheckControllerFragment extends Fragment {
                 testAPI = mWallPadAPI.Get_KCCDimmingController();
                 break;
 
+            case Const.CONTROLLER_TYPE_HOMEAUTOMATION:
+                testAPI = mWallPadAPI.Get_HomeAutomationController();
+                break;
+
             default:
                 break;
         }

+ 13 - 8
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/QueryVersionInfoFragment.java

@@ -212,11 +212,8 @@ public class QueryVersionInfoFragment extends Fragment {
     // show all VersionInfo
     private void getVersionInfo() {
 
-        if (ModelType == Version.MODEL_TYPE.IHN_1020GL)
-        {
-            m_wpapi = MainActivity.getWallPadAPI();
-            mIntDriverCheckHandler.sendEmptyMessage(0);
-        }
+        m_wpapi = MainActivity.getWallPadAPI();
+        mIntDriverCheckHandler.sendEmptyMessage(0);
 
         showVersionInfo(INFO_TYPE_DONGHO);
         showVersionInfo(INFO_TYPE_IP);
@@ -794,8 +791,6 @@ public class QueryVersionInfoFragment extends Fragment {
     public String getSubBoardVersion() {
         StringBuilder result = new StringBuilder();
 
-        // TO DO
-
         return result.toString();
     }
 
@@ -867,7 +862,17 @@ public class QueryVersionInfoFragment extends Fragment {
                         iGW_Version += "       Protocol Version : " + iGW_Version_array[8] + "." + iGW_Version_array[9] + "\n";
 
                         mTV_Result.append(iGW_Version + "\n");
-                    } else {
+                    }
+                    //새로운 API 가 길이가 3인였기 때문에 나오지 않았음
+                    else if(iGW_Version_array.length == 3)
+                    {
+                        iGW_Version += "       F/W Version: " + iGW_Version_array[0] + "\n";
+                        iGW_Version += "       Build Date : " + iGW_Version_array[1] + "\n";
+                        iGW_Version += "       Protocol Version : " + iGW_Version_array[2] + "\n";
+
+                        mTV_Result.append(iGW_Version + "\n");
+                    }
+                    else {
                         mTV_Result.append("       디바이스 연결 오류. 잠시 후에 다시 시도해 주세요." + "\n");
                     }
                 }

+ 17 - 15
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java

@@ -1,24 +1,21 @@
 package com.artncore.managersetting.ui.fragments;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import kr.co.icontrols.wallpadsupport.Version;
 import android.app.Activity;
 import android.os.Bundle;
-//import android.support.v4.app.Fragment;
-import androidx.fragment.app.Fragment;
-import androidx.core.view.MotionEventCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
 import android.widget.ListView;
 
+import androidx.core.view.MotionEventCompat;
+import androidx.fragment.app.Fragment;
 
 import com.artncore.WallPadDataMgr.WallpadDeviceSet;
+import com.artncore.managersetting.MainApplication;
+import com.artncore.managersetting.R;
 import com.artncore.managersetting.dao.MainDatabaseManager;
 import com.artncore.managersetting.domain.Const;
 import com.artncore.managersetting.domain.ControllerVO;
@@ -26,8 +23,13 @@ import com.artncore.managersetting.ui.ControllerListAdapter;
 import com.artncore.managersetting.ui.activities.MainActivity;
 import com.artncore.managersetting.util.StringUtil;
 import com.artncore.wallpadapi.WallPadAPI;
-import com.artncore.managersetting.MainApplication;
-import com.artncore.managersetting.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import kr.co.icontrols.wallpadsupport.Version;
+
+//import android.support.v4.app.Fragment;
 
 /**
  * A list fragment representing a list of Items. This fragment also supports
@@ -387,20 +389,20 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                 String strType = InfoList.get(5);
 
                 if (Const.CONTROLLER_SETTING_WIRELESS.equals(strType)) {
-                    doorLockCurrent = 1;
+                    doorLockCurrent = 0;
                 }
                 else if (Const.CONTROLLER_SETTING_WIRE.equals(strType)) {
-                    doorLockCurrent = 2;
+                    doorLockCurrent = 1;
                 }
                 else if (Const.CONTROLLER_SETTING_FINGERPRINT.equals(strType)) {
-                    doorLockCurrent = 3;
+                    doorLockCurrent = 2;
                 }
             }
         }
 
 
         List<String> itemList = new ArrayList<String>();
-        itemList.add(mActivity.getString(R.string.do_not_used));
+        //itemList.add(mActivity.getString(R.string.do_not_used));
         itemList.add(mActivity.getString(R.string.contoller_door_lock_item_wireless));
         itemList.add(mActivity.getString(R.string.contoller_door_lock_item_wired));
         itemList.add(mActivity.getString(R.string.contoller_door_lock_item_fingerprint));
@@ -418,7 +420,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
             mControllerList.add(controllerVO);
         }
 
-        if(doorLockCurrent == 1)
+        if(doorLockCurrent == 0)
         {
             int doorLockOpenDelayCurrent = Const.CONTROLLER_SETTING_DO_USED_INDEX;
             if (mMainDatabaseManager.isUsedSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_WIRELESS_DOORLOCK_OPENDELAY) == false)

BIN
WallPadAPI/jar/WallPadAPI.jar


+ 1 - 1
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java

@@ -546,7 +546,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 
 		try
 		{
-			if (GetData == null) return ELEVATOR_FLOOR;
+			if (GetData == null) return ELEVATOR_NONE;
 
 			if (GetData[1].indexOf("사용함") > 0)
 			{

+ 1 - 1
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/MainActivity.java

@@ -138,7 +138,7 @@ public class MainActivity extends WpadActivity {
     private Menu_AdptMain adptMain;
     private MenuListDataClass menuListDataClass;
     private Menu mMenu = null;
-    private boolean MenuOpen = true;
+    private boolean MenuOpen = false;
 
     // PopupActivityRun
     private static boolean PopupActivityRun = false;

+ 11 - 6
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/screen/PopupNewMemo.java

@@ -1,8 +1,5 @@
 package kr.co.icontrols.wallpadaddservice.screen;
 
-import com.artncore.WallPadDataMgr.WallpadDeviceSet;
-import com.artncore.wallpadapi.WallPadAPI;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
@@ -12,14 +9,20 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.artncore.WallPadDataMgr.WallpadDeviceSet;
+import com.artncore.wallpadapi.WallPadAPI;
+
 import kr.co.icontrols.wallpadaddservice.MainActivity;
 import kr.co.icontrols.wallpadaddservice.PopupActivity;
 import kr.co.icontrols.wallpadaddservice.R;
-import kr.co.icontrols.wallpadaddservice.declare.*;
+import kr.co.icontrols.wallpadaddservice.declare.Common;
+import kr.co.icontrols.wallpadaddservice.declare.ID;
 import kr.co.icontrols.wallpadaddservice.declare.ID.NewMemoPopupID;
-import kr.co.icontrols.wallpadsupport.*;
+import kr.co.icontrols.wallpadsupport.WpadImageView;
 import kr.co.icontrols.wallpadsupport.WpadImageView.TOUCH_KIND;
+import kr.co.icontrols.wallpadsupport.WpadScreen;
 import kr.co.icontrols.wallpadsupport.WpadSound.SND;
+import kr.co.icontrols.wallpadsupport.WpadTextView;
 
 @SuppressLint("ViewConstructor")
 public class PopupNewMemo extends WpadScreen {
@@ -38,6 +41,8 @@ public class PopupNewMemo extends WpadScreen {
 
     Context mContext;
 
+    boolean isUseVideoMemo = false;
+
     public PopupNewMemo(Context context, RelativeLayout layout, WallPadAPI wpapi, int operationMode) {
         super(context, layout);
         Log.d(TAG, "[PopupNewMemo] START");
@@ -58,7 +63,7 @@ public class PopupNewMemo extends WpadScreen {
 
         Log.d(TAG, "월패드카메라 nWallPadCamUsage : " + nWallPadCamUsage);
 
-        if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE) {
+        if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE && isUseVideoMemo) {
             m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_picture_normal3, R.drawable.btn_picture_pressed3, ID.NewMemoPopupID.button.NEW_DRAWING);
             ViewRegistration(layout, m_NewDrawing, Common.PopupAlarmMarginLEFT(196), Common.PopupAlarmMarginTOP(585));
             m_NewAudio = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_voice_normal3, R.drawable.btn_voice_pressed3, ID.NewMemoPopupID.button.NEW_AUDIO);

+ 2 - 0
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DLock_Controller.java

@@ -1025,6 +1025,8 @@ public class DLock_Controller extends DeviceManager
         if((mDriver.Status.Outing != 0x00) || (mDriver.Status.Fault != 0x00))
         {
             Send_SetFreeStatus(mDriver.Status.Outing, mDriver.Status.Fault);
+            SendNotifyKindBR(define.NOTIFY_DLOCK_SET_OUTING);
+
         }
 
         // 변경상태 알림

BIN
WallPadSecurity/libs/WallPadAPI.jar