|
@@ -25,6 +25,7 @@ import android.view.MotionEvent;
|
|
|
import android.view.View;
|
|
|
import android.widget.RelativeLayout;
|
|
|
|
|
|
+import org.json.JSONArray;
|
|
|
import org.json.JSONException;
|
|
|
import org.json.JSONObject;
|
|
|
|
|
@@ -570,8 +571,11 @@ public class PopupActivity extends WpadActivity
|
|
|
|
|
|
case ID.screen.VentiPopupReservationScreen:
|
|
|
if (nDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
|
|
|
- knxVentiPopupReservationScreen = new KnxVentiPopupReservationScreen(mContext, AllLayout, wpapi, OPERATION_MODE);
|
|
|
- super.setCurrentScreen(knxVentiPopupReservationScreen);
|
|
|
+ //knxVentiPopupReservationScreen = new KnxVentiPopupReservationScreen(mContext, AllLayout, wpapi, OPERATION_MODE);
|
|
|
+ //super.setCurrentScreen(knxVentiPopupReservationScreen);
|
|
|
+ //고급주택은 환기가 knx 환기로 적용안함
|
|
|
+ ventiPopupReservationScreen = new VentiPopupReservationScreen(mContext, AllLayout, wpapi, OPERATION_MODE);
|
|
|
+ super.setCurrentScreen(ventiPopupReservationScreen);
|
|
|
}else{
|
|
|
ventiPopupReservationScreen = new VentiPopupReservationScreen(mContext, AllLayout, wpapi, OPERATION_MODE);
|
|
|
super.setCurrentScreen(ventiPopupReservationScreen);
|
|
@@ -828,7 +832,11 @@ public class PopupActivity extends WpadActivity
|
|
|
if (reason == 1) {
|
|
|
dataJsonObject.accumulate("number", roomNumber);
|
|
|
if(state==-1111) {
|
|
|
- dataJsonObject.accumulate("arrayState", arrayState);
|
|
|
+ JSONArray jArray = new JSONArray();
|
|
|
+ for (int i=0; i<arrayState.length; i++) {
|
|
|
+ jArray.put(arrayState[i]);
|
|
|
+ }
|
|
|
+ dataJsonObject.accumulate("arrayState", jArray);
|
|
|
}else if(state!=-9999) {
|
|
|
dataJsonObject.accumulate("state", state);
|
|
|
}else{
|