Bladeren bron

[WallPadHomeCtrl]
1. 콘센트 서브 메뉴 추가
2. 콘센트 점검률 표시 추가
3. 조명 점검률 표시 추가
4. 조명 터치 이벤트 2초 인터벌 삭제

jglee 2 jaren geleden
bovenliggende
commit
09c54be81a

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

@@ -2174,6 +2174,12 @@ public class MainActivity extends WpadActivity {
 					}
 				}
 
+				if(nEnergyProductionUse == WallpadDeviceSet.DO_USE)
+				{
+					arrayList.add(API_Menu.SubMenuCtrl.Name_Concent);
+					nChildCnt++;
+				}
+
 				if (nHeatingUsage == WallpadDeviceSet.DO_USE) {
 					arrayList.add(API_Menu.SubMenuCtrl.Name_Heating);
 					nChildCnt++;
@@ -2317,6 +2323,11 @@ public class MainActivity extends WpadActivity {
 						tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Concent;
 						tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_Concent;
 					}
+					else if(nEnergyProductionUse == WallpadDeviceSet.DO_USE)
+					{
+						tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.HDCLivingNEach_Concent;
+						tempMenuListDataClass.idMappingTable[i].Name = API_Menu.SubMenuCtrl.Name_Concent;
+					}
 				}
 				else if (arrayList.get(i).equals(API_Menu.SubMenuCtrl.Name_Gas)) {
 					tempMenuListDataClass.idMappingTable[i].Id = API_Menu.SubMenuCtrl.Gas;

+ 14 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_concent/ConcentEnergyMeterScreen.java

@@ -17,12 +17,14 @@ import com.artncore.commons.DataClasses;
 import com.artncore.commons.define;
 import com.artncore.wallpadapi.EnergyMeterAPI;
 import com.artncore.wallpadapi.WallPadAPI;
+import com.artncore.wallpadapi.WallPadDevAPI;
 import com.util.LogUtil;
 
 import kr.co.icontrols.wallpadhomectrl.MainActivity;
 import kr.co.icontrols.wallpadhomectrl.R;
 import kr.co.icontrols.wallpadhomectrl.declare.Common;
 import kr.co.icontrols.wallpadhomectrl.declare.ID;
+import kr.co.icontrols.wallpadhomectrl.declare.TransactionDisplay;
 import kr.co.icontrols.wallpadsupport.WpadImageView;
 import kr.co.icontrols.wallpadsupport.WpadScreen;
 import kr.co.icontrols.wallpadsupport.WpadSound;
@@ -109,6 +111,7 @@ public class ConcentEnergyMeterScreen extends WpadScreen
 
     // [API]
     private EnergyMeterAPI energyMeterAPI = null;     // 대외향 - 멀티스위치 조명제어기 API
+    private TransactionDisplay transactionDisplay = null;
 
     // =================================================================================================
     // [[ Create & Close ]] region
@@ -245,7 +248,16 @@ public class ConcentEnergyMeterScreen extends WpadScreen
         Draw_Update();
         Draw_TitleUpdate();
 
-        if(OPERATION_MODE == Common.MODE_NOMAL) Device_BrRegistration(true);
+        if(energyMeterAPI!=null)
+        {
+            if(OPERATION_MODE == Common.MODE_NOMAL) Device_BrRegistration(true);
+            if (MainActivity.getHideMenuOn()) {
+                TransactionDisplay.APIList mAPIList = new TransactionDisplay.APIList();
+                for (int i = 0; i < energyMeterAPI.data.RoomCnt; i++) mAPIList.Add(energyMeterAPI, i, mRoomNameList[i]);
+                transactionDisplay = new TransactionDisplay(mAPIList, (WpadScreen) this);
+            }
+        }
+
     }
 
     /**
@@ -261,6 +273,7 @@ public class ConcentEnergyMeterScreen extends WpadScreen
         if(energyMeterAPI != null)
         {
             Device_BrRegistration(false);
+            if(MainActivity.getHideMenuOn()) { if(transactionDisplay != null) transactionDisplay.Close(); }
         }
 
         Log.i(TAG, "[END   - Screen] ********************************************");

+ 10 - 10
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightHdcLightEnergyMeterMainScreen.java

@@ -499,9 +499,8 @@ public class LightHdcLightEnergyMeterMainScreen extends WpadScreen {
 
             if (MainActivity.getHideMenuOn()) {
                 TransactionDisplay.APIList mAPIList = new TransactionDisplay.APIList();
-                for (int i = 0; i < mEnergyMeterAPI.data.RoomCnt; i++) mAPIList.Add(mEnergyMeterAPI, i, mRoomNameList[i]);
-                mAPIList.Add(mIntLightAPI, 0, "일체형조명");
-
+                mAPIList.Add(mIntLightAPI, 0, mRoomNameList[0]);
+                for (int i = 0; i < mEnergyMeterAPI.data.RoomCnt; i++) mAPIList.Add(mEnergyMeterAPI, i, mRoomNameList[i+1]);
                 transactionDisplay = new TransactionDisplay(mAPIList, (WpadScreen) this);
             }
         }
@@ -672,13 +671,14 @@ public class LightHdcLightEnergyMeterMainScreen extends WpadScreen {
         int MoveEvent = event.getAction();
 
         if (MoveEvent == MotionEvent.ACTION_UP) {
-            long currentClickTime = SystemClock.uptimeMillis();
-            long elapsedTime = currentClickTime - mLastClickTime;
-            mLastClickTime = currentClickTime;
-            if (elapsedTime < MIN_CLICK_INTERVAL) {
-                mLastClickTime = 0;
-                return;
-            }
+//            long currentClickTime = SystemClock.uptimeMillis();
+//            long elapsedTime = currentClickTime - mLastClickTime;
+//            mLastClickTime = currentClickTime;
+//            if (elapsedTime < MIN_CLICK_INTERVAL) {
+//                Log.d(TAG, "jglee - Ontouch TimeException : " + elapsedTime );
+//                mLastClickTime = 0;
+//                return;
+//            }
 
             if ((TargetId >= ID.LightHdcLightEnergyMeterMainScreen.button.LIGHT_1) && (TargetId <= ID.LightHdcLightEnergyMeterMainScreen.button.LIGHT_15)) {
                 // 각방 조명 제어