Merge remote-tracking branch 'origin/master'

onecable/src/main/java/com/ntels/onecable/common/handler/CallWithDelayHandler.java

@@ -2,6 +2,7 @@ package com.ntels.onecable.common.handler;
 
 import com.ntels.onecable.R;
 import com.ntels.onecable.common.Constants;
+import com.ntels.onecable.common.util.Dlog;
 import com.ntels.onecable.common.util.Util;
 
 import android.app.Activity;
@@ -78,13 +79,13 @@ public class CallWithDelayHandler {
     }
 
     public void callWithDelayMethod(final String isMethodName, final Boolean equalValue, final String callMethodName, final int delayTime) {
-        new Handler().postDelayed(new Runnable() {
-
-            @Override
+        final Handler handler = new Handler();
+        final Runnable runnable = new Runnable() {
             public void run() {
                 try {
                     Boolean isProc = false;
 
+                    Dlog.v("isMethodName = " + isMethodName);
                     if (!isMethodName.equals("")) {
                         Method isMethod;
                         try {
@@ -95,12 +96,14 @@ public class CallWithDelayHandler {
                         }
 
                         Object returnValue = isMethod.invoke(mActivity);
+                        Dlog.v("returnValue = " + returnValue);
                         if (returnValue == equalValue) {
                             isProc = true;
                         }
                     } else {
                         isProc = true;
                     }
+                    Dlog.v("callMethodName = " + callMethodName);
                     if (isProc) {
                         if (callMethodName.equals("finish")) {
                             mActivity.finish();
@@ -115,9 +118,10 @@ public class CallWithDelayHandler {
                             method.invoke(mActivity);
                         }
                     } else {
-                        callWithDelayMethod(isMethodName, equalValue, callMethodName, delayTime);
+                        if (!mActivity.isFinishing()) {
+                            callWithDelayMethod(isMethodName, equalValue, callMethodName, delayTime);
+                        }
                     }
-
                 } catch (NoSuchMethodException e) {
                     e.printStackTrace();
                 } catch (InvocationTargetException e) {
@@ -126,7 +130,8 @@ public class CallWithDelayHandler {
                     e.printStackTrace();
                 }
             }
-        }, delayTime);
+        };
+        handler.postDelayed(runnable, delayTime);
     }
 
     public void callFinishWithDelayField(String isFieldName) {
@@ -169,9 +174,8 @@ public class CallWithDelayHandler {
     }
 
     public void callWithDelayField(final String isFieldName, final Boolean equalValue, final String callMethodName, final int delayTime) {
-        new Handler().postDelayed(new Runnable() {
-
-            @Override
+        final Handler handler = new Handler();
+        final Runnable runnable = new Runnable() {
             public void run() {
                 try {
                     Boolean isProc = false;
@@ -185,6 +189,7 @@ public class CallWithDelayHandler {
                     }
 
                     Object returnValue = isField.get(mActivity);
+                    Dlog.v("returnValue = " + returnValue);
                     if (returnValue == equalValue) {
                         isProc = true;
                     }
@@ -202,9 +207,14 @@ public class CallWithDelayHandler {
                             method.invoke(mActivity);
                         }
                     } else {
-                        callWithDelayField(isFieldName, equalValue, callMethodName, delayTime);
+//                        ActivityManager.RunningTaskInfo running = info.get(0);
+//                        ComponentName componentName = running.topActivity;
+//                        return cls.getName().equals(componentName.getClassName());
+//
+                        if (!mActivity.isFinishing()) {
+                            callWithDelayField(isFieldName, equalValue, callMethodName, delayTime);
+                        }
                     }
-
                 } catch (NoSuchFieldException e) {
                     e.printStackTrace();
                 } catch (NoSuchMethodException e) {
@@ -215,7 +225,8 @@ public class CallWithDelayHandler {
                     e.printStackTrace();
                 }
             }
-        }, delayTime);
+        };
+        handler.postDelayed(runnable, delayTime);
     }
 
     private boolean doesReturnVoid(Method method) {

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

@@ -190,6 +190,7 @@ public class WebSocketService extends Service {
                 Log.i("Websocket", "Closed " + s);
                 LogUtil.i(TAG, "Websocket closed!!");
                 if (!bFromUser) {
+                    LogUtil.i(TAG, "Websocket closed!!1");
                     webSocketConnect();
                 }
                 bFromUser = false;

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

@@ -368,6 +368,7 @@ public class Main extends CustomActionBarActivity implements View.OnClickListene
         Dlog.v("onDestroy()");
 
         if (mIsBound) {
+            Dlog.v("onDestroy()11");
             mWebSocketService.removeWebSocketResponse(webSocketResponse);
             mWebSocketService.webSocketClose();
             mActivity.unbindService(serviceConnection);

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

@@ -81,19 +81,19 @@ public class FragmentThings extends Fragment implements View.OnClickListener
     /**
      * The Com handler.
      */
-    Handler comHandler = new Handler(new IncomingHandlerCallBack());
+    Handler mComHandler = new Handler(new IncomingHandlerCallBack());
     /*툴바 관련*/
     private Toolbar toolbar;
     /*통신 관련*/
-    private ArrayList<HashMap<String, Object>> alTotalList = new ArrayList<HashMap<String, Object>>();
+    private ArrayList<HashMap<String, Object>> mAlTotalList = new ArrayList<HashMap<String, Object>>();
     private int mType = 0;
-    private WebSocketService webSocketService;
+    private WebSocketService mWebSocketService;
     private boolean mIsBound = false;
     /*리스트 관련*/
-    private FragmentThingsAdapter dataAdapter;
-    private RecyclerView rcvList;
-    private SwipeRefreshLayout swipeRefreshLayout;
-    private GridLayoutManager glmList;
+    private FragmentThingsAdapter mDataAdapter;
+    private RecyclerView mRcvList;
+    private SwipeRefreshLayout mSwipeRefreshLayout;
+    private GridLayoutManager mGlmList;
     private LinearLayoutManager llmList;
     private DialogCustomList.Builder dialogListBuilder;
     private boolean mIsListEdit = false;
@@ -101,14 +101,13 @@ public class FragmentThings extends Fragment implements View.OnClickListener
     private boolean mIsListHeader = false;
     private boolean mIsListFooter = false;
     private boolean mIsListFooterVisible = false;
-    private int listColumnsCnt = 1;
+    private int mListColumnsCnt = 1;
     /*공통*/
     private Activity mActivity;
     private AppConfig mAppConfig;
-    private MainInterface callback;
-    private Intent intent;
+    private MainInterface mCallback;
+    private Intent mIntent;
     private Util mUtil = new Util();
-    private ItemTouchHelper mItemTouchHelper;
     /**
      * 노드 제어 타임아웃 체크 리스너.
      */
@@ -123,9 +122,9 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             int row = msg.what;
             if (!mLoading) {
                 if (row >= 0) {
-                    Object requestTime = alTotalList.get(row).get(Constants.KEY_REQUEST_TIME);
+                    Object requestTime = mAlTotalList.get(row).get(Constants.KEY_REQUEST_TIME);
                     if (requestTime != null && !requestTime.toString().isEmpty()) {
-                        alTotalList.get(row).put(Constants.KEY_REQUEST_TIME, "");
+                        mAlTotalList.get(row).put(Constants.KEY_REQUEST_TIME, "");
                         setHomeHubStateList();
                         Toast.makeText(mActivity, R.string.MSG917, Toast.LENGTH_SHORT).show();
                     }
@@ -133,6 +132,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             }
         }
     };
+    private ItemTouchHelper mItemTouchHelper;
     private CustomDialog customDialog = new CustomDialog();
     private String callHttpDeviceId = "";
     private String callHttpNodeId = "";
@@ -193,7 +193,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             switch (code) {
                 case Constants.WEBSOCKET_ERROR_TIMEOUT:
                     LogUtil.i(TAG, "WEBSOCKET_ERROR_TIMEOUT!!!");
-                    for (HashMap<String, Object> hm : alTotalList) {
+                    for (HashMap<String, Object> hm : mAlTotalList) {
                         hm.put(Constants.KEY_REQUEST_TIME, "");
                     }
                     break;
@@ -214,8 +214,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
             LogUtil.i(TAG, "onServiceConnected!!");
             WebSocketService.WebSocketBinder binder = (WebSocketService.WebSocketBinder) service;
-            webSocketService = binder.getService();
-            webSocketService.addWebSocketResponse(webSocketResponse);
+            mWebSocketService = binder.getService();
+            mWebSocketService.addWebSocketResponse(webSocketResponse);
             mIsBound = true;
         }
 
@@ -232,7 +232,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         super.onAttach(activity);
 
         try {
-            callback = (MainInterface) activity;
+            mCallback = (MainInterface) activity;
         } catch (ClassCastException ex) {
             throw new ClassCastException(activity.toString() + " must implement MainInterface");
         }
@@ -268,9 +268,9 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         super.onPause();
         Dlog.v("onPause()");
-//        if (webSocketService != null) {
-//            if (webSocketService.isWebSocketConnected()) {
-//                webSocketService.webSocketDisconnect();
+//        if (mWebSocketService != null) {
+//            if (mWebSocketService.isWebSocketConnected()) {
+//                mWebSocketService.webSocketDisconnect();
 //            }
 //        }
     }
@@ -281,9 +281,9 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         super.onResume();
         Dlog.v("onResume()");
 
-//        if (webSocketService != null) {
-//            if (!webSocketService.isWebSocketConnected()) {
-//                webSocketService.webSocketConnect();
+//        if (mWebSocketService != null) {
+//            if (!mWebSocketService.isWebSocketConnected()) {
+//                mWebSocketService.webSocketConnect();
 //            }
 //        }
     }
@@ -295,7 +295,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         Dlog.v("onDestroy()");
 
         if (mIsBound) {
-            webSocketService.removeWebSocketResponse(webSocketResponse);
+            mWebSocketService.removeWebSocketResponse(webSocketResponse);
             getActivity().unbindService(serviceConnection);
             mIsBound = false;
         }
@@ -378,10 +378,10 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                 mUtil.getView(toolbar, R.id.llToolbarMore).setVisibility(View.GONE);
                 mUtil.getView(toolbar, R.id.btnToolbarClose).setVisibility(View.GONE);
                 mUtil.getView(toolbar, R.id.btnToolbarMore).setVisibility(View.VISIBLE);
-                dataAdapter.setListCheck(false);
-                dataAdapter.setDeleteCheck(false);
-                dataAdapter.setMoveCheck(false);
-                dataAdapter.notifyDataSetChanged();
+                mDataAdapter.setListCheck(false);
+                mDataAdapter.setDeleteCheck(false);
+                mDataAdapter.setMoveCheck(false);
+                mDataAdapter.notifyDataSetChanged();
                 mIsListEdit = false;
                 setRefresh(true);
             }
@@ -449,7 +449,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         Boolean isListLoad = false;
 
-        swipeRefreshLayout.setVisibility(View.GONE);
+        mSwipeRefreshLayout.setVisibility(View.GONE);
         mUtil.getView(mActivity, R.id.llNoHub_Master).setVisibility(View.GONE);
         mUtil.getView(mActivity, R.id.llNoHub_Guest).setVisibility(View.GONE);
         mUtil.getView(mActivity, R.id.llNodata_Master).setVisibility(View.GONE);
@@ -464,8 +464,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         if (mAppConfig.getCtrtGroupId().equals("")) {
             //홈그룹 없을경우
             mUtil.getView(mActivity, R.id.llNoHub_Master).setVisibility(View.VISIBLE);
-            dataAdapter.setListCheck(false);
-            dataAdapter.notifyDataSetChanged();
+            mDataAdapter.setListCheck(false);
+            mDataAdapter.notifyDataSetChanged();
             setRefresh(false);
         } else {
             //홈그룹 있을경우
@@ -476,21 +476,21 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                 //홈그룹은 있고 홈허브가 없는경우
                 if (mAppConfig.getSelect_Homegrp_Grade_Code().equals("MAS")) {
                     mUtil.getView(mActivity, R.id.llNoHub_Master).setVisibility(View.VISIBLE);
-                    dataAdapter.setListCheck(false);
-                    dataAdapter.notifyDataSetChanged();
+                    mDataAdapter.setListCheck(false);
+                    mDataAdapter.notifyDataSetChanged();
                     setRefresh(false);
                 } else {
                     mUtil.getView(mActivity, R.id.llNoHub_Guest).setVisibility(View.VISIBLE);
-                    dataAdapter.setListCheck(false);
-                    dataAdapter.notifyDataSetChanged();
+                    mDataAdapter.setListCheck(false);
+                    mDataAdapter.notifyDataSetChanged();
                     setRefresh(false);
                 }
             } else {
-                if (alTotalList.size() > 0) {
-                    swipeRefreshLayout.setVisibility(View.VISIBLE);
+                if (mAlTotalList.size() > 0) {
+                    mSwipeRefreshLayout.setVisibility(View.VISIBLE);
                 } else {
                     if (!mLoading) {
-                        if (!swipeRefreshLayout.isRefreshing()) {
+                        if (!mSwipeRefreshLayout.isRefreshing()) {
                             if (mAppConfig.getSelect_Homegrp_Grade_Code().equals("MAS")) {
                                 mUtil.getView(mActivity, R.id.llNodata_Master).setVisibility(View.VISIBLE);
                                 mUtil.getTextView(mActivity, R.id.tvNodata_Master_Title).setText(R.string.layout_nodata_desc_04);
@@ -500,14 +500,14 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                             }
                         }
                     }
-                    dataAdapter.setListCheck(false);
+                    mDataAdapter.setListCheck(false);
                 }
                 if (mAppConfig.getSelect_Homegrp_Grade_Code().equals("MAS")) {
-                    dataAdapter.setFooterVisible(true);
+                    mDataAdapter.setFooterVisible(true);
                 } else {
-                    dataAdapter.setFooterVisible(false);
+                    mDataAdapter.setFooterVisible(false);
                 }
-                dataAdapter.notifyDataSetChanged();
+                mDataAdapter.notifyDataSetChanged();
                 isListLoad = true;
             }
         }
@@ -526,26 +526,26 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         mUtil.getView(mActivity, R.id.tvWidthdraw).setOnClickListener(this);
         mUtil.getViewUnderline(mActivity, R.id.tvConnect);
 
-        alTotalList.clear();
+        mAlTotalList.clear();
 
-        swipeRefreshLayout = (SwipeRefreshLayout) getView().findViewById(R.id.swiperefreshlayou);
-        swipeRefreshLayout.setColorSchemeResources(android.R.color.holo_red_light,
+        mSwipeRefreshLayout = (SwipeRefreshLayout) getView().findViewById(R.id.swiperefreshlayou);
+        mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_red_light,
                 android.R.color.holo_green_light, android.R.color.holo_blue_bright,
                 android.R.color.holo_orange_light);
-        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
 
             @Override
             public void onRefresh() {
 
-                if (!dataAdapter.getListCheck()) {
+                if (!mDataAdapter.getListCheck()) {
                     if (!mLoading) {
                         onListReload();
-                        if (!webSocketService.isWebSocketConnected()) {
-                            webSocketService.webSocketConnect();
+                        if (!mWebSocketService.isWebSocketConnected()) {
+                            mWebSocketService.webSocketConnect();
                         }
                     }
                 } else {
-                    swipeRefreshLayout.setRefreshing(false);
+                    mSwipeRefreshLayout.setRefreshing(false);
                 }
             }
         });
@@ -553,64 +553,64 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         mIsListFooter = true;
         mIsListFooterVisible = true;
-        dataAdapter = new FragmentThingsAdapter(mActivity, R.layout.row_things_list, R.layout.row_things_list, R.layout
-                .row_footer_things_list,
-                alTotalList, this, this);
-        dataAdapter.setFooterCheck(mIsListFooter);
-        dataAdapter.setFooterVisible(mIsListFooterVisible);
+        mDataAdapter = new FragmentThingsAdapter(mActivity
+                , R.layout.row_things_list, R.layout.row_things_list, R.layout.row_footer_things_list
+                , mAlTotalList, this, this);
+        mDataAdapter.setFooterCheck(mIsListFooter);
+        mDataAdapter.setFooterVisible(mIsListFooterVisible);
 
-        rcvList = (RecyclerView) getView().findViewById(R.id.rcvList);
-        rcvList.setOnTouchListener(new View.OnTouchListener() {
+        mRcvList = (RecyclerView) getView().findViewById(R.id.rcvList);
+        mRcvList.setOnTouchListener(new View.OnTouchListener() {
 
             @Override
             public boolean onTouch(View view, MotionEvent event) {
 
-                LogUtil.i(TAG, "rcvList onTouch!!");
-                if (swipeRefreshLayout.isRefreshing()) {
+                LogUtil.i(TAG, "mRcvList onTouch!!");
+                if (mSwipeRefreshLayout.isRefreshing()) {
                     return true;
                 }
                 return false;
             }
         });
-        rcvList.setHasFixedSize(true);
-        listColumnsCnt = 2;
-        if (listColumnsCnt == 1) {
+        mRcvList.setHasFixedSize(true);
+        mListColumnsCnt = 2;
+        if (mListColumnsCnt == 1) {
             llmList = new LinearLayoutManager(mActivity);
-            rcvList.setLayoutManager(llmList);
+            mRcvList.setLayoutManager(llmList);
         } else {
-            glmList = new GridLayoutManager(mActivity, listColumnsCnt, GridLayoutManager.VERTICAL, false);
-            glmList.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            mGlmList = new GridLayoutManager(mActivity, mListColumnsCnt, GridLayoutManager.VERTICAL, false);
+            mGlmList.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
 
                 @Override
                 public int getSpanSize(int position) {
 
-                    int positionType = dataAdapter.getItemViewType(position);
-                    int totalConut = dataAdapter.getItemCount();
-                    int valueConut = dataAdapter.getItemCount();
+                    int positionType = mDataAdapter.getItemViewType(position);
+                    int totalConut = mDataAdapter.getItemCount();
+                    int valueConut = mDataAdapter.getItemCount();
                     if (mIsListHeader) {
                         valueConut = totalConut - 1;
                     }
 
-                    if (positionType == dataAdapter.TYPE_HEADER) {
-                        return glmList.getSpanCount();
+                    if (positionType == mDataAdapter.TYPE_HEADER) {
+                        return mGlmList.getSpanCount();
                     } else {
-                        return dataAdapter.getItemViewType(position) == 1 ? 1 : (valueConut % listColumnsCnt == 1 ? glmList.getSpanCount
+                        return mDataAdapter.getItemViewType(position) == 1 ? 1 : (valueConut % mListColumnsCnt == 1 ? mGlmList.getSpanCount
                                 () : 1);
                     }
                 }
             });
-            rcvList.setLayoutManager(glmList);
+            mRcvList.setLayoutManager(mGlmList);
         }
-//        rcvList.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.color_line_01));
-        AlphaInAnimationAdapter alphaAdapter = new AlphaInAnimationAdapter(dataAdapter);
+//        mRcvList.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.color_line_01));
+        AlphaInAnimationAdapter alphaAdapter = new AlphaInAnimationAdapter(mDataAdapter);
         alphaAdapter.setDuration(150);
         ScaleInAnimationAdapter scaleAdapter = new ScaleInAnimationAdapter(alphaAdapter);
         scaleAdapter.setDuration(150);
-        rcvList.setAdapter(scaleAdapter);
+        mRcvList.setAdapter(scaleAdapter);
 
-        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(dataAdapter);
+        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(mDataAdapter);
         mItemTouchHelper = new ItemTouchHelper(callback);
-        mItemTouchHelper.attachToRecyclerView(rcvList);
+        mItemTouchHelper.attachToRecyclerView(mRcvList);
         setHomeHubStateTitle();
         if (!mLoading) {
             onListReload();
@@ -618,16 +618,16 @@ public class FragmentThings extends Fragment implements View.OnClickListener
     }
 
     /**
-     * swipeRefreshLayout enable/disable.
+     * mSwipeRefreshLayout enable/disable.
      *
      * @param isRefresh true : enable, false : disable
      */
     private void setRefresh(boolean isRefresh) {
 
         if (isRefresh) {
-            swipeRefreshLayout.setEnabled(true);
+            mSwipeRefreshLayout.setEnabled(true);
         } else {
-            swipeRefreshLayout.setEnabled(false);
+            mSwipeRefreshLayout.setEnabled(false);
         }
     }
 
@@ -636,10 +636,10 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         switch (view.getId()) {
             case R.id.llNoHub_Master:
-                callback.onHomehubStart();
+                mCallback.onHomehubStart();
                 break;
             case R.id.tvWidthdraw:
-                callback.onHomeMemberWidthdraw();
+                mCallback.onHomeMemberWidthdraw();
                 break;
             case R.id.llNodata_Master:
                 thingsDeviceAdd();
@@ -675,9 +675,9 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         sendParams.put(Constants.KEY_CMDCLS_VALUE, callHttpRequestValue);
         sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getiSelect_Servicehub_Request_Id());
 
-        webSocketService.send(Constants.WEBSOCKET_SEND_NODE_COMMAND, sendParams);
+        mWebSocketService.send(Constants.WEBSOCKET_SEND_NODE_COMMAND, sendParams);
         // 제어 요청 10초 후까지 응답이 없으면 타임아웃 처리.
-        alTotalList.get(position).put(Constants.KEY_REQUEST_TIME, mUtil.getUtcTime());
+        mAlTotalList.get(position).put(Constants.KEY_REQUEST_TIME, mUtil.getUtcTime());
         loadingHandler.sendEmptyMessageDelayed(position, 10000);
     }
 
@@ -696,12 +696,12 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             String resultNodeId = mUtil.null2string(joResult.get(Constants.KEY_NODE_ID));
             String resultRequestTime = mUtil.null2string(joResult.get(Constants.KEY_REQUEST_TIME));
             int loadingRow = -1;
-            for (int row = 0; row < alTotalList.size(); row++) {
+            for (int row = 0; row < mAlTotalList.size(); row++) {
 
-                String deviceId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_DEVICE_ID));
-                String nodeId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_NODE_ID));
+                String deviceId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_DEVICE_ID));
+                String nodeId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_NODE_ID));
                 if (resultDeviceId.equals(deviceId) && resultNodeId.equals(nodeId)) {
-                    alTotalList.get(row).put(Constants.KEY_REQUEST_TIME, resultRequestTime);
+                    mAlTotalList.get(row).put(Constants.KEY_REQUEST_TIME, resultRequestTime);
                     loadingRow = row;
                     Dlog.v("Things jino0 =" + resultRequestTime);
                     break;
@@ -731,12 +731,12 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         String resultNodeId = mUtil.null2string(joResult.get(Constants.KEY_NODE_ID));
         String resultRequestTime = mUtil.null2string(joResult.get(Constants.KEY_REQUEST_TIME));
         int loadingRow = -1;
-        for (int row = 0; row < alTotalList.size(); row++) {
+        for (int row = 0; row < mAlTotalList.size(); row++) {
 
-            String deviceId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_DEVICE_ID));
-            String nodeId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_NODE_ID));
+            String deviceId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_DEVICE_ID));
+            String nodeId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_NODE_ID));
             if (resultDeviceId.equals(deviceId) && resultNodeId.equals(nodeId)) {
-                alTotalList.get(row).put(Constants.KEY_REQUEST_TIME, "");
+                mAlTotalList.get(row).put(Constants.KEY_REQUEST_TIME, "");
 
                 Dlog.v("Things jino0 =" + resultRequestTime);
                 loadingRow = row;
@@ -765,19 +765,19 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         HashMap<String, Object> hmContentValue = mUtil.jsonToMap(joResult.get(Constants.KEY_CONTENT_VALUE));
         String resultOnlineState = mUtil.null2string(hmContentValue.get(Constants.KEY_ONLINE));
 
-        for (int row = 0; row < alTotalList.size(); row++) {
-            String currentDeviceId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_DEVICE_ID));
-            String currentNodeId = mUtil.null2string(alTotalList.get(row).get(Constants.KEY_NODE_ID));
-            String contentValue = mUtil.null2string(hmContentValue.get(alTotalList.get(row).get(Constants.KEY_CMDCLS_ID)));
+        for (int row = 0; row < mAlTotalList.size(); row++) {
+            String currentDeviceId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_DEVICE_ID));
+            String currentNodeId = mUtil.null2string(mAlTotalList.get(row).get(Constants.KEY_NODE_ID));
+            String contentValue = mUtil.null2string(hmContentValue.get(mAlTotalList.get(row).get(Constants.KEY_CMDCLS_ID)));
             if (resultDeviceId.equals(currentDeviceId) && resultNodeId.equals(currentNodeId)) {
                 if (!contentValue.isEmpty()) {
-                    alTotalList.get(row).put(Constants.KEY_CONTENT_VALUE, contentValue);
+                    mAlTotalList.get(row).put(Constants.KEY_CONTENT_VALUE, contentValue);
                 }
                 if (!resultOnlineState.isEmpty()) {
-                    alTotalList.get(row).put(Constants.KEY_ONLINE_STATE, resultOnlineState);
+                    mAlTotalList.get(row).put(Constants.KEY_ONLINE_STATE, resultOnlineState);
                 }
-                alTotalList.get(row).put(Constants.KEY_COLLECT_TIME, resultCollectTime);
-                LogUtil.i(TAG, "alTotalList : " + alTotalList.toString());
+                mAlTotalList.get(row).put(Constants.KEY_COLLECT_TIME, resultCollectTime);
+                LogUtil.i(TAG, "mAlTotalList : " + mAlTotalList.toString());
                 break;
             }
         }
@@ -809,7 +809,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         sendParams.put(Constants.KEY_DEVICE_ID, mAppConfig.getSelect_Homegrp_Homehub_Device_Id());
         sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getiSelect_Servicehub_Request_Id());
 
-        webSocketService.send(Constants.WEBSOCKET_SEND_NODE_RELOAD, sendParams);
+        mWebSocketService.send(Constants.WEBSOCKET_SEND_NODE_RELOAD, sendParams);
     }
 
     /**
@@ -837,7 +837,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         sendParams.put(Constants.KEY_NODE_ID, callHttpNodeId);
         sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getiSelect_Servicehub_Request_Id());
 
-        webSocketService.send(Constants.WEBSOCKET_SEND_NODE_DELETE, sendParams);
+        mWebSocketService.send(Constants.WEBSOCKET_SEND_NODE_DELETE, sendParams);
     }
 
     /**
@@ -861,7 +861,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         try {
             HttpSend httpSend;
 
-            httpSend = new HttpSend(mActivity, !swipeRefreshLayout.isRefreshing());
+            httpSend = new HttpSend(mActivity, !mSwipeRefreshLayout.isRefreshing());
 
             httpSend.setOnDataSendToReslutEvent(new OnDataSendToReslut() {
 
@@ -871,8 +871,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                     resultGetDevices(result);
                 }
             });
-            alTotalList.clear();
-            swipeRefreshLayout.setVisibility(View.GONE);
+            mAlTotalList.clear();
+            mSwipeRefreshLayout.setVisibility(View.GONE);
             httpSend.getDevices();
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -889,7 +889,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         mLoading = false;
         try {
             if (result.getStatusCode() == 200) {
-                alTotalList.clear();
+                mAlTotalList.clear();
                 mUtil.getTextView(toolbar, R.id.tvToolbarTitle2).setText("");
 
 //                JSONObject joResult = new JSONObject(result.getContent());
@@ -903,10 +903,10 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                     for (int row = 0; row < alList.size(); row++) {
                         HashMap<String, Object> hmTempDevice = new HashMap<String, Object>();
                         hmTempDevice = alList.get(row);
-                        alTotalList.add(hmTempDevice);
+                        mAlTotalList.add(hmTempDevice);
                     }
                     HashMap<String, Object> hmTemp = new HashMap<String, Object>();
-                    alTotalList.add(hmTemp);
+                    mAlTotalList.add(hmTemp);
                 }
                 setHomeHubStateAll();
             } else {
@@ -927,7 +927,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             ex.printStackTrace();
             customDialog.msgAlert(mActivity, Constants.MSG807);
         } finally {
-            swipeRefreshLayout.setRefreshing(false);
+            mSwipeRefreshLayout.setRefreshing(false);
         }
     }
 
@@ -939,7 +939,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         try {
             HttpSend httpSend;
 
-            httpSend = new HttpSend(mActivity, !swipeRefreshLayout.isRefreshing());
+            httpSend = new HttpSend(mActivity, !mSwipeRefreshLayout.isRefreshing());
 
             httpSend.setOnDataSendToReslutEvent(new OnDataSendToReslut() {
 
@@ -949,7 +949,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                     resultDeleteCloudNode(result);
                 }
             });
-            swipeRefreshLayout.setVisibility(View.GONE);
+            mSwipeRefreshLayout.setVisibility(View.GONE);
             httpSend.D_cloud_devices_device_id_nodes_node_id(callHttpDeviceId, callHttpNodeId, mAppConfig.getCtrtGroupId(), mAppConfig
                     .getLogin_Member_Id());
         } catch (Exception ex) {
@@ -980,8 +980,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
                 LogUtil.i(TAG, "cloud node delete result code : " + resultCode);
                 if (resultCode.equals("00")) {
-                    intent = new Intent(mActivity, ThingsDeviceDel3rd.class);
-                    mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_DEL_3RD);
+                    mIntent = new Intent(mActivity, ThingsDeviceDel3rd.class);
+                    mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_3RD);
                 } else {
                     customDialog.msgAlert(mActivity, Constants.MSG000, "[" + resultCode + "] " + resultMsg);
                     onListReload();
@@ -1000,7 +1000,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             ex.printStackTrace();
             customDialog.msgAlert(mActivity, Constants.MSG807);
         } finally {
-            swipeRefreshLayout.setRefreshing(false);
+            mSwipeRefreshLayout.setRefreshing(false);
         }
     }
 
@@ -1017,7 +1017,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                 break;
             case Constants.MSG807:
                 if (btnResult == 1) {   // ok 선택 시
-                    comHandler.sendMessageDelayed(comHandler.obtainMessage(mType), 10);
+                    mComHandler.sendMessageDelayed(mComHandler.obtainMessage(mType), 10);
                 }
                 break;
             default:
@@ -1055,8 +1055,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                             mUtil.getView(toolbar, R.id.btnToolbarMore).setVisibility(View.GONE);
                             mUtil.getTextView(toolbar, R.id.tvToolbarMoreTitle1).setText(mUtil.getString(mActivity, R.string
                                     .layout_context_menu_03));
-                            dataAdapter.setDeleteCheck(true);
-                            dataAdapter.notifyDataSetChanged();
+                            mDataAdapter.setDeleteCheck(true);
+                            mDataAdapter.notifyDataSetChanged();
                             break;
                         case 4:
                             break;
@@ -1083,7 +1083,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                         case 16:
                             break;
                         case 20:
-                            comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_RELOAD), 10);
+                            mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_WS_NODE_RELOAD), 10);
                             break;
                         case 21:
                             break;
@@ -1096,8 +1096,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener
                             mUtil.getView(toolbar, R.id.btnToolbarMore).setVisibility(View.GONE);
                             mUtil.getTextView(toolbar, R.id.tvToolbarMoreTitle1).setText(mUtil.getString(mActivity, R.string
                                     .layout_context_menu_22));
-                            dataAdapter.setMoveCheck(true);
-                            dataAdapter.notifyDataSetChanged();
+                            mDataAdapter.setMoveCheck(true);
+                            mDataAdapter.notifyDataSetChanged();
                             break;
                         default:
                             break;
@@ -1123,35 +1123,29 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         super.onActivityResult(requestCode, resultCode, data);
         Boolean reloadFlag = false;
+        if (data == null) {
+            return;
+        }
         if (resultCode == mActivity.RESULT_OK) {
             switch (requestCode) {
                 case Constants.ACT_THINGS_DEVICE_DEL_01:
                 case Constants.ACT_THINGS_DEVICE_DEL_3RD:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         mUtil.getView(toolbar, R.id.btnToolbarClose).setVisibility(View.GONE);
                         mUtil.getView(toolbar, R.id.btnToolbarMore).setVisibility(View.VISIBLE);
-                        dataAdapter.setListCheck(false);
+                        mDataAdapter.setListCheck(false);
                         setRefresh(true);
                         onListReload();
                     }
                     break;
                 case Constants.ACT_THINGS_DEVICE_ADD:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         onListReload();
                     }
                     break;
                 case Constants.ACT_THINGS_DETAIL:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         onListReload();
@@ -1165,27 +1159,18 @@ public class FragmentThings extends Fragment implements View.OnClickListener
         } else {
             switch (requestCode) {
                 case Constants.ACT_THINGS_DEVICE_DEL_01:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         onListReload();
                     }
                     break;
                 case Constants.ACT_THINGS_DEVICE_ADD:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         onListReload();
                     }
                     break;
                 case Constants.ACT_THINGS_DETAIL:
-                    if (data == null) {
-                        return;
-                    }
                     reloadFlag = data.getBooleanExtra(Constants.EXTRA_RELOAD_FLAG, false);
                     if (reloadFlag) {
                         onListReload();
@@ -1204,19 +1189,19 @@ public class FragmentThings extends Fragment implements View.OnClickListener
 
         mLoading = true;
         if (setHomeHubStateList()) {
-            comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_G_DEVICES), 10);
+            mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_G_DEVICES), 10);
         }
     }
 
     @Override
     public void onLogout() {
-        //        callback.onLogout();
+        //        mCallback.onLogout();
     }
 
     @Override
     public void onCallAction(int callType, int position) {
         // 디바이스 목록이 없으면 아래 코드 수행하지 않음.
-        if (alTotalList.size() <= 0) {
+        if (mAlTotalList.size() <= 0) {
             return;
         }
 
@@ -1225,150 +1210,155 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             callHttpDeviceId = mAppConfig.getSelect_Homegrp_Homehub_Device_Id();
             thingsDeviceAdd();
         } else if (callType == 1) {
-            String deviceclassTypeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
+            String deviceclassTypeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
             int deviceclassTypeIdNum = mUtil.null2int(deviceclassTypeId);
             mUtil.callBtnGoogleAnalytics(actName, "ViewDetail_Things", deviceclassTypeId);
 
             // 상세보기
             if (deviceclassTypeIdNum == Constants.DEVICECLASS_TYPE_ID_40801) {
-                String[] numbers = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_SN)).split("-");
+                String[] numbers = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_SN)).split("-");
                 String cameraNumber = numbers[0];
                 String userNumber = numbers[1];
-                intent = new Intent(mActivity, ThingsCameraDetail.class);
-                intent.putExtra(Constants.EXTRA_CAMERA_CAMERA_NUMBER, cameraNumber);
-                intent.putExtra(Constants.EXTRA_CAMERA_USER_NUMBER, userNumber);
-                mUtil.callActivity(mActivity, intent);
+                mIntent = new Intent(mActivity, ThingsCameraDetail.class);
+                mIntent.putExtra(Constants.EXTRA_CAMERA_CAMERA_NUMBER, cameraNumber);
+                mIntent.putExtra(Constants.EXTRA_CAMERA_USER_NUMBER, userNumber);
+                mUtil.callActivity(mActivity, mIntent);
             } else if (deviceclassTypeIdNum == Constants.DEVICECLASS_TYPE_ID_40802) {
-                String configuration = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_CONFIGURATION));
+                String configuration = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_CONFIGURATION));
                 HashMap<String, Object> hmConfigurations = mUtil.parseConfiguration(configuration);
                 if (hmConfigurations == null) {
                     // TODO : configuration 없을 시 처리 방법?
                 } else {
-                    intent = new Intent(mActivity, ThingsDeviceNetatmoCameraDetail.class);
-                    intent.putExtra(Constants.EXTRA_REFRESH_TOKEN, mUtil.null2string(hmConfigurations.get(Constants.KEY_REFRESH_TOKEN)));
-                    intent.putExtra(Constants.EXTRA_CAMERA_ID, mUtil.null2string(hmConfigurations.get(Constants.KEY_CAMERA_ID)));
-                    intent.putExtra(Constants.EXTRA_CAMERA_ON_OFF, mUtil.null2string(alTotalList.get(position).get(Constants
+                    mIntent = new Intent(mActivity, ThingsDeviceNetatmoCameraDetail.class);
+                    mIntent.putExtra(Constants.EXTRA_REFRESH_TOKEN, mUtil.null2string(hmConfigurations.get(Constants.KEY_REFRESH_TOKEN)));
+                    mIntent.putExtra(Constants.EXTRA_CAMERA_ID, mUtil.null2string(hmConfigurations.get(Constants.KEY_CAMERA_ID)));
+                    mIntent.putExtra(Constants.EXTRA_CAMERA_ON_OFF, mUtil.null2string(mAlTotalList.get(position).get(Constants
                             .KEY_CONTENT_VALUE)));
-                    intent.putExtra(Constants.EXTRA_ONLNIE_STATE, mUtil.null2string(alTotalList.get(position).get(Constants
+                    mIntent.putExtra(Constants.EXTRA_ONLNIE_STATE, mUtil.null2string(mAlTotalList.get(position).get(Constants
                             .KEY_ONLINE_STATE)));
-                    mUtil.callActivityForResult(mActivity, intent, Constants.ACT_THINGS_DEVICE_NETATMO_CAMERA_DETAIL);
+                    mUtil.callActivityForResult(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_NETATMO_CAMERA_DETAIL);
                 }
             } else if (deviceclassTypeIdNum == Constants.DEVICECLASS_TYPE_ID_40604) {
-                String deviceId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_ID));
-                String nodeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
-                intent = new Intent(mActivity, ThingsDeviceLedBulbDetail.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
-                intent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
-                mUtil.callActivityForResult(mActivity, intent, Constants.ACT_THINGS_DETAIL);
+                String deviceId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_ID));
+                String nodeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_NODE_ID));
+                mIntent = new Intent(mActivity, ThingsDeviceLedBulbDetail.class);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
+                mIntent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
+                mUtil.callActivityForResult(mActivity, mIntent, Constants.ACT_THINGS_DETAIL);
             } else {
-                String deviceId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_ID));
-                String nodeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
-                intent = new Intent(mActivity, ThingsDetail.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
-                intent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
-                mUtil.callActivityForResult(mActivity, intent, Constants.ACT_THINGS_DETAIL);
+                String deviceId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_ID));
+                String nodeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_NODE_ID));
+                mIntent = new Intent(mActivity, ThingsDetail.class);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
+                mIntent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
+                mUtil.callActivityForResult(mActivity, mIntent, Constants.ACT_THINGS_DETAIL);
             }
         } else if (callType == 2) {
             // 삭제하기
-            String deviceId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_ID));
+            String deviceId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_ID));
             callHttpDeviceId = deviceId;
-            String nodeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
+            String nodeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_NODE_ID));
             callHttpNodeId = nodeId;
-            String deviceName = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_NAME));
+            String deviceName = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_NAME));
 
-            intent = new Intent(mActivity, ThingsDeviceDel1st.class);
-            intent.putExtra(Constants.EXTRA_DEVICE_NAME, deviceName);
-            intent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
-            intent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
+            mIntent = new Intent(mActivity, ThingsDeviceDel1st.class);
+            mIntent.putExtra(Constants.EXTRA_DEVICE_NAME, deviceName);
+            mIntent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
+            mIntent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
 
-            String deviceModelId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_MODEL_ID));
-            String deviceMfId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_MF_ID));
-            int deviceclassTypeId = mUtil.null2int(alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
-            String deviceProtocolType = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_PROTOCOL_TYPE));
+            String deviceModelId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_MODEL_ID));
+            String deviceMfId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_MF_ID));
+            int deviceclassTypeId = mUtil.null2int(mAlTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
+            String deviceProtocolType = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_DEVICE_PROTOCOL_TYPE));
 
             if (deviceModelId.equals("HY-11-10A") && deviceMfId.equals("TimeValve")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_01));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_04));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_01_smartgasvalve);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_03));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_01));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_04));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_01_smartgasvalve);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
             } else if (deviceModelId.equals("SPD-01") && deviceMfId.equals("LGU+")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_02_iotplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_02_iotplug_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_05));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_05));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_02_iotplug);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_02_iotplug_wait);
             } else if (deviceModelId.equals("ZL7261KR-5") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_07));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_06));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_03_smartplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_03_smartplug_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_07));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_06));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_03_smartplug);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_03_smartplug_wait);
             } else if (deviceModelId.equals("ZP3111") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_09));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_08));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_04_mutisensor_motion);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_09));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_08));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_04_mutisensor_motion);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
             } else if (deviceModelId.equals("ZS5101") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_10));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_05_shocksensor);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_05_shocksensor_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_10));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_05_shocksensor);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_05_shocksensor_wait);
             } else if (deviceModelId.equals("ZD211x") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_12));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_06_mutisensor_door);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_12));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_06_mutisensor_door);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
             } else if (deviceclassTypeId == Constants.DEVICECLASS_TYPE_ID_40801) {
-                comHandler.sendEmptyMessageDelayed(MSG_COM_WS_NODE_DELETE, 10);
+                mComHandler.sendEmptyMessageDelayed(MSG_COM_WS_NODE_DELETE, 10);
                 return;
             } else if (deviceclassTypeId == Constants.DEVICECLASS_TYPE_ID_40802) {
-                comHandler.sendEmptyMessageDelayed(MSG_COM_D_CLOUD_NODE, 10);
+                mComHandler.sendEmptyMessageDelayed(MSG_COM_D_CLOUD_NODE, 10);
                 return;
             } else if (deviceProtocolType.equalsIgnoreCase("WIRED")) {
                 // Weather station을 비롯한 유선 연결기기는 삭제처리하지않는다.
                 customDialog.msgAlert(mActivity, Constants.MSG921);
                 return;
             } else {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_15));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_13));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_15));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_00_zwave);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_00_zwave_wait);
+                mIntent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_15));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_13));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_15));
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_00_zwave);
+                mIntent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_00_zwave_wait);
             }
-            mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_DEL_01);
+            mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_01);
         } else if (callType == 3) {
             // 실행하기
-            callHttpRequestValue = dataAdapter.getHttpValue();
+            callHttpRequestValue = mDataAdapter.getHttpValue();
             callHttpDeviceId = mAppConfig.getSelect_Homegrp_Homehub_Device_Id();
-            callHttpNodeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
-            callHttpCmdclsId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_ID));
-            String contentValue = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_CONTENT_VALUE));
-            String cmdclsCode = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_CODE));
+            callHttpNodeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_NODE_ID));
+            callHttpCmdclsId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_CMDCLS_ID));
+            String contentValue = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_CONTENT_VALUE));
+            String cmdclsCode = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_CMDCLS_CODE));
 
             mUtil.callBtnGoogleAnalytics(actName, "Control_Things", cmdclsCode + "_1depth");
 
             Dlog.v("callHttpRequestValue", callHttpRequestValue);
             Dlog.v("contentValue", contentValue);
 
-            String cmdclsTypeId = mUtil.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_TYPE_ID));
+            String cmdclsTypeId = mUtil.null2string(mAlTotalList.get(position).get(Constants.KEY_CMDCLS_TYPE_ID));
             String tempValue = mUtil.getStringValues(mActivity, "CMDCLS_TYPE_ID_" + cmdclsTypeId + "_" + callHttpRequestValue);
 
             if (callHttpRequestValue.equals(contentValue)) {
                 mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG899).replaceAll("\\'컨텐츠밸류\\'", tempValue), Toast
                         .LENGTH_SHORT);
-                dataAdapter.notifyDataSetChanged();
+                mDataAdapter.notifyDataSetChanged();
                 return;
             } else {
                 mUtil.setVibrator(100);
             }
-            comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND, position, 0), 10);
+            mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND, position, 0), 10);
         }
     }
 
+    @Override
+    public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
+        mItemTouchHelper.startDrag(viewHolder);
+    }
+
     /**
      * The mType Incoming handler call back.
      */
@@ -1401,9 +1391,4 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             return true;
         }
     }
-
-    @Override
-    public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
-        mItemTouchHelper.startDrag(viewHolder);
-    }
 }

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

@@ -1103,7 +1103,7 @@ public class ThingsDetail extends CustomActionBarActivity implements View.OnClic
 
     @Override
     public void onListReload() {
-        //        comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_MEMBER_DEVICES), 10);
+        //        mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_MEMBER_DEVICES), 10);
         // do something
     }
 

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

@@ -48,11 +48,10 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
         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 static final int MSG_COM_WS_NODE_COMMAND = 1;
-
     /*공통*/
     private Activity mActivity;
     private AppConfig mAppConfig;
@@ -69,6 +68,47 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
     private String mNodeId = "";
     private WebSocketService mWebSocketService;
     private boolean mIsBound = false;
+    private OnWebSocketResponse webSocketResponse = new OnWebSocketResponse() {
+        @Override
+        public void onResponse(String result) {
+            try {
+
+                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();
+            }
+        }
+
+        @Override
+        public void onError(int code, String message) {
+            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
+        }
+    };
+    private ServiceConnection serviceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            LogUtil.i(TAG, "onServiceConnected!!");
+            WebSocketService.WebSocketBinder binder = (WebSocketService.WebSocketBinder) service;
+            mWebSocketService = binder.getService();
+            mWebSocketService.addWebSocketResponse(webSocketResponse);
+            mIsBound = true;
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mIsBound = false;
+        }
+    };
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -82,8 +122,7 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
         Intent serviceIntent = new Intent(mActivity, WebSocketService.class);
         mActivity.bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
 
-        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_del_01,
-                null);
+        View viewToLoad = LayoutInflater.from(mActivity).inflate(R.layout.things_device_del_01, null);
         this.setContentView(viewToLoad);
 
         Intent intent = getIntent();
@@ -116,11 +155,9 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
                 if (mAppConfig.getSelect_Homegrp_Homehub_Online_State().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);
+                    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);
+                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
                     return;
                 }
                 break;
@@ -128,11 +165,9 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
                 if (mAppConfig.getSelect_Homegrp_Homehub_Online_State().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);
+                    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);
+                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
                     return;
                 }
                 break;
@@ -244,73 +279,6 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
         }
     }
 
-    private ServiceConnection serviceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            LogUtil.i(TAG, "onServiceConnected!!");
-            WebSocketService.WebSocketBinder binder = (WebSocketService.WebSocketBinder) service;
-            mWebSocketService = binder.getService();
-            mWebSocketService.addWebSocketResponse(webSocketResponse);
-            mIsBound = true;
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mIsBound = false;
-        }
-    };
-
-    private OnWebSocketResponse webSocketResponse = new OnWebSocketResponse() {
-        @Override
-        public void onResponse(String result) {
-            try {
-
-                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();
-            }
-        }
-
-        @Override
-        public void onError(int code, String message) {
-            mCustomDialog.msgAlert(mActivity, Constants.MSG807);
-        }
-    };
-
-    Handler comHandler = new Handler(new IncomingHandlerCallBack());
-
-    /**
-     * 서버 요청 핸들러.
-     */
-    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;
-        }
-    }
-
     /**
      * UI display.
      */
@@ -334,13 +302,10 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
      */
     private void sendWsDeviceCommand() {
         HashMap<String, Object> sendParams = new HashMap<>();
-        sendParams.put(Constants.KEY_MESSAGE_TYPE,
-                Constants.WEBSOCKET_TYPE_DEVICE_COMMAND);
+        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.getiSelect_Servicehub_Request_Id());
+        sendParams.put(Constants.KEY_COMMAND_TYPE, Constants.WEBSOCKET_COMM_TYPE_UNPAIRING_START);
+        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getiSelect_Servicehub_Request_Id());
 
         mWebSocketService.send(Constants.WEBSOCKET_SEND_DEVICE_COMMAND, sendParams);
     }
@@ -367,12 +332,12 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
      * 서비스 허브에 디바이스 제어(노드 언페어링) 결과를 푸쉬받는다.
      *
      * @param jsonResult 결과 json object
-     * @throws JSONException json parsing exception
+     *
+     * @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);
@@ -383,8 +348,7 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
                 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);
+                mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_THINGS_DEVICE_DEL_02);
             } else {
                 Dlog.v(jsonResult.toString());
                 String errorCode = mUtil.null2string(jsonResult.get(Constants.KEY_ERR_CODE));
@@ -410,5 +374,26 @@ public class ThingsDeviceDel1st extends CustomActivity implements View.OnClickLi
         }
     }
 
+    /**
+     * 서버 요청 핸들러.
+     */
+    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;
+        }
+    }
+
 }