wss 오류 수정

onecable_admin/build.gradle

@@ -114,7 +114,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_admin/onecable_admin.iml

@@ -63,13 +63,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -77,6 +70,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -114,9 +114,9 @@
     <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="Java-WebSocket-1.3.4" level="project" />
     <orderEntry type="library" exported="" name="butterknife-annotations-8.5.1" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-asl-1.9.13" level="project" />
-    <orderEntry type="library" exported="" name="Java-WebSocket-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="firebase-analytics-11.0.0" level="project" />
     <orderEntry type="library" exported="" name="Typekit-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />

onecable_admin/src/main/java/com/ntels/onecable/admin/common/Constants.java

@@ -71,7 +71,7 @@ public interface Constants {
   String SMART_URL_KNEET_V3_DEV = "https://dev.allofthings.com:5018";
   String SERVICE_ID_KNEET_V3_DEV = "30001";
   String PROJECT_ID_KNEET_V3_DEV = "439012691127";
-  String APP_START_ID_KNEET_V3_DEV = "ntels_onecable_v1_dev";
+  String APP_START_ID_KNEET_V3_DEV = "ntels_onecable_admin_v1";
   String URL_SERVICE_HUB_WEBSOCKET_V3_DEV = "ws://61.40.220.23:7792/ocs";
   String URL_SERVICE_HUB_REST_V3_DEV = "http://61.40.220.23:7791/ocs";
   String URL_CLOUD_GATEWAY_V3_DEV = "http://61.40.220.80:7070";

onecable_admin/src/main/java/com/ntels/onecable/admin/common/db/DatabaseOpenHelper.java

@@ -24,7 +24,7 @@ import android.database.sqlite.SQLiteOpenHelper;
  */
 public class DatabaseOpenHelper extends SQLiteOpenHelper {
 
-    private static final String DB_NAME = "Kneet.db";
+    private static final String DB_NAME = "KneetAdim.db";
 
     private static int DB_VERSION = 1;
 

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

@@ -9,7 +9,6 @@ import com.ntels.onecable.admin.common.util.LogUtil;
 import com.ntels.onecable.admin.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) {
@@ -303,7 +305,7 @@ public class WebSocketService extends Service {
 
                 String oldDeviceConn = mUtil.null2string(mAppConfig.getDevicesList(
                         mUtil.null2string(jsonObject.get(Constants.KEY_DEVICE_ID))).get(Constants.KEY_DEVICE_CONN));
-                String newDeviceConn =mUtil.null2string(jsonObject.get(Constants.KEY_DEVICE_CONN));
+                String newDeviceConn = mUtil.null2string(jsonObject.get(Constants.KEY_DEVICE_CONN));
                 if (!oldDeviceConn.equals(newDeviceConn)) {
                     mAppConfig.getDevicesList(mUtil.null2string(jsonObject.get(Constants.KEY_DEVICE_ID))).put(Constants.KEY_DEVICE_CONN,
                             mUtil.null2string(jsonObject.get(Constants.KEY_DEVICE_CONN)));

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

@@ -372,11 +372,11 @@ public class ThingsDetail extends CustomActivity implements View.OnClickListener
     private void callVpReLoad() {
 
         if (mMandatoryTotalList.size() > 0) {
-            if (mOptionCount == 0) {
-                mPageAdapter.setHideDivider(false);
-            } else {
-                mPageAdapter.setHideDivider(true);
-            }
+//            if (mOptionCount == 0) {
+//                mPageAdapter.setHideDivider(false);
+//            } else {
+//                mPageAdapter.setHideDivider(true);
+//            }
             mNodeMandatoryPager.getAdapter().notifyDataSetChanged();
 //            mUtil.getLinearLayout(mActivity, R.id.llvpNode_M_Icon).setVisibility(View.GONE);