Ver Fonte

[WallPadEnergyCtrl]
1. 누락된 코드 업데이트

[WallPadMain]
1. 단지서버 1.0 사용일때도, 연결된 기기정보 가져오도록 수정

[최신 APK 업데이트]
1. WallPadCall, WallPadDevService, WallPadEnergyCtrl, WallPadMain

jglee há 3 anos atrás
pai
commit
24e8c0e746

BIN
10_Release/WallPadCall.apk


BIN
10_Release/WallPadDevService.apk


BIN
10_Release/WallPadEnergyCtrl.apk


BIN
10_Release/WallPadMain.apk


+ 2 - 1
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/imap/iMAPRemotemeter.java

@@ -112,7 +112,8 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
     
     
     
     
     public iMAPRemotemeter(Context ctx)
     public iMAPRemotemeter(Context ctx)
-    {        
+    {
+        super.setContext(ctx);
         DBMGR = new WallpadStatusData(ctx);
         DBMGR = new WallpadStatusData(ctx);
         AddressSet addc =  DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
         AddressSet addc =  DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
         DBMGR.closeDB();
         DBMGR.closeDB();

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

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

+ 1 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -4574,7 +4574,7 @@ public class iMapServer extends Service {
                     }
                     }
                     else if (itemname.equals(define.iMAP_NODENAME_SUBDEV)) {
                     else if (itemname.equals(define.iMAP_NODENAME_SUBDEV)) {
                         Log.i(TAG, "[ProcSetsetup] danjiserverType:  " + danjiserverType);
                         Log.i(TAG, "[ProcSetsetup] danjiserverType:  " + danjiserverType);
-                        if (danjiserverType == define.DanjiServer2 || danjiserverType == define.DanjiServerBlended) {
+                        if (true) {
                             Element subdevList = (Element) item;
                             Element subdevList = (Element) item;
                             NodeList SubDevList = subdevList.getElementsByTagName("list");
                             NodeList SubDevList = subdevList.getElementsByTagName("list");