Browse Source

[WallPadAPI]
1. HeatinvV1, HeatingV2 Debug Log Off
2. Jar 파일 최신 업데이트

[WallPadMain]
1. Jar파일 최신 업데이트
2. LCD Keeper 최상단으로 변경
3. LCD Keeper 보호모드로 변경 시, Gif 기능 해제

[ManagerSetting]
1. Jar파일 최신 업데이트

[WallPadHomeCtrl]
1. Jar파일 최신 업데이트
2. HeatinvV1, V2 디버그 로그 삭제

[WallPadDevService]
1. Jar파일 최신 업데이트
2. CookTopFinder 필요없는 로그 삭제

jglee 3 years ago
parent
commit
ca1a91d6d4

BIN
ManagerSetting/libs/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


+ 1 - 1
WallPadAPI/src/main/java/com/artncore/wallpadapi/HeatingV1API.java

@@ -14,7 +14,7 @@ public class HeatingV1API extends WallPadDevAPI
 {
     private final String TAG = "HeatingV1API";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     /** Refresh 시 사용되는 index 를 정의한다. */

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/wallpadapi/HeatingV2API.java

@@ -16,7 +16,7 @@ public class HeatingV2API extends WallPadDevAPI
 {
     private final String TAG = "HeatingV2API";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     /** Refresh 시 사용되는 index 를 정의한다. */

BIN
WallPadDevService/libs/WallPadAPIforSVC.jar


+ 18 - 18
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CookTopFinder_Controller.java

@@ -164,9 +164,9 @@ public class CookTopFinder_Controller extends DeviceManager
                 if (mDriver.Polling.SearchTryCount++ > MAX_SEARCH_COUNT) {
                     mDriver.Polling.Status = CookTopFinder_Controller.Driver.PollingList.STATUS.FirstTimeOut;
 
-                    Log.i(TAG, "--------------------------------------------------");
-                    Log.i(TAG, "SearchDevice Fail... FirstTimeOut ");
-                    Log.i(TAG, "--------------------------------------------------");
+//                    Log.i(TAG, "--------------------------------------------------");
+//                    Log.i(TAG, "SearchDevice Fail... FirstTimeOut ");
+//                    Log.i(TAG, "--------------------------------------------------");
 
                     ServiceMain.deviceInitChecker.Remove(super.DeviceName);
                     ServiceMain.deviceInitChecker.Remove(ServiceMain.cooktop_Controller.DeviceName);
@@ -179,14 +179,14 @@ public class CookTopFinder_Controller extends DeviceManager
                 boolean bRet = Send_GasReplyCheck();// Send_HeatingV1ReplyCheck();
                 if (bRet) {
                     mDriver.Polling.GasReplyCount++;
-                    Log.i(TAG, "Find - HeatingV1 (Count:" + mDriver.Polling.GasReplyCount + ")");
+//                    Log.i(TAG, "Find - HeatingV1 (Count:" + mDriver.Polling.GasReplyCount + ")");
                 }
             }
             else {
                 boolean bRet = Send_CookTopReplyCheck();
                 if (bRet) {
                     mDriver.Polling.CookTopReplyCount++;
-                    Log.i(TAG, "Find - HeatingV2 (Count:" + mDriver.Polling.CookTopReplyCount + ")");
+//                    Log.i(TAG, "Find - HeatingV2 (Count:" + mDriver.Polling.CookTopReplyCount + ")");
                 }
             }
 
@@ -211,7 +211,7 @@ public class CookTopFinder_Controller extends DeviceManager
         /* [[ Normal ]]
          * 평상시 */
         else if (mDriver.Polling.Status == CookTopFinder_Controller.Driver.PollingList.STATUS.Normal) {
-            Log.w(TAG, "do_ctr - Normal");
+//            Log.w(TAG, "do_ctr - Normal");
         }
         /*
          * 예외처리 */
@@ -239,14 +239,14 @@ public class CookTopFinder_Controller extends DeviceManager
         if( (mDriver.Polling.Status == Driver.PollingList.STATUS.First) ||
                 (mDriver.Polling.Status == Driver.PollingList.STATUS.FirstTimeOut) )
         {
-            Log.w(TAG, "[NoSinkCtrl] - Not Yet !!!");
+//            Log.w(TAG, "[NoSinkCtrl] - Not Yet !!!");
             return "FAIL;" + APIErrorCode.DEVICEISNOTREADY;
         }
 
         CtrDevFormat ctrDevFormat = GetCtrDevParamParsing(StrArg, 5);
         if(ctrDevFormat.ret != APIErrorCode.C_SUCCESS)
         {
-            Log.w(TAG, "[NoSinkCtrl] GetCtrDevParamParsing Error (ret:" + ctrDevFormat.ret + ")");
+//            Log.w(TAG, "[NoSinkCtrl] GetCtrDevParamParsing Error (ret:" + ctrDevFormat.ret + ")");
             return "FAIL;" + APIErrorCode.DEFAULT_PARSING_ERR;
         }
 
@@ -323,7 +323,7 @@ public class CookTopFinder_Controller extends DeviceManager
             result = "FAIL;"+APIErrorCode.EXCEPTION;
         }
         catch (Exception e) {
-            Log.e(TAG, "[Exception Error] RefreshResult");
+//            Log.e(TAG, "[Exception Error] RefreshResult");
             //e.printStackTrace();
             LogUtil.errorLogInfo("", TAG, e);
             result = "FAIL;"+APIErrorCode.EXCEPTION;
@@ -384,7 +384,7 @@ public class CookTopFinder_Controller extends DeviceManager
             }
             else
             {
-                Log.i(TAG, "SearchDevice     DeviceNum = " + (byte)(DeviceIdx+1) + "      Fail...");
+//                Log.i(TAG, "SearchDevice     DeviceNum = " + (byte)(DeviceIdx+1) + "      Fail...");
             }
             Sleep(1000);
         }
@@ -476,7 +476,7 @@ public class CookTopFinder_Controller extends DeviceManager
         if(Reply.length < 11)
         {
             // 길이 체크
-            Log.w(TAG, "[Send_CookTopReplyCheck] Reply.length  fail ... " + Reply.length);
+//            Log.w(TAG, "[Send_CookTopReplyCheck] Reply.length  fail ... " + Reply.length);
             return false;
         }
         return true;
@@ -523,16 +523,16 @@ public class CookTopFinder_Controller extends DeviceManager
         if( (DeviceID != define.DRIVERID_GAS) &&
                 (DeviceID != define.DRIVERID_COOKTOP) )
         {
-            Log.w(TAG, "[LoadingDriver] Param : DeviceID Out Of Range !!!(DeviceID:" + DeviceID + ")");
+//            Log.w(TAG, "[LoadingDriver] Param : DeviceID Out Of Range !!!(DeviceID:" + DeviceID + ")");
             return -1;
         }
 
         // 2. Doing
         if(DeviceID == define.DRIVERID_GAS)
         {
-            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
-            Log.i(TAG, "DRIVERID_GAS - LOADING ...");
-            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
+//            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
+//            Log.i(TAG, "DRIVERID_GAS - LOADING ...");
+//            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
 
             // 드라이버를 시작시킨다.
             SendNewDriverStart(DeviceID);
@@ -546,9 +546,9 @@ public class CookTopFinder_Controller extends DeviceManager
         else if(DeviceID == define.DRIVERID_COOKTOP)
         {
             // V2 로딩
-            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
-            Log.i(TAG, "DRIVERID_COOKTOP - LOADING ...");
-            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
+//            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
+//            Log.i(TAG, "DRIVERID_COOKTOP - LOADING ...");
+//            Log.i(TAG, "+++++++++++++++++++++++++++++++++++++++");
 
             // 드라이버를 시작시킨다.
             SendNewDriverStart(DeviceID);

BIN
WallPadHomeCtrl/libs/WallPadAPI.jar


+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV1MainScreen.java

@@ -42,7 +42,7 @@ public class HeatingV1MainScreen extends WpadScreen
 {
     private final String TAG = "HeatingV1MainScreen";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     // =================================================================================================

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV1PopupScreen.java

@@ -50,7 +50,7 @@ public class HeatingV1PopupScreen extends WpadScreen
 {
     private final String TAG = "HeatingV1PopupScreen";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     // =================================================================================================

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java

@@ -52,7 +52,7 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 public class HeatingV2MainScreen extends WpadScreen {
     private final String TAG = "HeatingV2MainScreen";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     // =================================================================================================

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2PopupBoilerScreen.java

@@ -40,7 +40,7 @@ public class HeatingV2PopupBoilerScreen extends WpadScreen
 {
     private final String TAG = "HeatingV2PopupBoilerScreen";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
     private void DebugLogOutput(String s) { if(DEBUG_LOG_ON) Log.d(TAG, s); }
 
     // =================================================================================================

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2PopupScreen.java

@@ -51,7 +51,7 @@ import kr.co.icontrols.wallpadsupport.WpadUtil;
 public class HeatingV2PopupScreen extends WpadScreen {
     private final String TAG = "HeatingV2PopupScreen";
 
-    private final boolean DEBUG_LOG_ON = true;
+    private final boolean DEBUG_LOG_ON = false;
 
     private void DebugLogOutput(String s) {
         if (DEBUG_LOG_ON) Log.d(TAG, s);

BIN
WallPadMain/libs/WallPadAPI.jar


+ 4 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -9729,6 +9729,7 @@ public class MainActivity extends WpadActivity {
             }
 
             IMG_LCD_KEEPER = (ImageView) findViewById(R.id.view_lcdkeeper);
+            IMG_LCD_KEEPER.bringToFront();
             IMG_LCD_KEEPER.setVisibility(View.INVISIBLE);
             Log.i(TAG, "[registerLCDKeeper] ===== END =====");
         } catch (RuntimeException re) {
@@ -9748,13 +9749,13 @@ public class MainActivity extends WpadActivity {
     private void runLCDKeeper(int nKeeperMode) {
         try {
             if (!bLCDKeeperUsage) {
-                Log.w(TAG, "[registerLCDKeeper] bLCDKeeperUsage is false!!!");
+                Log.w(TAG, "[runLCDKeeper] bLCDKeeperUsage is false!!!");
                 return;
             }
 
             Log.i(TAG, "[runLCDKeeper] nKeeperMode [" + nKeeperMode +"], bLCDBacklightPower [" + bLCDBacklightPower +"]");
             if (Build.VERSION.SDK_INT < 24) {
-                Log.w(TAG, "[registerLCDKeeper] not support LCDKeeper!! Build.VERSION.SDK_INT -> " + Build.VERSION.SDK_INT);
+                Log.w(TAG, "[runLCDKeeper] not support LCDKeeper!! Build.VERSION.SDK_INT -> " + Build.VERSION.SDK_INT);
                 return;
             }
 
@@ -9785,6 +9786,7 @@ public class MainActivity extends WpadActivity {
                 IMG_LCD_KEEPER.setVisibility(View.VISIBLE);
             }
             else if (nKeeperMode == LCDKEEPER_MODE_PROTECT) {
+                IMG_LCD_KEEPER.setImageBitmap(null);
                 IMG_LCD_KEEPER.setBackgroundColor(Color.BLACK);
                 IMG_LCD_KEEPER.setVisibility(View.VISIBLE);
             }