Kaynağa Gözat

[수정사항]
1. Netatmo Welcome 오프라인 예외처리 추가.

aaron 9 yıl önce
ebeveyn
işleme
853aa8a6b7

+ 1 - 0
kneet_v3/src/main/java/com/ntels/kneet/v3/common/Constants.java

@@ -961,6 +961,7 @@ public interface Constants {
     final static int      MSG913          = 913;
     final static int      MSG914          = 914;
     final static int      MSG915          = 915;
+    final static int      MSG916          = 916;
     // 알림버튼 1개인 메세지들
     // final static String[] MSG_BTN_COUNT_1 = {"MSG801"};
     // 알림버튼 2개인 메세지들

+ 11 - 0
kneet_v3/src/main/java/com/ntels/kneet/v3/view/things/Things_Device_Netatmo_Camera_Detail.java

@@ -171,6 +171,9 @@ public class Things_Device_Netatmo_Camera_Detail extends CustomActivity implemen
                     }
                 }
                 break;
+            case Constants.MSG916:
+                onBackPressed();
+                break;
 
             default:
                 break;
@@ -252,6 +255,10 @@ public class Things_Device_Netatmo_Camera_Detail extends CustomActivity implemen
                             processCurrentCameraUrl(alCameraList);
                         } catch (JSONException e) {
                             e.printStackTrace();
+                            if (isLoading) {
+                                loadingAnimation.cancel();
+                            }
+                            customDialog.MsgAlert(act, Constants.MSG807);
                         }
                     }
                 },
@@ -316,6 +323,10 @@ public class Things_Device_Netatmo_Camera_Detail extends CustomActivity implemen
     private void processCurrentCameraUrl(ArrayList<HashMap<String, Object>> alCameraList) {
         for (HashMap<String, Object> hmCamera : alCameraList) {
             if (hmCamera.get("id").equals(sCameraId)) {
+                if (hmCamera.get("status").equals("disconnected")) {
+                    customDialog.MsgAlert(act, Constants.MSG916);
+                    return;
+                }
                 sCameraUrl = util.null2string(hmCamera.get("vpn_url"));
                 if (((Boolean) hmCamera.get("is_local")).booleanValue()) {
                     ComHandler.sendEmptyMessageDelayed(MSG_COM_G_NETATMO_COMMAND_PING, 10);

+ 1 - 0
kneet_v3/src/main/res/values-en/strings_msg.xml

@@ -141,6 +141,7 @@
     <string name="MSG913"><![CDATA["Video unavailable. The camera is off."]]></string>
     <string name="MSG914"><![CDATA["요청 횟수를 초과하였습니다. 잠시 후 다시 시도해주세요."]]></string>
     <string name="MSG915"><![CDATA["계정 정보가 올바르지 않습니다."]]></string>
+    <string name="MSG916"><![CDATA["Netatmo Welcome이 오프라인 상태입니다."]]></string>
 
     <!-- Websocket error message -->
     <string name="WS_ERR_100"><![CDATA["A network error occurred\nCheck your network connection"]]></string>

+ 1 - 0
kneet_v3/src/main/res/values/strings_msg.xml

@@ -141,6 +141,7 @@
     <string name="MSG913"><![CDATA["Video unavailable. The camera is off."]]></string>
     <string name="MSG914"><![CDATA["요청 횟수를 초과하였습니다. 잠시 후 다시 시도해주세요."]]></string>
     <string name="MSG915"><![CDATA["계정 정보가 올바르지 않습니다."]]></string>
+    <string name="MSG916"><![CDATA["Netatmo Welcome이 오프라인 상태입니다."]]></string>
 
     <!-- Websocket error message -->
     <string name="WS_ERR_100"><![CDATA["네트워크 에러가 발생했습니다.\n네트워크를 확인해주세요"]]></string>