Selaa lähdekoodia

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	AutoPicture/src/main/AndroidManifest.xml
#	LogOutputService/src/main/AndroidManifest.xml
#	ManagerSetting/libs/WallPadAPI.jar
#	ManagerSetting/src/main/AndroidManifest.xml
#	WallPadAPI/jar/WallPadAPI.jar
#	WallPadAddService/src/main/AndroidManifest.xml
#	WallPadCall/src/main/AndroidManifest.xml
#	WallPadConfig/src/main/AndroidManifest.xml
#	WallPadDevService/src/main/AndroidManifest.xml
#	WallPadEmergency/src/main/AndroidManifest.xml
#	WallPadEnergyCtrl/src/main/AndroidManifest.xml
#	WallPadGlobalButton/src/main/AndroidManifest.xml
#	WallPadGlobalScreen/src/main/AndroidManifest.xml
#	WallPadHomeCtrl/src/main/AndroidManifest.xml
#	WallPadKeyBoard/src/main/AndroidManifest.xml
#	WallPadMain/libs/WallPadAPI.jar
#	WallPadMain/src/main/AndroidManifest.xml
#	WallPadMultiControlService/src/main/AndroidManifest.xml
#	WallPadOutmodeRun/src/main/AndroidManifest.xml
#	WallPadSecurity/src/main/AndroidManifest.xml
jslee(madeinlab) 3 vuotta sitten
vanhempi
commit
03ff74458d
75 muutettua tiedostoa jossa 27 lisäystä ja 24 poistoa
  1. 1 0
      .idea/misc.xml
  2. BIN
      10_Release/AutoPicture.apk
  3. BIN
      10_Release/LogOutputService.apk
  4. BIN
      10_Release/ManagerSetting.apk
  5. BIN
      10_Release/WallPadAddService.apk
  6. BIN
      10_Release/WallPadConfig.apk
  7. BIN
      10_Release/WallPadDevService.apk
  8. BIN
      10_Release/WallPadEmergency.apk
  9. BIN
      10_Release/WallPadEnergyCtrl.apk
  10. BIN
      10_Release/WallPadGlobalButton.apk
  11. BIN
      10_Release/WallPadGlobalScreen.apk
  12. BIN
      10_Release/WallPadHomeCtrl.apk
  13. BIN
      10_Release/WallPadKeyBoard.apk
  14. BIN
      10_Release/WallPadMain.apk
  15. BIN
      10_Release/WallPadMultiControlService.apk
  16. BIN
      10_Release/WallPadOutModeRun.apk
  17. BIN
      10_Release/WallPadSecurity.apk
  18. 4 4
      10_Release/release/output-metadata.json
  19. BIN
      AutoPicture/libs/WallPadAPI.jar
  20. BIN
      AutoPicture/libs/WallPadSupport.jar
  21. 1 1
      AutoPicture/src/main/AndroidManifest.xml
  22. BIN
      LogOutputService/libs/WallPadAPI.jar
  23. BIN
      LogOutputService/libs/WallPadAPIforSVC.jar
  24. BIN
      LogOutputService/libs/WallPadSupport.jar
  25. 1 1
      LogOutputService/src/main/AndroidManifest.xml
  26. BIN
      ManagerSetting/libs/WallPadAPI.jar
  27. BIN
      ManagerSetting/libs/WallPadSupport.jar
  28. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  29. 1 1
      WallPadAPI/build.gradle
  30. BIN
      WallPadAPI/jar/WallPadAPI.jar
  31. BIN
      WallPadAPI/jar/WallPadAPIforSVC.jar
  32. BIN
      WallPadAPI/libs/WallPadSupport.jar
  33. 1 0
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java
  34. 1 1
      WallPadAPI/src/main/java/com/artncore/commons/define.java
  35. BIN
      WallPadAddService/libs/WallPadAPI.jar
  36. BIN
      WallPadAddService/libs/WallPadSupport.jar
  37. 1 1
      WallPadAddService/src/main/AndroidManifest.xml
  38. BIN
      WallPadCall/libs/WallPadAPI.jar
  39. BIN
      WallPadCall/libs/WallPadSupport.jar
  40. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  41. BIN
      WallPadConfig/libs/WallPadAPI.jar
  42. BIN
      WallPadConfig/libs/WallPadSupport.jar
  43. 1 1
      WallPadConfig/src/main/AndroidManifest.xml
  44. BIN
      WallPadDevService/libs/WallPadAPIforSVC.jar
  45. BIN
      WallPadDevService/libs/WallPadSupport.jar
  46. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  47. BIN
      WallPadEmergency/libs/WallPadAPI.jar
  48. BIN
      WallPadEmergency/libs/WallPadSupport.jar
  49. 1 1
      WallPadEmergency/src/main/AndroidManifest.xml
  50. BIN
      WallPadEnergyCtrl/libs/WallPadAPI.jar
  51. BIN
      WallPadEnergyCtrl/libs/WallPadSupport.jar
  52. 1 1
      WallPadEnergyCtrl/src/main/AndroidManifest.xml
  53. BIN
      WallPadGlobalButton/libs/WallPadAPI.jar
  54. 1 1
      WallPadGlobalButton/src/main/AndroidManifest.xml
  55. BIN
      WallPadGlobalScreen/libs/WallPadAPI.jar
  56. BIN
      WallPadGlobalScreen/libs/WallPadSupport.jar
  57. 1 1
      WallPadGlobalScreen/src/main/AndroidManifest.xml
  58. BIN
      WallPadHomeCtrl/libs/WallPadAPI.jar
  59. BIN
      WallPadHomeCtrl/libs/WallPadSupport.jar
  60. 1 1
      WallPadHomeCtrl/src/main/AndroidManifest.xml
  61. 1 1
      WallPadKeyBoard/src/main/AndroidManifest.xml
  62. BIN
      WallPadMain/libs/WallPadAPI.jar
  63. BIN
      WallPadMain/libs/WallPadSupport.jar
  64. 2 1
      WallPadMain/src/main/AndroidManifest.xml
  65. BIN
      WallPadMultiControlService/libs/WallPadAPI.jar
  66. BIN
      WallPadMultiControlService/libs/WallPadSupport.jar
  67. 1 1
      WallPadMultiControlService/src/main/AndroidManifest.xml
  68. BIN
      WallPadOutmodeRun/libs/WallPadAPI.jar
  69. BIN
      WallPadOutmodeRun/libs/WallPadSupport.jar
  70. 1 1
      WallPadOutmodeRun/src/main/AndroidManifest.xml
  71. BIN
      WallPadSecurity/libs/WallPadAPI.jar
  72. BIN
      WallPadSecurity/libs/WallPadSupport.jar
  73. 1 1
      WallPadSecurity/src/main/AndroidManifest.xml
  74. BIN
      WallPadSupport/jar/WallPadSupport.jar
  75. 1 1
      WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

+ 1 - 0
.idea/misc.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

BIN
10_Release/AutoPicture.apk


BIN
10_Release/LogOutputService.apk


BIN
10_Release/ManagerSetting.apk


BIN
10_Release/WallPadAddService.apk


BIN
10_Release/WallPadConfig.apk


BIN
10_Release/WallPadDevService.apk


BIN
10_Release/WallPadEmergency.apk


BIN
10_Release/WallPadEnergyCtrl.apk


BIN
10_Release/WallPadGlobalButton.apk


BIN
10_Release/WallPadGlobalScreen.apk


BIN
10_Release/WallPadHomeCtrl.apk


BIN
10_Release/WallPadKeyBoard.apk


BIN
10_Release/WallPadMain.apk


BIN
10_Release/WallPadMultiControlService.apk


BIN
10_Release/WallPadOutModeRun.apk


BIN
10_Release/WallPadSecurity.apk


+ 4 - 4
10_Release/release/output-metadata.json

@@ -4,15 +4,15 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "kr.co.icontrols.wallpadmain",
+  "applicationId": "kr.co.icontrols.wallpadsecurity",
   "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 17,
-      "versionName": "2021.11.17.02",
-      "outputFile": "../WallPadMain.apk"
+      "versionCode": 1,
+      "versionName": "2022.04.11.03",
+      "outputFile": "../WallPadSecurity.apk"
     }
   ]
 }

BIN
AutoPicture/libs/WallPadAPI.jar


BIN
AutoPicture/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

BIN
LogOutputService/libs/WallPadAPI.jar


BIN
LogOutputService/libs/WallPadAPIforSVC.jar


BIN
LogOutputService/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
ManagerSetting/libs/WallPadAPI.jar


BIN
ManagerSetting/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 1 - 1
WallPadAPI/build.gradle

@@ -40,7 +40,7 @@ android {
             java {
                 //WallPadAPI jar생성시에는 아래 코드 주석처리하고 exportJar 수행
                 //WallPadDevice용 jar생성시에는 아래 코드 주석 해제하고 exportServiceJar 실행
-                //exclude "**/wallpadapi/**"
+//                exclude "**/wallpadapi/**"
             }
         }
     }

BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


BIN
WallPadAPI/libs/WallPadSupport.jar


+ 1 - 0
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -2687,6 +2687,7 @@ public class wallpaddbmgr {
      *
      * **/
     public void initWidgetData() {
+        Log.e(TAG, "[initWidgetData] mModelType [" + mModelType + "], Version.MODEL_TYPE.IHN_D101_I_LX2 [" + Version.MODEL_TYPE.IHN_D101_I_LX2 +"]");
         if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
                 || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I) {
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -4,7 +4,7 @@ import android.os.Environment;
 
 public class define {
 	/** WallPadAPI Version 을 정의합니다. */
-	public static final String WALLPADAPI_VERSION = "2022.04.11.01";
+	public static final String WALLPADAPI_VERSION = "2022.04.11.03";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////

BIN
WallPadAddService/libs/WallPadAPI.jar


BIN
WallPadAddService/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadCall/libs/WallPadAPI.jar


BIN
WallPadCall/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

BIN
WallPadConfig/libs/WallPadAPI.jar


BIN
WallPadConfig/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadDevService/libs/WallPadAPIforSVC.jar


BIN
WallPadDevService/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

BIN
WallPadEmergency/libs/WallPadAPI.jar


BIN
WallPadEmergency/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadEnergyCtrl/libs/WallPadAPI.jar


BIN
WallPadEnergyCtrl/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadGlobalButton/libs/WallPadAPI.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadGlobalScreen/libs/WallPadAPI.jar


BIN
WallPadGlobalScreen/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-feature android:name="android.hardware.camera" />
 

BIN
WallPadHomeCtrl/libs/WallPadAPI.jar


BIN
WallPadHomeCtrl/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-feature android:required="false" android:name="android.hardware.touchscreen"/>
 

BIN
WallPadMain/libs/WallPadAPI.jar


BIN
WallPadMain/libs/WallPadSupport.jar


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

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

BIN
WallPadMultiControlService/libs/WallPadAPI.jar


BIN
WallPadMultiControlService/libs/WallPadSupport.jar


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

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

BIN
WallPadOutmodeRun/libs/WallPadAPI.jar


BIN
WallPadOutmodeRun/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadSecurity/libs/WallPadAPI.jar


BIN
WallPadSecurity/libs/WallPadSupport.jar


+ 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.04.11.02">
+    android:versionName="2022.04.11.03">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadSupport/jar/WallPadSupport.jar


+ 1 - 1
WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

@@ -69,7 +69,7 @@ import android.os.Build;
  * WallPadSupport 의 버전을 가져온다.<br>
  */
 public class Version {
-    private static final String VERSION = "2021.06.23.01";
+    private static final String VERSION = "2022.04.11.01";
 
     /**
      * 버전을 가져온다.