|
@@ -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] ********************************************");
|