|
@@ -4,6 +4,7 @@ import android.content.Context;
|
|
|
import android.content.Intent;
|
|
|
import android.graphics.Color;
|
|
|
import android.os.SystemClock;
|
|
|
+import android.text.TextUtils;
|
|
|
import android.util.Log;
|
|
|
import android.util.TypedValue;
|
|
|
import android.view.Gravity;
|
|
@@ -62,8 +63,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
// private WpadImageView MediumVolumeBtn;
|
|
|
// private WpadImageView StrongVolumeBtn;
|
|
|
private WpadImageView AllRoomBG;
|
|
|
- private WpadImageView LouverTitle;
|
|
|
- private WpadImageView LouverMode;
|
|
|
+ //private WpadImageView LouverTitle;
|
|
|
+ //private WpadImageView LouverMode;
|
|
|
|
|
|
// [Button]
|
|
|
private WpadImageView LeftMoveBtn;
|
|
@@ -81,7 +82,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
// [Variables]
|
|
|
private int OPERATION_MODE = -1; // 동작모드
|
|
|
private Data mData = null; // 데이터
|
|
|
- private DataLouver mDataLouver = null; // 데이터
|
|
|
+ //private DataLouver mDataLouver = null; // 데이터
|
|
|
private String[] mRoomNameList = null; // 각방 명칭
|
|
|
|
|
|
private int AirconCount = 0;
|
|
@@ -187,7 +188,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
ViewRegistration(getLayout(), TitleBtn, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10));
|
|
|
TitleBtn.setTouchDelayMs(Common.BTN_DELAY_SHOWPOPUP);
|
|
|
|
|
|
- int[] mTitleFontSize = {Common.fontsize._30, Common.fontsize._44};
|
|
|
+ int[] mTitleFontSize = {28, Common.fontsize._44};
|
|
|
TitleText = new WpadTextView(getContext(), false, mTitleSize[UX_MODE][0], mTitleSize[UX_MODE][1], Gravity.CENTER, Color.BLACK, mTitleFontSize[UX_MODE], true, ID.KnxSystemAirconMain.text.ROOM_TITLE_1 + index);
|
|
|
//ViewRegistration(getLayout(), TitleText, left+10, top+10);
|
|
|
ViewRegistration(getLayout(), TitleText, Common.ImgPosion.GetX(left + 10), Common.ImgPosion.GetY(top + 10) - UX_MODE * 2);
|
|
@@ -253,7 +254,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
|
|
|
// [API]
|
|
|
private KnxSystemAirconAPI airconAPI; // 난방 API
|
|
|
- private LouverAPI louverAPI = null; // 루버 API
|
|
|
+ //private LouverAPI louverAPI = null; // 루버 API
|
|
|
private byte [] mDriveModeByte = new byte [] {KnxSystemAircon.ONOFF.NoInfo, KnxSystemAircon.ONOFF.AirconON, KnxSystemAircon.ONOFF.AirconOFF, KnxSystemAircon.MODE.Auto, KnxSystemAircon.MODE.Cold, KnxSystemAircon.MODE.Dry, KnxSystemAircon.MODE.Venti, KnxSystemAircon.MODE.Heat};
|
|
|
private byte [] mDriveVolumeByte = new byte [] {KnxSystemAircon.VOLUME.Weak, KnxSystemAircon.VOLUME.Medium, KnxSystemAircon.VOLUME.Strong};
|
|
|
//
|
|
@@ -303,7 +304,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
else mRoomNameList = roomNameList;
|
|
|
|
|
|
mData = new Data();
|
|
|
- mDataLouver = new DataLouver();
|
|
|
+ //mDataLouver = new DataLouver();
|
|
|
inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
|
|
|
|
// 2. Device API Load & Update
|
|
@@ -384,11 +385,12 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
AutoVolumeBtn = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.BUTTON, 103, 100, R.drawable.btn_wind_4_normal, R.drawable.btn_wind_4_pressed, ID.KnxSystemAirconMain.button.AUTO_VOLUME);
|
|
|
ViewRegistration(getLayout(), AutoVolumeBtn, Common.ImgPosion.GetX(1097), Common.ImgPosion.GetY(603 - yMarginWithPage));
|
|
|
*/
|
|
|
+/*루버 제거
|
|
|
LouverTitle = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.NONE, 103, 70, R.drawable.louver_title_1, R.drawable.louver_title_1, ID.KnxSystemAirconMain.button.LOUVER_TITLE);
|
|
|
ViewRegistration(getLayout(), LouverTitle, Common.ImgPosion.GetX(990), Common.ImgPosion.GetY(722 - yMarginWithPage));
|
|
|
LouverMode = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.BUTTON, 103, 70, R.drawable.louver_airc_status_2, R.drawable.louver_airc_status_2, ID.KnxSystemAirconMain.button.LOUVER_MODE);
|
|
|
ViewRegistration(getLayout(), LouverMode, Common.ImgPosion.GetX(1097), Common.ImgPosion.GetY(722 - yMarginWithPage));
|
|
|
-
|
|
|
+*/
|
|
|
// 4. Button Create
|
|
|
DebugLogOutput("[Create] - Step4 : Room & Button Create");
|
|
|
AirconCount = info.InsideAirconCount;
|
|
@@ -429,16 +431,17 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
if (MainActivity.getHideMenuOn())
|
|
|
transactionDisplay = new TransactionDisplay(true, (WallPadDevAPI) airconAPI, (WpadScreen) this);
|
|
|
}
|
|
|
+ /*
|
|
|
if (louverAPI != null) {
|
|
|
- /*
|
|
|
+
|
|
|
Device_BrRegistration_Louver(true);
|
|
|
Draw_Update(INDEX_LOUVER);
|
|
|
|
|
|
if (MainActivity.getHideMenuOn())
|
|
|
transactionDisplay = new TransactionDisplay(true, (WallPadDevAPI) airconAPI, (WpadScreen) this);
|
|
|
-
|
|
|
- */
|
|
|
}
|
|
|
+
|
|
|
+ */
|
|
|
} else {
|
|
|
Draw_Update(Common.INDEX_ALL);
|
|
|
}
|
|
@@ -500,6 +503,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
*
|
|
|
* @return (int) - >=0 : 성공, <0 : 실패
|
|
|
*/
|
|
|
+ /*
|
|
|
private int Device_BrRegistration_Louver(boolean OnOff) {
|
|
|
DebugLogOutput("[Device_BrRegistration_Louver] - Start (OnOff:" + OnOff + ")");
|
|
|
|
|
@@ -539,6 +543,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+ */
|
|
|
|
|
|
/**
|
|
|
* 부모 Activity 에서 BroadcastReceiver 을 수신받을시 호출됨
|
|
@@ -900,20 +905,21 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
switch (info.AirconStatus) {
|
|
|
case 0:
|
|
|
//msg = "(정보없음 or 열교환기 응답 없음)";
|
|
|
- msg = "(0)";
|
|
|
+ msg = "\n(실외기 정보 수신 대기중 - 0)";
|
|
|
break;
|
|
|
|
|
|
case 1:
|
|
|
//msg = "(실외기 수는 받았으나, 실내기 수 미수신 상태)";
|
|
|
- msg = "(1)";
|
|
|
+ msg = "\n(실내기 개수 정보 수신 대기중 - 1)";
|
|
|
break;
|
|
|
|
|
|
case 2:
|
|
|
//msg = "(실내기 수는 받았으나, 전체방 모니터링 정보 미수신 상태)";
|
|
|
- msg = "(2)";
|
|
|
+ msg = "\n(실내기 상태 정보 수신 대기중 - 2)";
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
+ msg = "\n(알수 없음)";
|
|
|
break;
|
|
|
}
|
|
|
AlarmText.setText("에어컨 연동 준비중입니다. 잠시후 다시 시도해주세요." + msg);
|
|
@@ -940,14 +946,15 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
Draw_VolumeChange(i, (byte) roomData.Volume); // 풍량 표시
|
|
|
Draw_NowTempChange(i, roomData.NowTemp); // 현재온도 표시
|
|
|
Draw_SetTempChange(i, roomData.SetTemp); // 설정온도 표시
|
|
|
- if(roomData.OnOff== KnxSystemAircon.ONOFF.AirconON)
|
|
|
- onAirconCount++;
|
|
|
- if(i==0){
|
|
|
- savedMode = (byte)roomData.Mode; //모드 저장
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 전체제어 영역 상태 갱신을 위해
|
|
|
+ for (int i = 0; i < info.InsideAirconCount; i++) {
|
|
|
+ if (mData.systemAircon.Device.Aircon[i].OnOff == KnxSystemAircon.ONOFF.AirconON) onAirconCount++;
|
|
|
+ if (i==0) savedMode = (byte) mData.systemAircon.Device.Aircon[i].Mode;
|
|
|
+ }
|
|
|
+
|
|
|
if(onAirconCount>0){
|
|
|
bCurrentAllOnOff = true;
|
|
|
onAirconCount = 0;
|
|
@@ -989,20 +996,21 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
switch (info.AirconStatus) {
|
|
|
case 0:
|
|
|
//msg = "(정보없음 or 열교환기 응답 없음)";
|
|
|
- msg = "(0)";
|
|
|
+ msg = "\n(실외기 정보 수신 대기중 - 0)";
|
|
|
break;
|
|
|
|
|
|
case 1:
|
|
|
//msg = "(실외기 수는 받았으나, 실내기 수 미수신 상태)";
|
|
|
- msg = "(1)";
|
|
|
+ msg = "\n(실내기 개수 정보 수신 대기중 - 1)";
|
|
|
break;
|
|
|
|
|
|
case 2:
|
|
|
//msg = "(실내기 수는 받았으나, 전체방 모니터링 정보 미수신 상태)";
|
|
|
- msg = "(2)";
|
|
|
+ msg = "\n(실내기 상태 정보 수신 대기중 - 2)";
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
+ msg = "\n(알수 없음)";
|
|
|
break;
|
|
|
}
|
|
|
AlarmText.setText("에어컨 연동 준비중입니다. 잠시후 다시 시도해주세요." + msg);
|
|
@@ -1220,6 +1228,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
*
|
|
|
* @param status - (byte) 변경할 운전모드 ( 0 : OFF, 1 : ON )
|
|
|
*/
|
|
|
+ /*
|
|
|
private void Draw_LouverStatusChange(byte status) {
|
|
|
if (status== LouverAPI.LOUVERSTATUS.Close) {
|
|
|
LouverMode.setImageResource(R.drawable.louver_airc_status_2);
|
|
@@ -1233,6 +1242,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ */
|
|
|
+
|
|
|
/**
|
|
|
* {@link #roomView} 에 대한 기본적인 범위체크를 한다.
|
|
|
*
|
|
@@ -1259,12 +1270,6 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
{
|
|
|
if(!Draw_RangeChecker(index)) return;
|
|
|
roomView[index].TitleText.setText(value);
|
|
|
- roomView[index].TitleText.setTextSize(0, Common.fontsize._30);
|
|
|
- if(value.length() == 6)
|
|
|
- {
|
|
|
- roomView[index].TitleText.setTextSize(0, Common.fontsize._26_DEFAULT);
|
|
|
- }
|
|
|
-
|
|
|
}
|
|
|
|
|
|
// =================================================================================================
|
|
@@ -1309,6 +1314,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
|
|
|
DebugLogOutput("[Device_ApiLoad] - Step1 : Louver API Load...");
|
|
|
//Louver 가 에러인 경우엔, return error를 하지 않고 에러를 이미지를 표시해준다.
|
|
|
+ /*
|
|
|
try
|
|
|
{
|
|
|
louverAPI = wpapi.Get_LouverController();
|
|
@@ -1328,6 +1334,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
LouverMode.setImageResource(R.drawable.louver_airc_status_1);
|
|
|
}
|
|
|
|
|
|
+ */
|
|
|
+
|
|
|
DebugLogOutput("[Device_ApiLoad] - OK");
|
|
|
|
|
|
return 0;
|
|
@@ -1384,8 +1392,9 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
// 4. Data Copy
|
|
|
mData.systemAircon = airconAPI.data;
|
|
|
// 2. Reflash
|
|
|
+ /*
|
|
|
if (louverAPI != null) {
|
|
|
- /*
|
|
|
+
|
|
|
try {
|
|
|
|
|
|
int ret = (byte) louverAPI.Refresh(real);
|
|
@@ -1402,9 +1411,9 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
e.printStackTrace();
|
|
|
//return -100;
|
|
|
}
|
|
|
-
|
|
|
- */
|
|
|
}
|
|
|
+
|
|
|
+ */
|
|
|
} else {
|
|
|
// 2. Reflash
|
|
|
/*
|
|
@@ -1435,12 +1444,6 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
|
|
|
DebugLogOutput("---------------------------------------");
|
|
|
DebugLogOutput("[Device_Update]");
|
|
|
DebugLogOutput("---------------------------------------");
|
|
|
-
|
|
|
- if(Index == INDEX_LOUVER)
|
|
|
- {
|
|
|
- DebugLogOutput(mDataLouver.louver.ToDebugString());
|
|
|
- }
|
|
|
- DebugLogOutput("---------------------------------------");
|
|
|
}
|
|
|
DebugLogOutput("[Device_Update] - OK");
|
|
|
|