Explorar el Código

버젼명 변경

jslee(madeinlab) hace 3 años
padre
commit
4371cc10ec

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

+ 8 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingDetailFunctionFragment.java

@@ -2897,7 +2897,14 @@ public class SettingDetailFunctionFragment extends Fragment
                         {
                             if(GetData[1].equals("12345678") == true)
                             {
-                                Toast.makeText(mActivity, "SiteCode (\"12345678\")가 이미 입력되어 있습니다.", Toast.LENGTH_LONG).show();
+                                //Toast.makeText(mActivity, "SiteCode (\"12345678\")가 이미 입력되어 있습니다.", Toast.LENGTH_LONG).show();
+                                devset.UpdateSettingData("site_code"
+                                        , "site_code"
+                                        , 0
+                                        , "12341234"
+                                );
+                                Toast.makeText(mActivity, "기존 SiteCode \""+GetData[1]+"\" 에서 \"12341234\"로 변경합니다.", Toast.LENGTH_LONG).show();
+                                MainApplication.getApplication().setReboot(); //16.05.31 남창우 과장 요청으로 인한 추가
                             }
                             else
                             {

BIN
WallPadAPI/jar/WallPadAPI.jar


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

@@ -2630,6 +2630,16 @@ public class wallpaddbmgr {
             InsertinitWidgetData(10, define.ICONS.MENUS.ENERGY_ENERGYCONSUMPTION.getID());   // 에너지 사용량
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
         }
+        else if(mModelType == Version.MODEL_TYPE.IHN_1010_I_LX2){
+            InsertinitWidgetData(0, define.ICONS.MENUS.TALK_NEIGHBOR.getID());
+            InsertinitWidgetData(1, define.ICONS.MENUS.TALK_FRONT.getID());
+            InsertinitWidgetData(2, define.ICONS.MENUS.TALK_CALLHISTORY.getID());
+            InsertinitWidgetData(3, define.ICONS.MENUS.TALK_VISITORPIC.getID());
+            InsertinitWidgetData(4, define.ICONS.MENUS.TALK_VISITORPIC.getID());
+            InsertinitWidgetData(5, define.ICONS.MENUS.SETTING_CONFIG.getID());
+            InsertinitWidgetData(6, define.ICONS.MENUS.SETTING_PWCHANGE.getID());
+            InsertinitWidgetData(7, define.ICONS.MENUS.ADD_WEATHER.getID());
+        }
         else if (mModelType == Version.MODEL_TYPE.IHN_HS101 || mModelType == Version.MODEL_TYPE.IHN_HS101_I) {
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_CALRENDAR.getID());   // 달력/시계
             InsertinitWidgetData(1, define.ICONS.MENUS.MAIN_ELEVATOR.getID());   // 엘리베이터

+ 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="2021.07.27.01">
+    android:versionName="2022.01.25.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_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="2021.08.11.01">
+    android:versionName="2022.01.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

BIN
WallPadMain/libs/WallPadAPI.jar


+ 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.01.12.01">
+    android:versionName="2022.01.24.01">
     <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"/>

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="kr.co.icontrols.wallpadmulticontrolservice">
+    package="kr.co.icontrols.wallpadmulticontrolservice"
+    android:versionCode="17"
+    android:versionName="2022.01.24.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />