[최진오]

WSS 웹소켓 오류 해결

onecable/build.gradle

@@ -113,7 +113,7 @@ dependencies {
     compile 'com.tsengvn:Typekit:1.0.0'
     compile 'jp.wasabeef:recyclerview-animators:2.1.0'
     compile 'com.mcxiaoke.volley:library:1.0.+'
-    compile 'org.java-websocket:Java-WebSocket:1.3.0'
+    compile 'org.java-websocket:Java-WebSocket:1.3.4'
     compile 'com.jakewharton:butterknife:8.5.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
     compile 'com.android.support:design:25.3.1'

onecable/src/main/AndroidManifest.xml

@@ -480,61 +480,55 @@
                 android:theme="@style/Translucent_Pop_dim"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAddStep0"
+                android:name=".view.things.ThingsDeviceDelOffStep1"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAddStep1"
+                android:name=".view.things.ThingsDeviceDelOffStep2"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAddStep2"
+                android:name=".view.things.ThingsDeviceDelStep0"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAddStep3"
+                android:name=".view.things.ThingsDeviceDelStep1"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAdd1st"
+                android:name=".view.things.ThingsDeviceDelStep2"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceAdd2nd"
-                android:configChanges="fontScale"
-                android:screenOrientation="portrait"
-                android:theme="@style/NTLES_Dialog1"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
-        <activity
-                android:name=".view.things.ThingsDeviceAdd3rd"
+                android:name=".view.things.ThingsDeviceAddStep0"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceDel1st"
+                android:name=".view.things.ThingsDeviceAddStep1"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceDel2nd"
+                android:name=".view.things.ThingsDeviceAddStep2"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-                android:name=".view.things.ThingsDeviceDel3rd"
+                android:name=".view.things.ThingsDeviceAddStep3"
                 android:configChanges="fontScale"
                 android:screenOrientation="portrait"
                 android:theme="@style/NTLES_Dialog1"

onecable/src/main/java/com/ntels/onecable/common/websocket/WebSocketService.java

@@ -9,7 +9,6 @@ import com.ntels.onecable.common.util.LogUtil;
 import com.ntels.onecable.common.util.Util;
 
 import org.java_websocket.WebSocket;
-import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft_10;
 import org.java_websocket.handshake.ServerHandshake;
@@ -31,10 +30,13 @@ import android.util.Log;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
@@ -229,24 +231,24 @@ public class WebSocketService extends Service {
         if (uri.getScheme().equals("wss")) {
             try {
                 TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
-                    public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                        return new java.security.cert.X509Certificate[]{};
+                    public X509Certificate[] getAcceptedIssuers() {
+                        X509Certificate[] myTrustedAnchors = new X509Certificate[0];
+                        return myTrustedAnchors;
                     }
 
                     @Override
-                    public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert
-                            .CertificateException {
+                    public void checkClientTrusted(X509Certificate[] certs, String authType) {
                     }
 
                     @Override
-                    public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert
-                            .CertificateException {
+                    public void checkServerTrusted(X509Certificate[] certs, String authType) {
                     }
-                }
-                };
-                SSLContext sc = SSLContext.getInstance("TLS");
-                sc.init(null, trustAllCerts, new java.security.SecureRandom());
-                mWebSocket.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(sc));
+                }};
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(null, trustAllCerts, new SecureRandom());
+                SSLSocketFactory factory = sslContext.getSocketFactory();
+                mWebSocket.setSocket(factory.createSocket());
+                mWebSocket.connectBlocking();
             } catch (NoSuchAlgorithmException e) {
                 e.printStackTrace();
             } catch (Exception e) {

onecable/src/main/java/com/ntels/onecable/view/things/FragmentThings.java

@@ -1480,33 +1480,33 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         mLoading = false;
         try {
-            JSONObject joResult = new JSONObject(result.getContent());
-            if (!joResult.isNull(Constants.KEY_RESULT_CODE)) {
-                resultCode = mUtil.null2string(joResult.get(Constants.KEY_RESULT_CODE));
-            }
-            if (!joResult.isNull(Constants.KEY_RESULT_MSG)) {
-                resultMsg = mUtil.null2string(joResult.get(Constants.KEY_RESULT_MSG));
-            }
-            if (result.getStatusCode() == 200) {
-
-                Dlog.i(TAG, "cloud node delete result code : " + resultCode);
-                if (resultCode.equals("00")) {
-                    mIntent = new Intent(mActivity, ThingsDeviceDel3rd.class);
-                    mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_3RD);
-                } else {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG000, "[" + resultCode + "] " + resultMsg);
-                    onListReload();
-                }
-            } else {
-                Dlog.v(joResult.toString());
-                if (resultCode.equals("401")) {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG998, resultMsg);
-                } else if (resultCode.equals("401-106")) {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG997, resultMsg);
-                } else {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-                }
-            }
+//            JSONObject joResult = new JSONObject(result.getContent());
+//            if (!joResult.isNull(Constants.KEY_RESULT_CODE)) {
+//                resultCode = mUtil.null2string(joResult.get(Constants.KEY_RESULT_CODE));
+//            }
+//            if (!joResult.isNull(Constants.KEY_RESULT_MSG)) {
+//                resultMsg = mUtil.null2string(joResult.get(Constants.KEY_RESULT_MSG));
+//            }
+//            if (result.getStatusCode() == 200) {
+//
+//                Dlog.i(TAG, "cloud node delete result code : " + resultCode);
+//                if (resultCode.equals("00")) {
+//                    mIntent = new Intent(mActivity, ThingsDeviceDel3rd.class);
+//                    mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_3RD);
+//                } else {
+//                    mCustomDialog.msgAlert(mActivity, Constants.MSG000, "[" + resultCode + "] " + resultMsg);
+//                    onListReload();
+//                }
+//            } else {
+//                Dlog.v(joResult.toString());
+//                if (resultCode.equals("401")) {
+//                    mCustomDialog.msgAlert(mActivity, Constants.MSG998, resultMsg);
+//                } else if (resultCode.equals("401-106")) {
+//                    mCustomDialog.msgAlert(mActivity, Constants.MSG997, resultMsg);
+//                } else {
+//                    mCustomDialog.msgAlert(mActivity, Constants.MSG807);
+//                }
+//            }
         } catch (Exception ex) {
             ex.printStackTrace();
             mCustomDialog.msgAlert(mActivity, Constants.MSG807);

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceAdd1st.java

@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.AppConfig;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Dlog;
-import com.ntels.onecable.common.util.LogUtil;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.websocket.WebSocketService;
-import com.ntels.onecable.common.widget.CustomActivity;
-import com.ntels.onecable.view.dialog.CustomDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Toast;
-
-import java.util.HashMap;
-
-import static com.ntels.onecable.common.Constants.EXTRA_ERROR_CODE;
-import static com.ntels.onecable.common.Constants.EXTRA_RESULT_STATE;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceAdd1st
- * 2. FileName  :   ThingsDeviceAdd1st.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceAdd1st extends CustomActivity implements View.OnClickListener, CustomDialog.OnMsgAlterToResult {
-
-    private static final String TAG = ThingsDeviceAdd1st.class.getSimpleName();
-    private static final int MSG_COM_WS_NODE_COMMAND = 1;
-    Handler comHandler = new Handler(new IncomingHandlerCallBack());
-    /*통신 관련*/
-    private int mType = 0;
-    /*공통*/
-    private Activity mActivity;
-    private AppConfig mAppConfig;
-    private Intent mIntent;
-    private Util mUtil = new Util();
-    private CustomDialog mCustomDialog = new CustomDialog();
-    private String mDeviceName = "";
-    private String mCompanyName = "";
-    private String mDeviceDesc = "";
-    private String mDeviceDesc1 = "";
-    private int mDeviceImageId = 0;
-    private int mDeviceImageId1 = 0;
-    //    private WebSocketService mWebSocketService;
-    private boolean mIsBound = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceAdd1st.this;
-        mAppConfig = (AppConfig) mActivity.getApplicationContext();
-        mCustomDialog.setOnMsgAlterToResultEvent(this);
-
-        setIsWebSocket(true);
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_add_step1, null);
-        this.setContentView(viewToLoad);
-
-        Intent intent = getIntent();
-        mDeviceName = intent.getStringExtra(Constants.EXTRA_DEVICE_NAME);
-        mCompanyName = intent.getStringExtra(Constants.EXTRA_COMPANY_NAME);
-        mDeviceDesc = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC);
-        mDeviceDesc1 = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC1);
-        mDeviceImageId = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE, 0);
-        mDeviceImageId1 = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE1, 0);
-
-        setDisp();
-    }
-
-    @Override
-    public void onClick(View view) {
-        LogUtil.i(TAG, "onClick!!");
-        switch (view.getId()) {
-            case R.id.llBtn2:
-                onBackPressed();
-                break;
-            case R.id.llBtn1:
-                LogUtil.i(TAG, "onClick : start!!");
-                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState().equals("ON")) {
-                    LogUtil.i(TAG, "mCompanyName : " + mCompanyName);
-                    if (mCompanyName.equals(getString(R.string.layout_things_device_add_17))) {
-                        mIntent = new Intent(mActivity, ThingsDeviceNetatmoLogin.class);
-                        mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_NETATMO_LOGIN);
-                    } else {
-                        mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
-                        mUtil.getView(mActivity, R.id.btnReStart).setEnabled(false);
-                        comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND), Constants.HANDLER_DELAY_MILLIS);
-                    }
-                } else {
-                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
-                    return;
-                }
-                break;
-            case R.id.btnReStart:
-                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState().equals("ON")) {
-                    mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
-                    mUtil.getView(mActivity, R.id.btnReStart).setEnabled(false);
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(
-                            MSG_COM_WS_NODE_COMMAND), Constants.HANDLER_DELAY_MILLIS);
-                } else {
-                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
-                    return;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void resultCustomDialogResponse(int msgId, int btnResult) {
-
-        switch (msgId) {
-
-            case Constants.MSG998:
-                mUtil.callApp_Start(mActivity, "LOGOUT");
-                break;
-            case Constants.MSG997:
-                mUtil.callApp_Start(mActivity, "HOME_RELOAD");
-                break;
-            case Constants.MSG807:
-                if (btnResult == 1) {
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(mType), Constants.HANDLER_DELAY_MILLIS);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mActivity.setResult(RESULT_CANCELED, mIntent);
-        finish();
-        return;
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode == mActivity.RESULT_OK) {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_ADD_02:
-                    setResult(RESULT_OK, data);
-                    finish();
-                    break;
-                case Constants.ACT_THINGS_DEVICE_NETATMO_LOGIN:
-                    setResult(RESULT_OK, data);
-                    finish();
-                    break;
-                default:
-                    break;
-            }
-        } else {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_ADD_02:
-                    Boolean isFlowEnd = data.getBooleanExtra(Constants.EXTRA_FLOW_END_FLAG, false);
-                    Boolean isTimeout = data.getBooleanExtra(Constants.EXTRA_TIMEOUT_FLAG, false);
-                    if (isFlowEnd) {
-                        mActivity.setResult(RESULT_CANCELED, data);
-                        finish();
-                    } else {
-                        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-                        if (isTimeout) {
-                            mUtil.getView(mActivity, R.id.llBtn1).setVisibility(View.GONE);
-                            mUtil.getView(mActivity, R.id.llStart).setVisibility(View.GONE);
-                            mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.VISIBLE);
-                        } else {
-                            mUtil.getView(mActivity, R.id.llBtn1).setVisibility(View.VISIBLE);
-                            mUtil.getView(mActivity, R.id.llStart).setVisibility(View.VISIBLE);
-                            mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.GONE);
-                        }
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-
-        super.onDestroy();
-
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    public void recevicedWebSocket(Intent intentReceived) {
-
-        int receivedState = intentReceived.getIntExtra(EXTRA_RESULT_STATE, WebSocketService.WEBSOCKET_RECEIVED_SUCESS);
-        if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_SUCESS) {
-            try {
-                String result = intentReceived.getStringExtra(Constants.EXTRA_RESULT);
-                Dlog.v(result);
-                JSONObject jsonObject = new JSONObject(result);
-                String messageType = mUtil.null2string(jsonObject.get(Constants.KEY_MESSAGE_TYPE));
-                LogUtil.i(TAG, "websocket message mType : " + messageType);
-
-                if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND_RESULT)) {
-                    notificationWsDeviceCommandResult(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND)) {
-                    resultWsDeviceCommandResult(jsonObject);
-                } else {
-                    // TODO: 2016-11-25 : 처리 정책?
-                }
-            } catch (JSONException ex) {
-                ex.printStackTrace();
-            }
-        } else if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_ERROR) {
-
-            int errorCode = intentReceived.getIntExtra(EXTRA_ERROR_CODE, WebSocketService.WEBSOCKET_CONNECT_TIMEOUT);
-            switch (errorCode) {
-
-            }
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-        mUtil.getView(mActivity, R.id.llStart).setVisibility(View.VISIBLE);
-        mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.GONE);
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llBtn2).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.btnReStart).setOnClickListener(this);
-
-        mUtil.getTextView(mActivity, R.id.tvDeviceName).setText(mDeviceName);
-        mUtil.getTextView(mActivity, R.id.tvCompanyName).setText(mCompanyName);
-        mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setText(mDeviceDesc);
-        mUtil.setImage(mActivity, mDeviceImageId, R.id.ivIconDevice);
-    }
-
-    ;
-
-    /**
-     * 서비스 허브에 디바이스제어(노드 페어링 모드)를 요청한다.
-     */
-    private void sendWsDeviceCommand() {
-        HashMap<String, Object> sendParams = new HashMap<>();
-        sendParams.put(Constants.KEY_MESSAGE_TYPE,
-                Constants.WEBSOCKET_TYPE_DEVICE_COMMAND);
-        sendParams.put(Constants.KEY_DEVICE_ID,
-                mAppConfig.getSelectHomehubDeviceId());
-        sendParams.put(Constants.KEY_COMMAND_TYPE,
-                Constants.WEBSOCKET_COMM_TYPE_PAIRING_START);
-        sendParams.put(Constants.KEY_REQUEST_ID,
-                mAppConfig.getSelectServicehubRequestId());
-
-        getWebSocketService().send(Constants.WEBSOCKET_SEND_DEVICE_COMMAND, sendParams);
-    }
-
-    /**
-     * 디바이스 제어(노드 페어링 모드)를 요청 결과.
-     *
-     * @param jsonResult 결과 json object
-     */
-    private void resultWsDeviceCommandResult(JSONObject jsonResult) {
-        try {
-            if (!jsonResult.get(Constants.KEY_RESULT_CODE).equals("00")) {
-                LogUtil.i(TAG, jsonResult.getString(Constants.KEY_RESULT_MSG));
-                mCustomDialog.msgAlert(mActivity, Constants.MSG836);
-                mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-                mUtil.getView(mActivity, R.id.btnReStart).setEnabled(true);
-            }
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 페어링 모드) 결과를 푸쉬 받는다.
-     *
-     * @param jsonResult 결과 json object
-     *
-     * @exception JSONException json parsing exception
-     */
-    private void notificationWsDeviceCommandResult(JSONObject jsonResult) throws JSONException {
-        try {
-            if (jsonResult.get(Constants.KEY_COMMAND_STATUS).equals("SUCCESS")) {
-
-                mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.INVISIBLE);
-                mIntent = new Intent(mActivity, ThingsDeviceAdd2nd.class);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_NAME, mDeviceName);
-                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mCompanyName);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mDeviceDesc1);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, mDeviceImageId1);
-                String commandId = mUtil.null2string(jsonResult.get(Constants.KEY_COMMAND_ID));
-                mIntent.putExtra(Constants.EXTRA_COMMAND_ID, commandId);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_ID, mAppConfig.getSelectHomehubDeviceId());
-                mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_ADD_02);
-            } else {
-                Dlog.v(jsonResult.toString());
-                if (jsonResult.has(Constants.KEY_COMMAND_MESSAGE)) {
-                    String resultMsg = mUtil.null2string(jsonResult.get(Constants.KEY_COMMAND_MESSAGE));
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG000, resultMsg);
-                } else {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        } finally {
-            mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-            mUtil.getView(mActivity, R.id.btnReStart).setEnabled(true);
-        }
-    }
-
-    /**
-     * 서버 요청 핸들러.
-     */
-    class IncomingHandlerCallBack implements Handler.Callback {
-
-        @Override
-        public boolean handleMessage(Message msg) {
-
-            mType = msg.what;
-            switch (msg.what) {
-                case MSG_COM_WS_NODE_COMMAND:
-                    sendWsDeviceCommand();
-                    break;
-
-                default:
-                    break;
-            }
-            return true;
-        }
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceAdd2nd.java

@@ -1,349 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.AppConfig;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Dlog;
-import com.ntels.onecable.common.util.LogUtil;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.websocket.WebSocketService;
-import com.ntels.onecable.common.widget.CustomActivity;
-import com.ntels.onecable.view.dialog.CustomDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import java.util.HashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import static com.ntels.onecable.common.Constants.EXTRA_ERROR_CODE;
-import static com.ntels.onecable.common.Constants.EXTRA_RESULT_STATE;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceAdd2nd
- * 2. FileName  :   ThingsDeviceAdd2nd.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceAdd2nd extends CustomActivity implements View.OnClickListener, CustomDialog.OnMsgAlterToResult {
-
-    private static final String TAG = ThingsDeviceAdd2nd.class.getSimpleName();
-    private static final int CONNECT_MAX_TIME_SEC = 60;
-    /*공통*/
-    private Activity mActivity;
-    private AppConfig mAppConfig;
-    private Intent mIntent;
-    private Util mUtil = new Util();
-    private CustomDialog mCustomDialog = new CustomDialog();
-    private String mDeviceId = "";
-    private String mDeviceDesc1 = "";
-    private int mDeviceImageId = 0;
-    private String mCommandId = "";
-    private ScheduledFuture mScheduledFuture;
-    private Boolean mIsEnd = false;
-    private Boolean mIsPollingPause = false;
-    private Boolean mIsPollingCancel = false;
-    private int mMaxTime = CONNECT_MAX_TIME_SEC;
-    private int mTotal = 0;
-    Runnable runnable = new Runnable() {
-        public void run() {
-
-            Dlog.v("Things mIsPollingCancel", mIsPollingCancel);
-            Dlog.v("Things mIsPollingPause", mIsPollingPause);
-            if (mIsPollingCancel) {
-                mScheduledFuture.cancel(false);
-            }
-            if (!mIsPollingPause) {
-                mTotal++;
-                mUtil.getTextView(mActivity, R.id.tvConnectTime).post(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        mUtil.getTextView(mActivity, R.id.tvConnectTime).setText((mMaxTime - mTotal) + "");
-                    }
-                });
-                if (mTotal >= mMaxTime) {
-                    if (!mIsEnd) {
-                        mIsEnd = true;
-                        mUtil.getTextView(mActivity, R.id.tvConnectTime).post(new Runnable() {
-                            @Override
-                            public void run() {
-
-                                mUtil.getTextView(mActivity, R.id.tvConnectTime).setText("");
-
-                                mIntent = new Intent();
-                                mIntent.putExtra(Constants.EXTRA_TIMEOUT_FLAG, true);
-                                mActivity.setResult(RESULT_CANCELED, mIntent);
-                                finish();
-                            }
-                        });
-                        mScheduledFuture.cancel(false);
-                    }
-                }
-            }
-        }
-    };
-    //    private WebSocketService mWebSocketService;
-    private boolean mIsBound = false;
-
-    @Override
-    public void onDestroy() {
-
-        super.onDestroy();
-        Dlog.v("onDestroy()");
-        if (mScheduledFuture != null) {
-            mScheduledFuture.cancel(false);
-            mIsPollingPause = true;
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceAdd2nd.this;
-        mAppConfig = (AppConfig) mActivity.getApplicationContext();
-        mCustomDialog.setOnMsgAlterToResultEvent(this);
-
-        setIsWebSocket(true);
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_add_step2, null);
-        this.setContentView(viewToLoad);
-
-        Intent intent = getIntent();
-        mDeviceDesc1 = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC1);
-        mDeviceImageId = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE1, 0);
-        mCommandId = intent.getStringExtra(Constants.EXTRA_COMMAND_ID);
-        mDeviceId = intent.getStringExtra(Constants.EXTRA_DEVICE_ID);
-
-        setDisp();
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-        mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setText(mDeviceDesc1);
-        mUtil.setImage(mActivity, mDeviceImageId, R.id.ivIconDevice);
-        setThingsAddPolling();
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        switch (view.getId()) {
-            case R.id.llBtn1:
-                sendWsDeviceCommand();
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void resultCustomDialogResponse(int msgId, int btnResult) {
-
-        switch (msgId) {
-
-            case Constants.MSG998:
-                mUtil.callApp_Start(mActivity, "LOGOUT");
-                break;
-            case Constants.MSG997:
-                mUtil.callApp_Start(mActivity, "HOME_RELOAD");
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode == mActivity.RESULT_OK) {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_ADD_3RD:
-                    mActivity.setResult(RESULT_OK, data);
-                    finish();
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mActivity.setResult(RESULT_CANCELED, mIntent);
-        finish();
-        return;
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-
-        Dlog.v("onResume()");
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    ;
-
-    public void recevicedWebSocket(Intent intentReceived) {
-
-        int receivedState = intentReceived.getIntExtra(EXTRA_RESULT_STATE, WebSocketService.WEBSOCKET_RECEIVED_SUCESS);
-        if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_SUCESS) {
-            try {
-                String result = intentReceived.getStringExtra(Constants.EXTRA_RESULT);
-                Dlog.v(result);
-                JSONObject jsonObject = new JSONObject(result);
-                String messageType = mUtil.null2string(jsonObject.get(Constants.KEY_MESSAGE_TYPE));
-                LogUtil.i(TAG, "websocket message mType : " + messageType);
-
-                if (messageType.equals(Constants.WEBSOCKET_TYPE_NODE_REGISTER_RESULT)) {
-                    notificationWsNodeRegisterResult(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND)) {
-                    resultWsDeviceCommand(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND_RESULT)) {
-                    notificationWsDeviceCommandResult(jsonObject);
-                } else {
-                    // TODO: 2016-11-25 : 처리 방법?
-                }
-            } catch (JSONException ex) {
-                ex.printStackTrace();
-            }
-        } else if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_ERROR) {
-
-            int errorCode = intentReceived.getIntExtra(EXTRA_ERROR_CODE, WebSocketService.WEBSOCKET_CONNECT_TIMEOUT);
-            switch (errorCode) {
-
-            }
-        }
-    }
-
-    /**
-     * 노드 추가 60초 타이머 스케줄러.
-     */
-    private void setThingsAddPolling() {
-
-        mTotal = 0;
-        Dlog.v("Things setThingsPolling");
-        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-
-        mIsPollingPause = false;
-        mIsPollingCancel = false;
-        mScheduledFuture = scheduler.scheduleAtFixedRate(runnable, 1, 1, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 서비스 허브에서 노드 추가 결과를 푸쉬받는다.
-     *
-     * @param jsonObject 결과 json object
-     */
-    private void notificationWsNodeRegisterResult(JSONObject jsonObject) {
-        try {
-            mUtil.setPreferences(mActivity, Constants.EXTRA_THINGS_ADD_REMOVE_TIME, "");
-            mIntent = new Intent(mActivity, ThingsDeviceAdd3rd.class);
-            mUtil.callActivityForResult(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_ADD_3RD);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 페어링 중지)를 요청한다.
-     */
-    private void sendWsDeviceCommand() {
-        HashMap<String, Object> sendParams = new HashMap<>();
-        sendParams.put(Constants.KEY_MESSAGE_TYPE, Constants.WEBSOCKET_TYPE_DEVICE_COMMAND);
-        sendParams.put(Constants.KEY_DEVICE_ID, mDeviceId);
-        sendParams.put(Constants.KEY_COMMAND_TYPE, Constants.WEBSOCKET_COMM_TYPE_PAIRING_STOP);
-        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getSelectServicehubRequestId());
-
-        getWebSocketService().send(Constants.WEBSOCKET_SEND_DEVICE_COMMAND, sendParams);
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 페어링 중지) 요청 결과.
-     *
-     * @param jsonResult 결과 json object
-     *
-     * @exception JSONException json parsing exception
-     */
-    private void resultWsDeviceCommand(JSONObject jsonResult) throws JSONException {
-        if ("00".equals(jsonResult.get(Constants.KEY_RESULT_CODE))) {
-            mCommandId = jsonResult.getString(Constants.KEY_COMMAND_ID);
-        }
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 페어링 중지) 결과를 푸쉬받는다.
-     *
-     * @param jsonResult 결과 json object
-     *
-     * @exception JSONException json parsing exception
-     */
-    private void notificationWsDeviceCommandResult(JSONObject jsonResult) throws JSONException {
-        try {
-            if (jsonResult.get(Constants.KEY_COMMAND_ID).equals(mCommandId)) {
-                if (jsonResult.get(Constants.KEY_COMMAND_STATUS).equals("SUCCESS")) {
-                    onBackPressed();
-                } else {
-                    Dlog.v(jsonResult.toString());
-                    String resultCode = mUtil.null2string(jsonResult.get(Constants.KEY_RESULT_CODE));
-                    String resultMsg = mUtil.null2string(jsonResult.get(Constants.KEY_RESULT_MSG));
-
-                    if ("401".equals(resultCode)) {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG998, resultMsg);
-                    } else if ("401-106".equals(resultCode)) {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG997, resultMsg);
-                    } else {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG000, resultMsg);
-                    }
-                }
-            } else {
-                // TODO: 2016-11-25 : 처리 정책?
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        try {
-            mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceAdd3rd.java

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.widget.CustomActivity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceAdd3rd
- * 2. FileName  :   ThingsDeviceAdd3rd.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceAdd3rd extends CustomActivity implements View.OnClickListener {
-
-    /*공통*/
-    private Activity mActivity;
-    private Intent mIntent;
-    private Util mUtil = new Util();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceAdd3rd.this;
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_add_step3, null);
-        this.setContentView(viewToLoad);
-
-        setDisp();
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        switch (view.getId()) {
-            case R.id.llBtn1:
-                onBackPressed();
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mIntent.putExtra(Constants.EXTRA_RELOAD_FLAG, true);
-        mActivity.setResult(RESULT_OK, mIntent);
-        finish();
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDel1st.java

@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.AppConfig;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Dlog;
-import com.ntels.onecable.common.util.LogUtil;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.websocket.WebSocketService;
-import com.ntels.onecable.common.widget.CustomActivity;
-import com.ntels.onecable.view.dialog.CustomDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Toast;
-
-import java.util.HashMap;
-
-import static com.ntels.onecable.common.Constants.EXTRA_ERROR_CODE;
-import static com.ntels.onecable.common.Constants.EXTRA_RESULT_STATE;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceDel1st
- * 2. FileName  :   ThingsDeviceDel1st.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickListener, CustomDialog.OnMsgAlterToResult {
-
-    private static final String TAG = ThingsDeviceDel1st.class.getSimpleName();
-    private static final int MSG_COM_WS_NODE_COMMAND = 1;
-    Handler comHandler = new Handler(new IncomingHandlerCallBack());
-    /*통신 관련*/
-    private int mType = 0;
-    /*공통*/
-    private Activity mActivity;
-    private AppConfig mAppConfig;
-    private Intent mIntent;
-    private Util mUtil = new Util();
-    private CustomDialog mCustomDialog = new CustomDialog();
-    private String mDeviceName = "";
-    private String mCompanyName = "";
-    private String mDeviceDesc = "";
-    private String mDeviceDesc1 = "";
-    private int mDeviceImageId = 0;
-    private int mDeviceImageId1 = 0;
-    private String mDeviceId = "";
-    private String mNodeId = "";
-    //    private WebSocketService mWebSocketService;
-    private boolean mIsBound = false;
-
-
-    public void recevicedWebSocket(Intent intentReceived) {
-
-        int receivedState = intentReceived.getIntExtra(EXTRA_RESULT_STATE, WebSocketService.WEBSOCKET_RECEIVED_SUCESS);
-        if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_SUCESS) {
-            try {
-                String result = intentReceived.getStringExtra(Constants.EXTRA_RESULT);
-                Dlog.v(result);
-                JSONObject jsonObject = new JSONObject(result);
-                String messageType = mUtil.null2string(jsonObject.get(Constants.KEY_MESSAGE_TYPE));
-                LogUtil.i(TAG, "websocket message mType : " + messageType);
-
-                if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND_RESULT)) {
-                    notificationWsDeviceCommandResult(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND)) {
-                    resultWsDeviceCommandResult(jsonObject);
-                } else {
-                    // TODO: 2016-11-25 : 처리 방법?
-                }
-            } catch (JSONException ex) {
-                ex.printStackTrace();
-            }
-        } else if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_ERROR) {
-
-            int errorCode = intentReceived.getIntExtra(EXTRA_ERROR_CODE, WebSocketService.WEBSOCKET_CONNECT_TIMEOUT);
-            switch (errorCode) {
-
-            }
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-    }
-
-    ;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceDel1st.this;
-        mAppConfig = (AppConfig) mActivity.getApplicationContext();
-        mCustomDialog.setOnMsgAlterToResultEvent(this);
-
-        setIsWebSocket(true);
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_del_01, null);
-        this.setContentView(viewToLoad);
-
-        Intent intent = getIntent();
-        mDeviceName = intent.getStringExtra(Constants.EXTRA_DEVICE_NAME);
-        mCompanyName = intent.getStringExtra(Constants.EXTRA_COMPANY_NAME);
-        mDeviceDesc = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC);
-        mDeviceDesc1 = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC1);
-        mDeviceImageId = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE, 0);
-        mDeviceImageId1 = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE1, 0);
-        mDeviceId = intent.getStringExtra(Constants.EXTRA_DEVICE_ID);
-        mNodeId = intent.getStringExtra(Constants.EXTRA_NODE_ID);
-
-        setDisp();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-
-        super.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        switch (view.getId()) {
-            case R.id.llBtn2:
-                onBackPressed();
-                break;
-            case R.id.llBtn1:
-                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState().equals("ON")) {
-                    mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
-                    mUtil.getView(mActivity, R.id.btnReStart).setEnabled(false);
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND), Constants.HANDLER_DELAY_MILLIS);
-                } else {
-                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
-                    return;
-                }
-                break;
-            case R.id.btnReStart:
-                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState().equals("ON")) {
-                    mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
-                    mUtil.getView(mActivity, R.id.btnReStart).setEnabled(false);
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND), Constants.HANDLER_DELAY_MILLIS);
-                } else {
-                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
-                    return;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void resultCustomDialogResponse(int msgId, int btnResult) {
-
-        switch (msgId) {
-            case Constants.MSG998:
-                mUtil.callApp_Start(mActivity, "LOGOUT");
-                break;
-            case Constants.MSG997:
-                mUtil.callApp_Start(mActivity, "HOME_RELOAD");
-                break;
-            case Constants.MSG807:
-                if (btnResult == 1) {
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(mType), Constants.HANDLER_DELAY_MILLIS);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mActivity.setResult(RESULT_CANCELED, mIntent);
-        finish();
-        return;
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-
-    }
-
-    @Override
-    protected void onDestroy() {
-
-        super.onDestroy();
-        Dlog.v("onDestroy()");
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode == mActivity.RESULT_OK) {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_DEL_02:
-                    mActivity.setResult(RESULT_OK, data);
-                    finish();
-                    break;
-                default:
-                    break;
-            }
-        } else {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_DEL_02:
-                    Boolean isFlowEnd = data.getBooleanExtra(Constants.EXTRA_FLOW_END_FLAG, false);
-                    Boolean isTimeout = data.getBooleanExtra(Constants.EXTRA_TIMEOUT_FLAG, false);
-                    if (isFlowEnd) {
-                        mActivity.setResult(RESULT_CANCELED, data);
-                        finish();
-                    } else {
-                        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-                        if (isTimeout) {
-                            mUtil.getView(mActivity, R.id.llBtn1).setVisibility(View.GONE);
-                            mUtil.getView(mActivity, R.id.llStart).setVisibility(View.GONE);
-                            mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.VISIBLE);
-                        } else {
-                            mUtil.getView(mActivity, R.id.llBtn1).setVisibility(View.VISIBLE);
-                            mUtil.getView(mActivity, R.id.llStart).setVisibility(View.VISIBLE);
-                            mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.GONE);
-                        }
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-        mUtil.getView(mActivity, R.id.llStart).setVisibility(View.VISIBLE);
-        mUtil.getView(mActivity, R.id.llReStart).setVisibility(View.GONE);
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llBtn2).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.btnReStart).setOnClickListener(this);
-
-        mUtil.getTextView(mActivity, R.id.tvDeviceName).setText(mDeviceName);
-        mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setText(mDeviceDesc);
-        mUtil.setImage(mActivity, mDeviceImageId, R.id.ivIconDevice);
-    }
-
-    /**
-     * 서비스 허브에 디바이스제어(노드 언페어링)를 요청한다.
-     */
-    private void sendWsDeviceCommand() {
-        HashMap<String, Object> sendParams = new HashMap<>();
-        sendParams.put(Constants.KEY_MESSAGE_TYPE, Constants.WEBSOCKET_TYPE_DEVICE_COMMAND);
-        sendParams.put(Constants.KEY_DEVICE_ID, mDeviceId);
-        sendParams.put(Constants.KEY_COMMAND_TYPE, Constants.WEBSOCKET_COMM_TYPE_UNPAIRING_START);
-        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getSelectServicehubRequestId());
-
-        getWebSocketService().send(Constants.WEBSOCKET_SEND_DEVICE_COMMAND, sendParams);
-    }
-
-    /**
-     * 서비스허브에 디바이스 제어(노드 언페어링) 요청 결과.
-     *
-     * @param jsonResult : 결과 json object
-     */
-    private void resultWsDeviceCommandResult(JSONObject jsonResult) {
-        try {
-            if (!jsonResult.get(Constants.KEY_RESULT_CODE).equals("00")) {
-                LogUtil.i(TAG, jsonResult.getString(Constants.KEY_RESULT_MSG));
-                mCustomDialog.msgAlert(mActivity, Constants.MSG836);
-                mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-                mUtil.getView(mActivity, R.id.btnReStart).setEnabled(true);
-            }
-        } catch (JSONException ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 언페어링) 결과를 푸쉬받는다.
-     *
-     * @param jsonResult 결과 json object
-     *
-     * @exception JSONException json parsing exception
-     */
-    private void notificationWsDeviceCommandResult(JSONObject jsonResult) throws JSONException {
-        try {
-            if (jsonResult.get(Constants.KEY_COMMAND_STATUS).equals("SUCCESS")) {
-                mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.INVISIBLE);
-                mIntent = new Intent(mActivity, ThingsDeviceDel2nd.class);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_NAME, mDeviceName);
-                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mCompanyName);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mDeviceDesc1);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, mDeviceImageId1);
-                String commandId = mUtil.null2string(jsonResult.get(Constants.KEY_COMMAND_ID));
-                mIntent.putExtra(Constants.EXTRA_COMMAND_ID, commandId);
-                mIntent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mIntent.putExtra(Constants.EXTRA_NODE_ID, mNodeId);
-                mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_02);
-            } else {
-                Dlog.v(jsonResult.toString());
-                String resultCode = mUtil.null2string(jsonResult.get(Constants.KEY_RESULT_CODE));
-                String resultMsg = mUtil.null2string(jsonResult.get(Constants.KEY_RESULT_MSG));
-
-                if ("401".equals(resultCode)) {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG998, resultMsg);
-                } else if ("401-106".equals(resultCode)) {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG997, resultMsg);
-                } else {
-                    mCustomDialog.msgAlert(mActivity, Constants.MSG000, resultMsg);
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-        try {
-            mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-            mUtil.getView(mActivity, R.id.btnReStart).setEnabled(true);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * 서버 요청 핸들러.
-     */
-    class IncomingHandlerCallBack implements Handler.Callback {
-
-        @Override
-        public boolean handleMessage(Message msg) {
-
-            mType = msg.what;
-            switch (msg.what) {
-                case MSG_COM_WS_NODE_COMMAND:
-                    sendWsDeviceCommand();
-                    break;
-
-                default:
-                    break;
-            }
-            return true;
-        }
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDel2nd.java

@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.AppConfig;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Dlog;
-import com.ntels.onecable.common.util.LogUtil;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.websocket.WebSocketService;
-import com.ntels.onecable.common.widget.CustomActivity;
-import com.ntels.onecable.view.dialog.CustomDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import java.util.HashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import static com.ntels.onecable.common.Constants.EXTRA_ERROR_CODE;
-import static com.ntels.onecable.common.Constants.EXTRA_RESULT_STATE;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceDel2nd
- * 2. FileName  :   ThingsDeviceDel2nd.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceDel2nd extends CustomActivity implements View.OnClickListener,
-        CustomDialog.OnMsgAlterToResult {
-
-    private static final String TAG = ThingsDeviceDel2nd.class.getSimpleName();
-    private static final int MSG_COM_WS_DEVICE_COMMAND = 1;
-    private static final int CONNECT_MAX_TIME_SEC = 60;
-    Handler comHandler = new Handler(new IncomingHandlerCallBack());
-    /*통신 관련*/
-    private int mType = 0;
-    /*공통*/
-    private Activity mActivity;
-    private AppConfig mAppConfig;
-    private Intent mIntent;
-    private ScheduledFuture mScheduledFuture;
-    private Util mUtil = new Util();
-    private CustomDialog mCustomDialog = new CustomDialog();
-    private String mDeviceDesc1 = "";
-    private int mDeviceImageId1 = 0;
-    private String mDeviceId = "";
-    private String mCommandId = "";
-    private Boolean mIsEnd = false;
-    private Boolean mIsPollingPause = false;
-    private Boolean mIsPollingCancel = false;
-    private int mMaxTime = CONNECT_MAX_TIME_SEC;
-    private int mTotal = 0;
-    Runnable runnable = new Runnable() {
-        public void run() {
-
-            Dlog.v("Things mIsPollingCancel", mIsPollingCancel);
-            Dlog.v("Things mIsPollingPause", mIsPollingPause);
-            if (mIsPollingCancel) {
-                mScheduledFuture.cancel(false);
-            }
-            if (!mIsPollingPause) {
-                //                Dlog.v("Things mTotal", mTotal + "");
-                mTotal++;
-                mUtil.getTextView(mActivity, R.id.tvConnectTime).post(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        mUtil.getTextView(mActivity, R.id.tvConnectTime).setText((mMaxTime - mTotal) + "");
-                    }
-                });
-                //                Dlog.v("Things iTotal2", mTotal + "");
-                if (mTotal >= mMaxTime) {
-                    if (!mIsEnd) {
-                        mIsEnd = true;
-                        mUtil.getTextView(mActivity, R.id.tvConnectTime).post(new Runnable() {
-                            @Override
-                            public void run() {
-
-                                mUtil.getTextView(mActivity, R.id.tvConnectTime).setText("");
-                                mIntent = new Intent();
-                                mIntent.putExtra(Constants.EXTRA_TIMEOUT_FLAG, true);
-                                mActivity.setResult(RESULT_CANCELED, mIntent);
-                                finish();
-                            }
-                        });
-                        mScheduledFuture.cancel(false);
-                    }
-                }
-            }
-        }
-    };
-    //    private WebSocketService mWebSocketService;
-    private boolean mIsBound = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceDel2nd.this;
-        mAppConfig = (AppConfig) mActivity.getApplicationContext();
-        mCustomDialog.setOnMsgAlterToResultEvent(this);
-
-        setIsWebSocket(true);
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_del_02, null);
-        this.setContentView(viewToLoad);
-
-        Intent intent = getIntent();
-        mDeviceDesc1 = intent.getStringExtra(Constants.EXTRA_DEVICE_DESC1);
-        mDeviceImageId1 = intent.getIntExtra(Constants.EXTRA_DEVICE_IMAGE1, 0);
-        mCommandId = intent.getStringExtra(Constants.EXTRA_COMMAND_ID);
-        mDeviceId = intent.getStringExtra(Constants.EXTRA_DEVICE_ID);
-
-        setDisp();
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mActivity.setResult(RESULT_CANCELED, mIntent);
-        finish();
-        return;
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-
-        Dlog.v("onResume()");
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode == mActivity.RESULT_OK) {
-            switch (requestCode) {
-                case Constants.ACT_THINGS_DEVICE_DEL_3RD:
-                    mActivity.setResult(RESULT_OK, data);
-                    finish();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onDestroy() {
-
-        super.onDestroy();
-        Dlog.v("onDestroy()");
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        switch (view.getId()) {
-            case R.id.llBtn1:
-                sendWsDeviceCommand();
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void resultCustomDialogResponse(int msgId, int btnResult) {
-
-        switch (msgId) {
-
-            case Constants.MSG998:
-                mUtil.callApp_Start(mActivity, "LOGOUT");
-                break;
-            case Constants.MSG997:
-                mUtil.callApp_Start(mActivity, "HOME_RELOAD");
-                break;
-            case Constants.MSG807:
-                if (btnResult == 1) {
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(mType), Constants.HANDLER_DELAY_MILLIS);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void recevicedWebSocket(Intent intentReceived) {
-
-        int receivedState = intentReceived.getIntExtra(EXTRA_RESULT_STATE, WebSocketService.WEBSOCKET_RECEIVED_SUCESS);
-        if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_SUCESS) {
-            try {
-                String result = intentReceived.getStringExtra(Constants.EXTRA_RESULT);
-                Dlog.v(result);
-                JSONObject jsonObject = new JSONObject(result);
-                String messageType =
-                        mUtil.null2string(jsonObject.get(Constants.KEY_MESSAGE_TYPE));
-                LogUtil.i(TAG, "websocket message mType : " + messageType);
-
-                if (messageType.equals(Constants.WEBSOCKET_TYPE_NODE_DELETE_RESULT)) {
-                    notificationWsNodeDeleteResult(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND)) {
-                    resultWsDeviceCommand(jsonObject);
-                } else if (messageType.equals(Constants.WEBSOCKET_TYPE_DEVICE_COMMAND_RESULT)) {
-                    notificationWsDeviceCommandResult(jsonObject);
-                } else {
-                    // TODO: 2016-11-25 : 처리 방법?
-                }
-            } catch (JSONException ex) {
-                ex.printStackTrace();
-            }
-        } else if (receivedState == WebSocketService.WEBSOCKET_RECEIVED_ERROR) {
-
-            int errorCode = intentReceived.getIntExtra(EXTRA_ERROR_CODE, WebSocketService.WEBSOCKET_CONNECT_TIMEOUT);
-            switch (errorCode) {
-
-            }
-        }
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-        mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setText(mDeviceDesc1);
-        mUtil.setImage(mActivity, mDeviceImageId1, R.id.ivIconDevice);
-        setThingsAddPolling();
-    }
-
-    /**
-     * 노드 삭제 60초 타이머 스케줄러.
-     */
-    private void setThingsAddPolling() {
-
-        mTotal = 0;
-        Dlog.v("Things setThingsPolling");
-        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-
-        mIsPollingPause = false;
-        mIsPollingCancel = false;
-        mScheduledFuture = scheduler.scheduleAtFixedRate(runnable, 1, 1, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 서비스 허브에 디바이스제어(노드 언페어링 중지)를 요청한다.
-     */
-    private void sendWsDeviceCommand() {
-        HashMap<String, Object> sendParams = new HashMap<>();
-        sendParams.put(Constants.KEY_MESSAGE_TYPE, Constants.WEBSOCKET_TYPE_DEVICE_COMMAND);
-        sendParams.put(Constants.KEY_DEVICE_ID, mDeviceId);
-        sendParams.put(Constants.KEY_COMMAND_TYPE, Constants.WEBSOCKET_COMM_TYPE_PAIRING_STOP);
-        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getSelectServicehubRequestId());
-
-        getWebSocketService().send(Constants.WEBSOCKET_SEND_DEVICE_COMMAND, sendParams);
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 언페어링 중지) 요청 결과.
-     *
-     * @param jsonResult 결과 json object
-     *
-     * @exception JSONException json parsing exception
-     */
-    private void resultWsDeviceCommand(JSONObject jsonResult) throws JSONException {
-        if (jsonResult.get(Constants.KEY_RESULT_CODE).equals("00")) {
-            mCommandId = jsonResult.getString(Constants.KEY_COMMAND_ID);
-        }
-    }
-
-    /**
-     * 서비스 허브에 디바이스 제어(노드 언페어링 중지) 결과를 푸쉬받는다.
-     *
-     * @param joResult : 결과 json object
-     *
-     * @exception JSONException : json parsing exception
-     */
-    private void notificationWsDeviceCommandResult(JSONObject joResult) throws JSONException {
-        try {
-            if (joResult.get(Constants.KEY_COMMAND_ID).equals(mCommandId)) {
-                if (joResult.get(Constants.KEY_COMMAND_STATUS).equals("SUCCESS")) {
-                    onBackPressed();
-                } else {
-                    Dlog.v(joResult.toString());
-                    String resultCode = mUtil.null2string(joResult.get(Constants.KEY_RESULT_CODE));
-                    String resultMsg = mUtil.null2string(joResult.get(Constants.KEY_RESULT_MSG));
-
-                    if ("401".equals(resultCode)) {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG998, resultMsg);
-                    } else if ("401-106".equals(resultCode)) {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG997, resultMsg);
-                    } else {
-                        mCustomDialog.msgAlert(mActivity, Constants.MSG000, resultMsg);
-                    }
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-        try {
-            mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
-            mUtil.getView(mActivity, R.id.btnReStart).setEnabled(true);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * 서비스 허브에서 노드 삭제 결과를 푸쉬받는다.
-     *
-     * @param jsonObject 결과 json object
-     */
-    private void notificationWsNodeDeleteResult(JSONObject jsonObject) {
-        try {
-            if (jsonObject.get(Constants.KEY_DEVICE_ID).equals(mDeviceId)) {
-                mUtil.setPreferences(mActivity, Constants.EXTRA_THINGS_ADD_REMOVE_TIME, "");
-                mIntent = new Intent(mActivity, ThingsDeviceDel3rd.class);
-                mUtil.callActivityForResult(mActivity, mIntent,
-                        Constants.ACT_THINGS_DEVICE_DEL_3RD);
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-    }
-
-    /**
-     * 서버 요청 핸들러.
-     */
-    class IncomingHandlerCallBack implements Handler.Callback {
-
-        @Override
-        public boolean handleMessage(Message msg) {
-
-            mType = msg.what;
-            switch (msg.what) {
-                case MSG_COM_WS_DEVICE_COMMAND:
-                    sendWsDeviceCommand();
-                    break;
-
-                default:
-                    break;
-            }
-            return true;
-        }
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDel3rd.java

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2015. Ncomz. All Rights Reserved
- */
-
-package com.ntels.onecable.view.things;
-
-import com.ntels.onecable.R;
-import com.ntels.onecable.common.Constants;
-import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.widget.CustomActivity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-/**
- * <pre>
- * 1. ClassName :   ThingsDeviceDel3rd
- * 2. FileName  :   ThingsDeviceDel3rd.java
- * 3. Package   :   com.ntels.onecable.view.things
- * 4. Date      :   2016-11-25
- * 5. Author    :   aaron
- * 6. Comment   :   Initialize
- * </pre>
- */
-public class ThingsDeviceDel3rd extends CustomActivity implements View.OnClickListener {
-
-
-    /*공통*/
-    private Activity mActivity;
-    private Intent mIntent;
-    private Util mUtil = new Util();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        mActivity = ThingsDeviceDel3rd.this;
-
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_del_03,
-                null);
-        this.setContentView(viewToLoad);
-
-        setDisp();
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        switch (view.getId()) {
-            case R.id.llBtn1:
-                onBackPressed();
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        mIntent = new Intent();
-        mIntent.putExtra(Constants.EXTRA_RELOAD_FLAG, true);
-        mActivity.setResult(RESULT_OK, mIntent);
-        finish();
-        return;
-    }
-
-    /**
-     * UI display.
-     */
-    private void setDisp() {
-
-        mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
-
-    }
-
-}
-

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDelStep1.java

@@ -489,11 +489,12 @@ public class ThingsDeviceDelStep1 extends CustomActivity implements View.OnClick
                 mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, mDeviceImageId1);
                 mIntent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
                 mIntent.putExtra(Constants.EXTRA_NODE_ID, mNodeId);
-                if (jsonObject.get(Constants.KEY_DEL_YN).equals("Y")) {
-                    mIntent.putExtra(Constants.EXTRA_RESULT, true);
-                } else {
-                    mIntent.putExtra(Constants.EXTRA_RESULT, false);
-                }
+                mIntent.putExtra(Constants.EXTRA_RESULT, true);
+//                if (jsonObject.get(Constants.KEY_DEL_YN).equals("Y")) {
+//                    mIntent.putExtra(Constants.EXTRA_RESULT, true);
+//                } else {
+//                    mIntent.putExtra(Constants.EXTRA_RESULT, false);
+//                }
                 mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_STEP2);
             }
         } catch (Exception ex) {