Explorar el Código

2022.05.09 VIP
이슈 수정.
1. UI 수정(마스터룸)
2. call app 안정화.
3. 음성 튜닝 수정.
4. Home key 제거

DESKTOP-UNEGUH3\MadeinLab_SW_02 hace 2 años
padre
commit
0fd3dba09c

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

@@ -3,7 +3,7 @@
     android:versionCode="17"
     android:versionName="2022.05.09.01">
 
-    <!--android:sharedUserId="android.uid.system"-->
+    <!--android:sharedUserId="android.uid.system" -->
     <!--<uses-sdk-->
         <!--android:minSdkVersion="16"-->
         <!--android:targetSdkVersion="17" />-->

+ 1 - 1
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++)
         {

+ 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