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

[ManagerSetting]
1. App Ver. 갱신
- 2022.05.04.99
2. 관리자 설정메뉴에 설정항목 추가
- 월패드간 제어기기 멀티제어 사용 여부 설정 및 확인
- 기본값: 사용함
3. 최신 WallPadAPI 적용
- API Ver.: 2022.05.04.99
- 월패드간 제어기기 멀티제어 사용 여부 확인 메소드 추가
- 거실EM 전제조명에 대한 제어 지원 메소드 추가 (씬모드 제어용)

[WallPadAPI]
1. API Ver. 갱신
- 2022.05.04.99
2. 관리자설정메뉴에 설정기능 추가
- 월패드간 제어기기 멀티제어 사용 여부 설정 확인
> public boolean Get_InterWallPadMultiCtrlUsage()
> 기본값: 사용함
> result: true(사용함), false(사용안함)
3. KNX API 기능 추가
- 거실EM의 전체 조명에 대한 제어 지원 메소드 추가 (씬모드 제어용)
> public int SetEntireLivlight(byte hLightCnt, byte[] ahPower, byte[] ahDim, byte[] ahColor)

Changwoo Nam 3 роки тому
батько
коміт
f07c2d743d

BIN
ManagerSetting/libs/WallPadAPI.jar


+ 1 - 1
ManagerSetting/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2022.04.11.03">
+    android:versionName="2022.05.04.99">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

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

@@ -176,6 +176,7 @@ public class MainDatabaseManager {
     public static final int SETTING_ITEM_SUB_DEVICE_ROOMNAME_EDIT_USE           = SETTING_ITEM_TYPE_BASE + 231; //방명칭수정
     public static final int SETTING_ITEM_SUB_DEVICE_SHADING                     = SETTING_ITEM_TYPE_BASE + 232; //차광제어기
     public static final int SETTING_ITEM_SUB_DEVICE_CONCENT                     = SETTING_ITEM_TYPE_BASE + 233; //콘센트
+    public static final int SETTING_ITEM_SUB_INTERWP_MULTI_CTRL                     = SETTING_ITEM_TYPE_BASE + 234;   // 월패드간 제어기기 멀티제어
 
 
     public static final String[] SUB_DEVICE_ITEM_ID = {
@@ -313,6 +314,7 @@ public class MainDatabaseManager {
             , "방명칭수정"
             , "차광제어기"
             , "콘센트"
+            , "월패드간제어기기멀티제어"
     };
 
 
@@ -1397,6 +1399,7 @@ public class MainDatabaseManager {
             case SETTING_ITEM_SUB_DEVICE_ROOMNAME_EDIT_USE:
             case SETTING_ITEM_SUB_DEVICE_SHADING:
             case SETTING_ITEM_SUB_DEVICE_CONCENT:
+            case SETTING_ITEM_SUB_INTERWP_MULTI_CTRL:
                 result = SUB_DEVICE_ITEM_ID[itemType - SETTING_ITEM_SUB_DEVICE_GAS];
                 break;
         }
@@ -2119,6 +2122,10 @@ public class MainDatabaseManager {
                         devInfo = "1(1:콘센트(사용안함))";
                         break;
 
+                    case SETTING_ITEM_SUB_INTERWP_MULTI_CTRL:
+                        devInfo = "1(1:월패드간멀티제어(사용함))";
+                        break;
+
                 }
             }
         }

+ 27 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingDetailFunctionFragment.java

@@ -169,6 +169,7 @@ public class SettingDetailFunctionFragment extends Fragment
     public final int DETAIL_TYPE_VENTI_TIMER =                                    DETAIL_TYPE_BASE + 70;
     public final int DETAIL_TYPE_VENTI_RESERVATION =                              DETAIL_TYPE_BASE + 71;
     public final int DETAIL_TYPE_ROOMNAME_EDIT_USE =                              DETAIL_TYPE_BASE + 72;
+    public final int DETAIL_TYPE_INTERWP_MULTI_CTRL =                              DETAIL_TYPE_BASE + 73;   // 월패드간 제어기기 멀티제어 (성북동)
 
     private Activity mActivity;
     private WallPadAPI mWallPadAPI;
@@ -466,6 +467,8 @@ public class SettingDetailFunctionFragment extends Fragment
         initVentiReservationUse();
         initRoomNameEditUse();
 
+        initInterWallPadMultiCtrl();
+
         initShadingGroupEditUse();
     }
 
@@ -2468,6 +2471,24 @@ public class SettingDetailFunctionFragment extends Fragment
         switchButton.switchEnabled(initValue);
     }
 
+    private void initInterWallPadMultiCtrl() {
+        Log.d(TAG, "[initInterWallPadMultiCtrl]");
+        int type = DETAIL_TYPE_INTERWP_MULTI_CTRL;
+        String typeName = mActivity.getString(R.string.detail_function_interwallpad_multi_ctrl);
+
+        SwitchButton switchButton = (SwitchButton)mRootView.findViewById(R.id.btn_switch_interwallpad_multi_ctrl);
+        switchButton.setSwitchButtonChangedListener(this, type, typeName);
+
+        List<String> listString = new ArrayList<String>();
+        listString.add(mActivity.getString(R.string.do_used));
+        listString.add(mActivity.getString(R.string.do_not_used));
+
+        switchButton.setText(listString);
+
+        boolean initValue = mMainDatabaseManager.isUsedSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_INTERWP_MULTI_CTRL);
+        switchButton.switchEnabled(initValue);
+    }
+
     private String getDefaultPentHouseHo() {
         WallpadStatusData DBMGR = null;
         DBMGR = new WallpadStatusData(mActivity.getApplicationContext());
@@ -2620,6 +2641,7 @@ public class SettingDetailFunctionFragment extends Fragment
             case DETAIL_TYPE_VENTI_TIMER:
             case DETAIL_TYPE_VENTI_RESERVATION:
             case DETAIL_TYPE_ROOMNAME_EDIT_USE:
+            case DETAIL_TYPE_INTERWP_MULTI_CTRL:
                 break;
 
             default:
@@ -4761,6 +4783,10 @@ public class SettingDetailFunctionFragment extends Fragment
                 mMainDatabaseManager.updateSetUsedToSubDeviceSwitchButtonOnOff(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_ROOMNAME_EDIT_USE, position);
                 break;
 
+            case DETAIL_TYPE_INTERWP_MULTI_CTRL:
+                mMainDatabaseManager.updateSetUsedToSubDeviceSwitchButtonOnOff(MainDatabaseManager.SETTING_ITEM_SUB_INTERWP_MULTI_CTRL, position);
+                break;
+
             case DETAIL_TYPE_REGISTRATION_WIRELESS_DOOR_LOCK:
             case DETAIL_TYPE_SEND_HEART_BEAT:
             case DETAIL_TYPE_TOUCH_CALIBRATION:
@@ -4827,8 +4853,8 @@ public class SettingDetailFunctionFragment extends Fragment
             case DETAIL_TYPE_REMOTECTRL_LIGHT:
             case DETAIL_TYPE_HS_PLATFORM_USE:
             case DETAIL_TYPE_ROOMNAME_EDIT_USE:
+            case DETAIL_TYPE_INTERWP_MULTI_CTRL:
                 updateSetUsedToSubDevice(type, position, itemName);
-
                 MainApplication.getApplication().setReboot();
                 break;
 

+ 29 - 0
ManagerSetting/src/main/res/layout/setting_detail_container_gle.xml

@@ -2336,6 +2336,35 @@ android:background="#EFEFEE"
                     />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_interwallpad_multi_ctrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginLeft="10dp"
+
+                    android:gravity="center|left"
+
+                    android:textSize="30sp"
+                    android:textColor="#000000"
+                    android:text="@string/detail_function_interwallpad_multi_ctrl"
+                    android:maxLines="1"
+                    />
+
+                <com.artncore.managersetting.ui.SwitchButton
+                    android:id="@+id/btn_switch_interwallpad_multi_ctrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="20dp"
+                    android:gravity="center"
+                    />
+            </RelativeLayout>
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="1px"

+ 29 - 0
ManagerSetting/src/main/res/layout/setting_detail_container_sa.xml

@@ -2732,6 +2732,35 @@ android:background="#EFEFEE"
                     />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_interwallpad_multi_ctrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginLeft="10dp"
+
+                    android:gravity="center|left"
+
+                    android:textSize="30sp"
+                    android:textColor="#000000"
+                    android:text="@string/detail_function_interwallpad_multi_ctrl"
+                    android:maxLines="1"
+                    />
+
+                <com.artncore.managersetting.ui.SwitchButton
+                    android:id="@+id/btn_switch_interwallpad_multi_ctrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="20dp"
+                    android:gravity="center"
+                    />
+            </RelativeLayout>
+
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="1px"

+ 1 - 0
ManagerSetting/src/main/res/values/strings.xml

@@ -603,6 +603,7 @@
     <string name="detail_function_venti_timer_use">환기 타이머</string>
     <string name="detail_function_venti_reservation_use">환기 예약설정</string>
     <string name="detail_function_roomname_edit_use">방 명칭 수정</string>
+    <string name="detail_function_interwallpad_multi_ctrl">월패드간 제어기기 멀티제어</string>
 
     <string name="show_elevator_default">기본</string>
     <string name="show_elevator_stairs">층표시</string>