Pārlūkot izejas kodu

[ManagerSetting]
1. 환기 버전 나눔
- 예전버전(상태정보만 물어보는버전(기본)) 과 현재 사용하는버전(신규버전)으로 나눔
2. 최신 Jar 등록
3. 버전업
- 2022.09.22.01 -> 2022.10.25.01
4. 최신 APK 등록

jglee 2 gadi atpakaļ
vecāks
revīzija
8928fcde0d

BIN
10_Release/ManagerSetting.apk


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.09.22.01">
+    android:versionName="2022.10.25.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

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

@@ -85,10 +85,12 @@ public class Const {
     public static final String CONTROLLER_POWERCONTROLLER_KIND_DIRECT = "직결보드";
     public static final String CONTROLLER_POWERCONTROLLER_KIND_MEASURE = "전력측정직결보드";
 
-    public static final String VENTILATION_TYPE_COMMON  = "기본";
+    //2022.10.11 이전에는 기본이 존재함 -> 기본이 "초기"
+    // 현재는 현재 사용하는 프로토콜
+    public static final String VENTILATION_TYPE_OLD_COMMON  = "기본";
     public static final String VENTILATION_TYPE_LH      = "LH향";
     public static final String VENTILATION_TYPE_HOOD    = "후드";
-
+    public static final String VENTILATION_TYPE_COMMON    = "신규";
 
     public static final String ELECTRONICALLY_CURTAIN_TYPE_MAIN_ROOM = "안방커튼";
     public static final String ELECTRONICALLY_CURTAIN_TYPE_LIVING_ROOM = "거실커튼";

+ 18 - 4
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java

@@ -577,7 +577,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                     if (Const.CONTROLLER_SETTING_DO_USED.equals(InfoList.get(3))) {
                         String strType = InfoList.get(5);
 
-                        if (Const.VENTILATION_TYPE_COMMON.equals(strType)) {
+                        if (Const.VENTILATION_TYPE_OLD_COMMON.equals(strType)) {
                             ventilationCurrent = 1;
                         }
                         else if (Const.VENTILATION_TYPE_LH.equals(strType)) {
@@ -586,15 +586,27 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                         else if (Const.VENTILATION_TYPE_HOOD.equals(strType)) {
                             ventilationCurrent = 3;
                         }
+                        //2022.10.11 이전에는 기본이 존재함
+                        //현재는 현재 사용하는 프로토콜
+                        else if (Const.VENTILATION_TYPE_COMMON.equals(strType)) {
+                            ventilationCurrent = 4;
+                        }
+                        else
+                        {
+                            //2022.10.11 이전에는 기본이 존재함
+                            // 현재는 현재 사용하는 프로토콜
+                            ventilationCurrent = 1;
+                        }
                     }
                 }
 
 
                 List<String> itemList = new ArrayList<String>();
                 itemList.add(mActivity.getString(R.string.do_not_used));
-                itemList.add(mActivity.getString(R.string.contoller_ventilation_item_common));
+                itemList.add(mActivity.getString(R.string.contoller_ventilation_item_old_common));
                 itemList.add(mActivity.getString(R.string.contoller_ventilation_item_lh));
                 itemList.add(mActivity.getString(R.string.contoller_ventilation_item_hood));
+                itemList.add(mActivity.getString(R.string.contoller_ventilation_item_common));
 
                 String controllerName = mActivity.getString(R.string.contoller_ventilation);
                 controllerVO = new ControllerVO(type
@@ -1614,12 +1626,14 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                     else {
                         String typeName = null;
 
-                        if (itemName.equals(Const.VENTILATION_TYPE_COMMON))
-                            typeName = Const.VENTILATION_TYPE_COMMON;
+                        if (itemName.equals(Const.VENTILATION_TYPE_OLD_COMMON))
+                            typeName = Const.VENTILATION_TYPE_OLD_COMMON;
                         else if (itemName.equals(Const.VENTILATION_TYPE_LH))
                             typeName = Const.VENTILATION_TYPE_LH;
                         else if (itemName.equals(Const.VENTILATION_TYPE_HOOD))
                             typeName = Const.VENTILATION_TYPE_HOOD;
+                        else if (itemName.equals(Const.VENTILATION_TYPE_COMMON))
+                            typeName = Const.VENTILATION_TYPE_COMMON;
 
                         value += "("
                                 + Const.CONTROLLER_SETTING_DO_USED

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

@@ -280,9 +280,10 @@
     <string name="contoller_door_lock_item_wired">유선</string>
     <string name="contoller_door_lock_item_fingerprint">지문인식</string>
 
-    <string name="contoller_ventilation_item_common">기본</string>
+    <string name="contoller_ventilation_item_old_common">기본</string>
     <string name="contoller_ventilation_item_lh">LH향</string>
     <string name="contoller_ventilation_item_hood">후드</string>
+    <string name="contoller_ventilation_item_common">신규</string>
 
     
     <string name="controller_electronically_curtain_item_main_room">안방커튼</string>