Parcourir la source

[WallPadHomeCtrl]
1. 메뉴로드 버그 수정(커튼)

DESKTOP-FBA840V\icontrols il y a 4 ans
Parent
commit
11340d5239

+ 8 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -2110,6 +2110,10 @@ public class MainActivity extends WpadActivity {
 				arrayList.add(API_Menu.SubMenuCtrl.Name_SystemAircon);
 				nChildCnt++;
 			}
+			
+			//전동커튼
+			arrayList.add(API_Menu.SubMenuCtrl.Name_Curtain);
+			nChildCnt++;
 
 			if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
 					|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I)
@@ -2237,6 +2241,10 @@ public class MainActivity extends WpadActivity {
 					tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_Heating;
 				}
 				*/
+				else if (arrayList.get(i).equals(API_Menu.SubMenuCtrl.Name_Curtain)) {
+					tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Curtain;
+					tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_Curtain;
+				}
 				else if (arrayList.get(i).equals(API_Menu.SubMenuCtrl.Name_InnerAirQuality)) {
 					tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Inner_AirQuality;
 					tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_InnerAirQuality;

+ 7 - 14
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_curtain/CurTainV1MainScreen.java

@@ -11,7 +11,6 @@ import android.widget.RelativeLayout;
 
 import com.artncore.WallPadDataMgr.WallpadDeviceSet;
 import com.artncore.commons.DataClasses;
-import com.artncore.wallpadapi.CooktopAPI;
 import com.artncore.wallpadapi.CurtainAPI;
 import com.artncore.wallpadapi.WallPadAPI;
 import com.artncore.wallpadapi.WallPadDevAPI;
@@ -30,7 +29,7 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 
 public class CurTainV1MainScreen extends WpadScreen {
 
-    private final String TAG = "HybridCookTopMainScreen";
+    private final String TAG = "CurTainV1MainScreen";
 
     private boolean isNoUseData = true;
     private final boolean DEBUG_LOG_ON = true;
@@ -339,6 +338,7 @@ public class CurTainV1MainScreen extends WpadScreen {
 
         int OnCount = 0;
         boolean isLivingRoomData = true;
+        //그룹아이디 정보를 가지고 확인하기
         if(mData.Device[0].curtain.getCurtainGroupID() == 0x80)
         {
             isLivingRoomData = true;
@@ -428,11 +428,11 @@ public class CurTainV1MainScreen extends WpadScreen {
         }
 
         //////////////////////////////////////////////////////////////////////////////
-        // MultiSwitch
+        // CurTain
         //////////////////////////////////////////////////////////////////////////////
 
-        // 3. Load API (Light)
-        DebugLogOutput("[Device_ApiLoad] - Step1 : MultiSwitchAPI API Load...");
+        // 3. Load API
+        DebugLogOutput("[Device_ApiLoad] - Step1 : CurTain API Load...");
         try
         {
             curtainAPI = wpapi.Get_CurTainController();
@@ -546,16 +546,13 @@ public class CurTainV1MainScreen extends WpadScreen {
         }
         catch (Exception e)
         {
-            Log.e(TAG, "[Device_Update] - [Exception Error] multiSwitchAPI.Refresh(index:" + index + ", real:" + real + ")");
+            Log.e(TAG, "[Device_Update] - [Exception Error] curtainAPI.Refresh(index:" + index + ", real:" + real + ")");
             //e.printStackTrace();
             LogUtil.errorLogInfo("", TAG, e);
             return -100;
         }
 
-        // 3. Range Check
-
-
-        // 4. Data Copy
+        // 3. Data Copy
         mData = curtainAPI.data;
 
         if(isNoUseData)
@@ -570,8 +567,6 @@ public class CurTainV1MainScreen extends WpadScreen {
             mData.Device[0].curtain.setCurtainStatus((byte) 0);
         }
 
-
-
         if(mData == null) return -1;
 
         // 5. Debug Msg
@@ -586,6 +581,4 @@ public class CurTainV1MainScreen extends WpadScreen {
 
         return 0;
     }
-
-
 }