Просмотр исходного кода

Merge branch 'master' of https://hub.hdc-smart.com/WallPad/LuxuryWPMV2

jslee(madeinlab) 2 лет назад
Родитель
Сommit
49ad620259

BIN
10_Release/WallPadCall.apk


BIN
10_Release/WallPadHomeCtrl.apk


BIN
10_Release/WallPadMain.apk


+ 2 - 2
WallPadCall/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2022.05.09.01">
+    android:versionName="2022.05.09.02">
 
-    <!--android:sharedUserId="android.uid.system"-->
+    <!--android:sharedUserId="android.uid.system" -->
     <!--<uses-sdk-->
         <!--android:minSdkVersion="16"-->
         <!--android:targetSdkVersion="17" />-->

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/MainActivity.java

@@ -650,7 +650,7 @@ public class MainActivity extends WpadActivity {
     private void setDeviceName()
     {
         String[] strEndIP = {"10.1.1.1", "10.1.2.1", "10.1.3.1", "10.1.3.2", "10.1.1.3", "10.1.1.2", "10.1.2.2"};
-        String[] strEndName = {"1층", "2층", "3층", "안방", "기사", "메이드", "주방"};
+        String[] strEndName = {"1층", "2층", "3층", "마스터룸", "기사", "메이드", "주방"};
 
         for(int i = 0; i < strEndIP.length; i++)
         {
@@ -5802,7 +5802,7 @@ public class MainActivity extends WpadActivity {
                     try {
                         modbusClient.Connect();
                         modbusClient.WriteSingleCoil(address, true);
-                        Thread.sleep(1200);
+                        Thread.sleep(2000);
                         modbusClient.WriteSingleCoil(address, false);
                         modbusClient.Disconnect();
                     } catch (IOException | ModbusException | InterruptedException e) {

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/InquiryCallHistory.java

@@ -720,7 +720,7 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
             else if (strResultType.contains("기사")) {
                 strResult = "10.1.1.3";
             }
-            else if (strResultType.contains("안방")) {
+            else if (strResultType.contains("마스터룸")) {
                 strResult = "10.1.3.2";
             }
             else if (strResultType.contains("주방")) {
@@ -767,7 +767,7 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
                 strResult = "기사";
             }
             else if (strResultType.contains("302호")) {
-                strResult = "안방";
+                strResult = "마스터룸";
             }
             else if (strResultType.contains("202호")) {
                 strResult = "주방";

+ 12 - 5
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkFront.java

@@ -569,15 +569,15 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                                     MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
                                     Global.setV40WallPadVolume_Front(nCurrentVolume);
                                 }
-                                else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
+                            }
+                            else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
+                                //MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
+                                if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
                                 {
                                     MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
                                     Global.setV40WallPadVolume_Front(nCurrentVolume);
                                 }
                             }
-                            else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                                MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
-                            }
                             else {
                                 MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
                             }
@@ -1529,7 +1529,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     BTN_END.setImageResource(R.drawable.btn_endl_normal);
                 else BTN_END.setImageResource(R.drawable.btn_lobby_end_normal);
                 BTN_END.setButtonEventOffDisable();
-                ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
+                if(MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING)
+                {
+                    ((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
+                }
+                else
+                {
+                    ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
+                }
             } else {
                 // 이벤트 off
                 if (ConfigValues.bReliefCall)

+ 9 - 1
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkLobby.java

@@ -1443,7 +1443,15 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     BTN_END.setImageResource(R.drawable.btn_endl_normal);
                 else BTN_END.setImageResource(R.drawable.btn_lobby_end_normal);
                 BTN_END.setButtonEventOffDisable();
-                ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
+                if(MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.TALKING)
+                {
+                    ((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
+                }
+                else
+                {
+                    ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
+                }
+
 
             } else {
                 // 이벤트 off

+ 1 - 0
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkResidence.java

@@ -747,6 +747,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                 else if (eCallStatus == CALLSTATUS.TALKING) {
                     Global.stopMelodyRepeat();
                     m_bCallStateThreadStop = false;
+                    ((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
                     if (ConfigValues.bWallPadCameraEnable) {
                         if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
                                 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {

BIN
WallPadCall/src/main/res/drawable/btn_main_room_normal.png


BIN
WallPadCall/src/main/res/drawable/btn_main_room_pressed.png


BIN
WallPadCall/src/main/res/drawable/btn_main_room_selected.png


+ 3 - 4
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -2339,14 +2339,13 @@ public class MainActivity extends WpadActivity {
 			int[] nDoorlockType = mWallpadDeviceSet.Get_DoorLock_Info();
 			int[] nVentilType = mWallpadDeviceSet.Get_Ventil_Info();
 			int nHeatingUsage = mWallpadDeviceSet.Get_Temper_Info();
-			//가스는 설정과 관계없이 true
-			//int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
-			int nGasValveUsage = WallpadDeviceSet.DO_USE;
+			int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
 			boolean bElecCooktopUsage = mWallpadDeviceSet.Get_ElectricRange_Use();
 			boolean bCooktopOutletUsage = mWallpadDeviceSet.Get_CookTopConcent_Use();
 			int nSystemAirconUsage = mWallpadDeviceSet.Get_AirCON_Info();
 			int nPurityUsage = mWallpadDeviceSet.Get_Purity_Info();
 			int nConcentEnable = mWallpadDeviceSet.Get_Concent_Info();   // 콘센트 사용 유무
+			boolean bInterWPMultiCtrlUsage = mWallpadDeviceSet.Get_InterWallPadMultiCtrlUsage();   // 월패드간 제어기기 멀티제어 지원여부
 			mWallpadDeviceSet.closeDB();
 
 			WallpadStatusData mWallpadStatusData = new WallpadStatusData(getContext());
@@ -2377,7 +2376,7 @@ public class MainActivity extends WpadActivity {
 				nChildCnt++;
 			}
 
-			if (nGasValveUsage == WallpadDeviceSet.DO_USE) {
+			if (nGasValveUsage == WallpadDeviceSet.DO_USE || bInterWPMultiCtrlUsage) {
 				arrayList.add(API_Menu.SubMenuCtrl.Name_Gas);
 				nChildCnt++;
 			}

+ 1 - 1
WallPadMain/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadmain"
     android:versionCode="17"
-    android:versionName="2022.05.09.01">
+    android:versionName="2022.05.09.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />