[최진오]

websocket 수정

onecable/src/main/java/com/ntels/onecable/common/widget/CustomActivity.java

@@ -72,15 +72,15 @@ public class CustomActivity extends AppCompatActivity {
             WebSocketService.WebSocketBinder binder = (WebSocketService.WebSocketBinder) service;
             mWebSocketService = binder.getService();
             // 웹소켓이 연결되기전 Resume가 진행되면 connect 를 다시 구동한다
-            if (mIsResume){
-                if (mIsWebSocket) {
-                    if (mWebSocketService != null) {
-                        if (!mWebSocketService.isWebSocketConnected()) {
-                            mWebSocketService.webSocketConnect();
-                        }
-                    }
-                }
-            }
+//            if (mIsResume){
+//                if (mIsWebSocket) {
+//                    if (mWebSocketService != null) {
+//                        if (!mWebSocketService.isWebSocketConnected()) {
+//                            mWebSocketService.webSocketConnect();
+//                        }
+//                    }
+//                }
+//            }
 //            mIsBound = true;
         }
 

onecable/src/main/java/com/ntels/onecable/view/Login.java

@@ -783,6 +783,7 @@ public class Login extends CustomActivity implements View.OnClickListener, Custo
         mAppConfig.setGoErr(false);
         mAppConfig.setMain(false);
         setResult(RESULT_CANCELED, new Intent());
+        getWebSocketService().webSocketDisconnect();
         finish();
     }
 

onecable/src/main/java/com/ntels/onecable/view/Main.java

@@ -398,9 +398,9 @@ public class Main extends CustomActivity implements View.OnClickListener,
                     case Constants.ACT_THINGS_GROUP_ADD:
                         break;
                     case Constants.ACT_THINGS_HOMEHUB_GUIDE:
-                        if (getWebSocketService() != null && !getWebSocketService().isWebSocketConnected()) {
-                            getWebSocketService().webSocketConnect();
-                        }
+//                        if (getWebSocketService() != null && !getWebSocketService().isWebSocketConnected()) {
+//                            getWebSocketService().webSocketConnect();
+//                        }
                         Intent intent = new Intent(mActivity, HomeStart.class);
                         mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_HOME_START);
                         break;
@@ -930,6 +930,7 @@ public class Main extends CustomActivity implements View.OnClickListener,
         mAppConfig.setIntro(false);
         mAppConfig.setGoErr(false);
         mAppConfig.setMain(false);
+        getWebSocketService().webSocketDisconnect();
         finish();
     }