3 次代码提交 43fe430697 ... e8aa348bc2

作者 SHA1 备注 提交日期
  Changwoo Nam e8aa348bc2 [모든앱] 3 年之前
  Changwoo Nam b44600e992 [WallPadCall] 3 年之前
  Changwoo Nam 70d5616972 [WallPadDevService] 3 年之前
共有 35 个文件被更改,包括 23 次插入25 次删除
  1. 二进制
      10_Release/AutoPicture.apk
  2. 二进制
      10_Release/LogOutputService.apk
  3. 二进制
      10_Release/ManagerSetting.apk
  4. 二进制
      10_Release/WallPadAddService.apk
  5. 二进制
      10_Release/WallPadCall.apk
  6. 二进制
      10_Release/WallPadConfig.apk
  7. 二进制
      10_Release/WallPadDevService.apk
  8. 二进制
      10_Release/WallPadEmergency.apk
  9. 二进制
      10_Release/WallPadEnergyCtrl.apk
  10. 二进制
      10_Release/WallPadGlobalButton.apk
  11. 二进制
      10_Release/WallPadGlobalScreen.apk
  12. 二进制
      10_Release/WallPadHomeCtrl.apk
  13. 二进制
      10_Release/WallPadKeyBoard.apk
  14. 二进制
      10_Release/WallPadMain.apk
  15. 二进制
      10_Release/WallPadOutModeRun.apk
  16. 二进制
      10_Release/WallPadSecurity.apk
  17. 1 1
      AutoPicture/src/main/AndroidManifest.xml
  18. 1 1
      LogOutputService/src/main/AndroidManifest.xml
  19. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  20. 1 1
      WallPadAddService/src/main/AndroidManifest.xml
  21. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  22. 2 2
      WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/CallController.java
  23. 3 5
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java
  24. 1 1
      WallPadConfig/src/main/AndroidManifest.xml
  25. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  26. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HomeAutomation_New_Controller.java
  27. 1 1
      WallPadEmergency/src/main/AndroidManifest.xml
  28. 1 1
      WallPadEnergyCtrl/src/main/AndroidManifest.xml
  29. 1 1
      WallPadGlobalButton/src/main/AndroidManifest.xml
  30. 1 1
      WallPadGlobalScreen/src/main/AndroidManifest.xml
  31. 1 1
      WallPadHomeCtrl/src/main/AndroidManifest.xml
  32. 1 1
      WallPadKeyBoard/src/main/AndroidManifest.xml
  33. 1 1
      WallPadMain/src/main/AndroidManifest.xml
  34. 1 1
      WallPadOutmodeRun/src/main/AndroidManifest.xml
  35. 1 1
      WallPadSecurity/src/main/AndroidManifest.xml

二进制
10_Release/AutoPicture.apk


二进制
10_Release/LogOutputService.apk


二进制
10_Release/ManagerSetting.apk


二进制
10_Release/WallPadAddService.apk


二进制
10_Release/WallPadCall.apk


二进制
10_Release/WallPadConfig.apk


二进制
10_Release/WallPadDevService.apk


二进制
10_Release/WallPadEmergency.apk


二进制
10_Release/WallPadEnergyCtrl.apk


二进制
10_Release/WallPadGlobalButton.apk


二进制
10_Release/WallPadGlobalScreen.apk


二进制
10_Release/WallPadHomeCtrl.apk


二进制
10_Release/WallPadKeyBoard.apk


二进制
10_Release/WallPadMain.apk


二进制
10_Release/WallPadOutModeRun.apk


二进制
10_Release/WallPadSecurity.apk


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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.autopicture"
     android:versionCode="17"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.apps.ic_wallpad.service.log"
     android:versionCode="24"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

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

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

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

+ 2 - 2
WallPadCall/src/main/java/kr/co/icontrols/callengine/engine/CallController.java

@@ -2004,7 +2004,7 @@ public class CallController extends CallManager implements SIPEventListener {
     public CALLPATH getTalkPath() {
         try {
             int nMode = MainActivity.mAudioManager.getMode();
-//            LOG("[getTalkPath] nMode [" + nMode + "]");
+            LOG("[getTalkPath] nMode [" + nMode + "]");
             if (nMode == AUDIO_MODE_NORMAL) {
                 return CALLPATH.NORMAL;
             }
@@ -2044,7 +2044,7 @@ public class CallController extends CallManager implements SIPEventListener {
                 else return CALLPATH.NONE;
             }
             else if (nMode == AUDIO_MODE_MOIP_GUARD_IHND101) { // 13
-                return CALLPATH.MOIP_IHND101_GUARD;
+                return CALLPATH.MOIP_IHN1000_GUARD;
             }
             else if (nMode == AUDIO_MODE_IN_DOOR_COMMUNICATION_V40) {
                 return CALLPATH.FRONT;

+ 3 - 5
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java

@@ -469,6 +469,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     }
                     else {
                         MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1000_GUARD);
+                        mPathCheckHandler.sendEmptyMessage(0);
                     }
 
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnGUARD);
@@ -1795,7 +1796,6 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
             if (nCurrentVolume != nCtrlLevel) {
                 nCurrentVolume = nCtrlLevel;
                 showVolume(nCurrentVolume);
-//                ctrlVolume(false);
             }
         }
 
@@ -1983,12 +1983,10 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     mPathCheckHandler.removeMessages(1);
                 } else {
                     if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD)
-                            mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     } else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
-                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD)
-                            mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
+                        if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
                         else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
                     }
                 }

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadconfig"
     android:versionCode="01"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.deviceservice"
     android:versionCode="1"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HomeAutomation_New_Controller.java

@@ -722,8 +722,8 @@ public class HomeAutomation_New_Controller extends DeviceManager {
      */
     public HomeAutomation_New_Controller() {
         /* 로그 초기상태 */
-        log_sw = true;
-        SerialLog = true;
+//        log_sw = true;
+//        SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         CommDataGeneration(1);

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpademergency"
     android:versionCode="01"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadenergyctrl"
     android:versionCode="01"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadglobalbutton"
     android:versionCode="17"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadglobalscreen"
     android:versionCode="17"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-feature android:name="android.hardware.camera" />
 

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

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

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadkeyboard"
     android:versionCode="17"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-feature android:required="false" android:name="android.hardware.touchscreen"/>
 

+ 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.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadoutmoderun"
     android:versionCode="1"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadsecurity"
     android:versionCode="1"
-    android:versionName="2022.05.19.01">
+    android:versionName="2022.05.20.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>