Browse Source

1010 멀티 제어 막음

jslee(madeinlab) 3 years ago
parent
commit
166cc189a2

+ 5 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -746,7 +746,11 @@ public class MainActivity extends WpadActivity {
         }
 
         //vip
-        runMultiControlService();
+        if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
+                || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
+                || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
+            runMultiControlService();
+        }
         WallpadStatusData dbMGR = new WallpadStatusData(this.getContext());
         wallpaddbmgr.AddressSet addrSet = dbMGR.getAddressMGR();
         dbMGR.closeDB();

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

@@ -3042,9 +3042,13 @@ public class iMapServer extends Service {
                     } else {
                         sock = sslsvr.accept();
                     }
-                    //madeinlab accept 대기중에 모바일에서 요청오면 아래 쓰레드 돌려서 처리.
-                    //아래 쓰레드가 돌기전에 다른층의 디바이스 정보를 받아와서 미리 가지고 있어야 한다.
-                    sendMsgToActivity(1234);
+                    if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
+                            || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
+                            || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF) {
+                        //madeinlab accept 대기중에 모바일에서 요청오면 아래 쓰레드 돌려서 처리.
+                        //아래 쓰레드가 돌기전에 다른층의 디바이스 정보를 받아와서 미리 가지고 있어야 한다.
+                        sendMsgToActivity(1234);
+                    }
                     iMapSverSocketThread ProciMap = new iMapSverSocketThread(sock);
                     ProciMap.start();
                 } catch (IOException e) {
@@ -5755,7 +5759,7 @@ public class iMapServer extends Service {
                                     if (KnxApi.data.BadRoom_EnergyMeter[k].Info.ConcentCount > 0)
                                         BadConcentCount++;
                                 }
-                                Log.e(TAG, "[yskim] iCMDProcDevList() electric : " + BadConcentCount);
+                                Log.d(TAG, "[yskim] iCMDProcDevList() electric : " + BadConcentCount);
                                 strResult += "         <devinfo name=\"electric\" value=\"" + BadConcentCount + "\" floor=\"" + ho + "\"/>\r\n";
                             }
                         } else {
@@ -5823,9 +5827,9 @@ public class iMapServer extends Service {
                             if (KnxApi != null) {
                                 int ret = KnxApi.Refresh(KnxAPI.DEVICE_INDEX.ALL, (byte) define.DEVICE_ALL_OR_NOTHING);
                                 if (KnxApi.data == null)
-                                    Log.e(TAG, "[yskim] iCMDProcDevList KnxApi.data == null");
+                                    Log.d(TAG, "[yskim] iCMDProcDevList KnxApi.data == null");
                                 if (KnxApi.data.MasterController == null)
-                                    Log.e(TAG, "[yskim] iCMDProcDevList KnxApi.data.MasterController == null");
+                                    Log.d(TAG, "[yskim] iCMDProcDevList KnxApi.data.MasterController == null");
 
                                 if (ret >= 0) {
                                     int LivingLightCount = 0;
@@ -5868,7 +5872,7 @@ public class iMapServer extends Service {
                         KnxSystemAirconAPI airconAPI = mWallPadAPI.Get_KnxAirconController();
                         if (airconAPI != null) {
                             int nCount = airconAPI.data.Device.info.InsideAirconCount;
-                            Log.e(TAG, "[yskim] iCMDProcDevList() sysaircon : " + nCount);
+                            Log.d(TAG, "[yskim] iCMDProcDevList() sysaircon : " + nCount);
                             // 현대건설 에어컨 처리, 포트가 다르기 때문에 구분해서 처리 필요, 에어컨 API가 동일하다면 그럴 필요는 없음
                             strResult += "         <devinfo name=\"sysaircon\" value=\"" + nCount + "\" order=\"" + strAircon + "\" floor=\"" + ho + "\"/>\r\n";
                         } else {
@@ -8415,12 +8419,12 @@ public class iMapServer extends Service {
             if(Integer.parseInt(addc.Ho) == 2001 || Integer.parseInt(addc.Ho) == 2003)
             {
                 knxRoomNameList = mEtypeRoomNameList;
-                Log.e(TAG, "yskim[iCMDProcChumDamSmartLightControl] mEtypeRoomNameList");
+                Log.d(TAG, "yskim[iCMDProcChumDamSmartLightControl] mEtypeRoomNameList");
             }
             else
             {
                 knxRoomNameList = mDefaultRoomNameList;
-                Log.e(TAG, "yskim[iCMDProcChumDamSmartLightControl] mDefaultRoomNameList");
+                Log.d(TAG, "yskim[iCMDProcChumDamSmartLightControl] mDefaultRoomNameList");
             }
 
             WallpadDeviceSet devSet = new WallpadDeviceSet(getApplicationContext());
@@ -8677,21 +8681,21 @@ public class iMapServer extends Service {
                             }
 
                             if (!unit_dimming.equalsIgnoreCase("null")) {
-                                Log.e(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : ");
+                                Log.d(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : ");
                                 if( KnxApi.data.BadRoom_EnergyMeter[nDevNo - 2].Info.LightType_1 == 0x0F || KnxApi.data.BadRoom_EnergyMeter[nDevNo - 2].Info.LightType_2 == 0x0F
                                         || KnxApi.data.BadRoom_EnergyMeter[nDevNo - 2].Info.LightType_3 == 0x0F || KnxApi.data.BadRoom_EnergyMeter[nDevNo - 2].Info.LightType_4 == 0x0F)
                                 {
-                                    Log.e(TAG, "yskim [iCMDProcChumDamSmartLightControl] ==> Fan : " + nDevNo );
+                                    Log.d(TAG, "yskim [iCMDProcChumDamSmartLightControl] ==> Fan : " + nDevNo );
                                     for( int i = 0 ; i < KnxApi.data.BadRoom_EnergyMeter[nDevNo - 2].Info.LightCount ; i++) {
                                         // 욕실팬은 제어하지 말아야 하는데...코드 추가해야함
                                         int nRet =KnxApi.SetEMLightDimming((byte) (nDevNo -2), (byte)i,(byte) Integer.parseInt(unit_dimming));
-                                        Log.e(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : " + nRet);
+                                        Log.d(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : " + nRet);
                                     }
                                 }
                                 else {
 
                                     int nRet = KnxApi.SetEMLightDimming((byte) (nDevNo - 2), define.DEVICE_ALL_OR_NOTHING, (byte) Integer.parseInt(unit_dimming));
-                                    Log.e(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : " + nRet);
+                                    Log.d(TAG, "yskim [iCMDProcChumDamSmartLightControl] KnxApi.SetEMLightDimming!!nRet : " + nRet);
                                 }
 
                                 //KnxApi.SetLightDimming(define.DEVICE_ALL_OR_NOTHING, (byte) Integer.parseInt(unit_dimming)); // 거실이라는 이야기인데;
@@ -8699,7 +8703,7 @@ public class iMapServer extends Service {
 
                             if ( KnxApi.Refresh(KnxAPI.DEVICE_INDEX.ALL, (byte) define.DEVICE_ALL_OR_NOTHING) < 0 ) {
                                 retStr += " result=\"fail\">\r\n   </service>\r\n</imap>";
-                                Log.e(TAG, "yskim [iCMDProcChumDamSmartLightControl] Refreshing mSdbAPI is failed!!!");
+                                Log.d(TAG, "yskim [iCMDProcChumDamSmartLightControl] Refreshing mSdbAPI is failed!!!");
                                 return retStr;
                             }