|
@@ -1335,6 +1335,12 @@ public class MainActivity extends WpadActivity {
|
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
try {
|
|
|
+ if(mCurrentMultiScreenId == ID.screen.LightKnxMainTestScreen||mCurrentMultiScreenId == ID.screen.HeatingV2TestScreen
|
|
|
+ ||mCurrentMultiScreenId == ID.screen.KnxSystemAirconMainTestScreen||mCurrentMultiScreenId == ID.screen.VentiMainTestScreen){
|
|
|
+ if(resultCode==0&&data==null){
|
|
|
+ super.onActivityResult(requestCode, 10000, data);
|
|
|
+ }
|
|
|
+ }
|
|
|
Log.d(TAG, "@@@@@@@@ [onActivityResult] @@@@@@@@");
|
|
|
if (resultCode == RESULT_OK) {
|
|
|
// PopupActivity 에서 FinishTimer 로 인하여 종료가 되었을 경우
|
|
@@ -2020,11 +2026,13 @@ public class MainActivity extends WpadActivity {
|
|
|
case ID.screen.KnxSystemAirconMainTestScreen: // 시스템 에어컨
|
|
|
KnxSystemAirconMainTestScreen knxSystemAirconMainTestScreen = new KnxSystemAirconMainTestScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mDefaultRoomNameList);
|
|
|
super.setCurrentScreen(knxSystemAirconMainTestScreen);
|
|
|
+ mCurrentMultiScreenId = ID.screen.KnxSystemAirconMainTestScreen;
|
|
|
result = true;
|
|
|
break;
|
|
|
case ID.screen.LightKnxMainTestScreen: // 조명
|
|
|
LightKnxMainTestScreen lightKnxMainTestScreen = new LightKnxMainTestScreen(this, ScreenLayout, wpapi, OPERATION_MODE, mRoomNameList_Light);
|
|
|
super.setCurrentScreen(lightKnxMainTestScreen);
|
|
|
+ mCurrentMultiScreenId = ID.screen.LightKnxMainTestScreen;
|
|
|
result = true;
|
|
|
break;
|
|
|
case ID.screen.HeatingV2TestScreen: // 난방
|
|
@@ -2041,6 +2049,7 @@ public class MainActivity extends WpadActivity {
|
|
|
case ID.screen.VentiMainTestScreen: // 환기
|
|
|
VentilationMainTestScreen ventilationMainTestScreen = new VentilationMainTestScreen(this, ScreenLayout, wpapi, OPERATION_MODE, nScreenId);
|
|
|
super.setCurrentScreen(ventilationMainTestScreen);
|
|
|
+ mCurrentMultiScreenId = ID.screen.VentiMainTestScreen;
|
|
|
result = true;
|
|
|
break;
|
|
|
|