|
@@ -71,6 +71,8 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
|
|
|
public String Heating_Manual_Str = "";
|
|
|
|
|
|
+ int nShadingType = WallpadDeviceSet.Curtain;
|
|
|
+
|
|
|
// =================================================================================================
|
|
|
// [[ Create & Close ]] region
|
|
|
// =================================================================================================
|
|
@@ -82,7 +84,7 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
* @param wpapi - 상속받은 WallPadAPI
|
|
|
* @param operationMode - 동작모드
|
|
|
*/
|
|
|
- public CurTainV1MainScreen(Context context, RelativeLayout layout, WallPadAPI wpapi, int operationMode) {
|
|
|
+ public CurTainV1MainScreen(Context context, RelativeLayout layout, WallPadAPI wpapi, int operationMode, int Type) {
|
|
|
super(context, layout);
|
|
|
Log.i(TAG, "[START - Screen] --------------------------------------------");
|
|
|
|
|
@@ -93,6 +95,8 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
nDistributionPanelType = wds.Get_DistributionPannelType_Info();
|
|
|
wds.closeDB();
|
|
|
|
|
|
+ nShadingType = Type;
|
|
|
+
|
|
|
// UX_MODE = ((MainActivity) context).GetEasyModeUXUse() ? Common.UX_EASY_MODE : Common.UX_NORMAL_MODE;
|
|
|
// Log.d(TAG, "[HeatingV2MainScreen] UX_MODE [" + UX_MODE + "]");
|
|
|
/*
|
|
@@ -145,7 +149,11 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
ViewRegistration(layout, BTN_ROOM, Common.ImgPosion.GetX(mROOMPos[0]), Common.ImgPosion.GetY(mROOMPos[1]));
|
|
|
BTN_ROOM.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
|
|
|
|
|
|
- CurrentCurtainImg = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.NONE, 822, 544, R.drawable.bg_curtain_3, 0, ID.CurtainV1main.image.CURTAIN);
|
|
|
+ //여기서 구문
|
|
|
+ int bg_curtain = R.drawable.bg_curtain_3;
|
|
|
+ if(nShadingType == WallpadDeviceSet.RollScreen)
|
|
|
+ bg_curtain = R.drawable.bg_curtain_3;
|
|
|
+ CurrentCurtainImg = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.NONE, 822, 544, bg_curtain, 0, ID.CurtainV1main.image.CURTAIN);
|
|
|
ViewRegistration(getLayout(), CurrentCurtainImg, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(179));
|
|
|
|
|
|
// 4. Button Create
|
|
@@ -388,19 +396,35 @@ public class CurTainV1MainScreen extends WpadScreen {
|
|
|
private void drawModeChange(boolean isLivingRoom, byte mode) {
|
|
|
try {
|
|
|
Log.d("","isLivingRoom ==================== :" + isLivingRoom);
|
|
|
+ int curtain_resource;
|
|
|
if(mode == 0x00)
|
|
|
{
|
|
|
- CurrentCurtainImg.setImageResource(R.drawable.bg_curtain_3);
|
|
|
+ curtain_resource = R.drawable.bg_curtain_3;
|
|
|
+ if(nShadingType == WallpadDeviceSet.RollScreen)
|
|
|
+ {
|
|
|
+ //여기서 이미지
|
|
|
+ }
|
|
|
+ CurrentCurtainImg.setImageResource(curtain_resource);
|
|
|
StatusText.setText("닫힘");
|
|
|
}
|
|
|
else if(mode == 0x01)
|
|
|
{
|
|
|
- CurrentCurtainImg.setImageResource(R.drawable.bg_curtain_1);
|
|
|
+ curtain_resource = R.drawable.bg_curtain_1;
|
|
|
+ if(nShadingType == WallpadDeviceSet.RollScreen)
|
|
|
+ {
|
|
|
+ //여기서 이미지
|
|
|
+ }
|
|
|
+ CurrentCurtainImg.setImageResource(curtain_resource);
|
|
|
StatusText.setText("열림");
|
|
|
}
|
|
|
else if(mode == 0x02 || mode == 0x03)
|
|
|
{
|
|
|
- CurrentCurtainImg.setImageResource(R.drawable.bg_curtain_2);
|
|
|
+ curtain_resource = R.drawable.bg_curtain_2;
|
|
|
+ if(nShadingType == WallpadDeviceSet.RollScreen)
|
|
|
+ {
|
|
|
+ //여기서 이미지
|
|
|
+ }
|
|
|
+ CurrentCurtainImg.setImageResource(curtain_resource);
|
|
|
StatusText.setText("동작중");
|
|
|
}
|
|
|
} catch (RuntimeException re) {
|