基本流程，获取相关信息

wugian
1 parent 9d65ca5e
Showing 5 changed files with 47 additions and 23 deletions
gimiCinema/src/main/java/com/gimi/common/cinema/utils/AppUpdateUtils.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketResponse.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/AppUpdateUtils.java
View file @5db5faa
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/AppUpdateUtils.java
View file @5db5faa
@@ -35,7 +35,7 @@ public class AppUpdateUtils {
     private static final String UPDATE_ADS_VIDEO_INFO = API_ROOT + "/Api/Agent/CheckAdVedio?checkCode=";
     private String updateApkUrl = API_ROOT + "/Api/Agent/CheckAppVersion?machineType=";// + XgimiDevice.getDeviceType() + "&imei=" + SystemUtils.getPID();
     private String updatePosterUrl = API_ROOT + "/Agent/GetPoster?imei=";// + SystemUtils.getPID();
-    private String GET_AGENT_INFO = API_ROOT + "/Api/Agent/GetInfo?imei=";
+    private String getAgentInfo = API_ROOT + "/Api/Agent/GetInfo?imei=";
     private Context context;
     private boolean showNoUpdate = true;
@@ -291,7 +291,7 @@ public class AppUpdateUtils {
     public void updateAgentInfo() {
         String verJson = null;
         try {
-            verJson = OkHttpClientManager.getAsString(GET_AGENT_INFO + pid);
+            verJson = OkHttpClientManager.getAsString(getAgentInfo + pid);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -323,7 +323,7 @@ public class AppUpdateUtils {
             }
             long l = System.currentTimeMillis() / 1000;
             try {
-                l = OkHttpClientManager.getSysTime(GET_AGENT_INFO + pid);
+                l = OkHttpClientManager.getSysTime(getAgentInfo + pid);
             } catch (IOException | ParseException e) {
                 e.printStackTrace();
             }
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.java
View file @5db5faa
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.java
View file @5db5faa
@@ -8,6 +8,7 @@ import com.google.gson.Gson;
 import com.google.gson.internal.$Gson$Types;
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Callback;
+import com.squareup.okhttp.Dns;
 import com.squareup.okhttp.FormEncodingBuilder;
 import com.squareup.okhttp.Headers;
 import com.squareup.okhttp.HttpUrl;
@@ -33,13 +34,18 @@ import java.lang.reflect.Type;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.FileNameMap;
+import java.net.InetAddress;
 import java.net.URLConnection;
+import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,7 +62,26 @@ public class OkHttpClientManager {
         mOkHttpClient = new OkHttpClient();
         //cookie enabled
         mOkHttpClient.setCookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER));
-
+        mOkHttpClient.setDns(new Dns() {
+            @Override
+            public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+                if (hostname == null)
+                    throw new UnknownHostException("hostname == null");
+                if (hostname.equals("ft.qnbar.cn")) {
+//                    String[] ips = new String[]{"10.10.4.1"};
+//                    List<InetAddress> addresses = new ArrayList<InetAddress>();
+//                    for (int i = 0; i < ips.length; i++) {
+//                        addresses.add(InetAddress.getByName(ips[i]));
+//                    }
+//                    return addresses;
+                    List<InetAddress> addresses = new ArrayList<InetAddress>();
+                    addresses.add(InetAddress.getByName("10.10.4.6"));
+                    return addresses;
+                } else {
+                    return Arrays.asList(InetAddress.getAllByName(hostname));
+                }
+            }
+        });
         // Create a trust manager that does not validate certificate chains
         TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
             @Override
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketResponse.java
View file @5db5faa
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketResponse.java
View file @5db5faa
 package com.qnbar.smc.service;
-import java.util.List;
-
 /**
  * Created by wugian on 2017/3/11.
  */
 public class SocketResponse {
+
     /**
-     * code : 1001
-     * msg : roomsn is registered!please use reconnect
+     * code : 0
+     * msg :
      * data : []
-     * cmd :
+     * cmd : openDoor
      */
     private int code;
     private String msg;
     private String cmd;
-    private List<?> data;
+//    private List<?> data;
     public int getCode() {
         return code;
@@ -44,11 +43,11 @@ public class SocketResponse {
         this.cmd = cmd;
     }
-    public List<?> getData() {
-        return data;
-    }
-
-    public void setData(List<?> data) {
-        this.data = data;
-    }
+//    public List<?> getData() {
+//        return data;
+//    }
+//
+//    public void setData(List<?> data) {
+//        this.data = data;
+//    }
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @5db5faa
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @5db5faa
@@ -30,11 +30,11 @@ public class SocketService extends Service {
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int HEAT_BEAT_RTN = 1003;
-    public static final String HOST = "121.43.189.162";// "192.168.1.21";//
+    public static final String HOST = "10.10.4.6";// "192.168.1.21";//
     public static final int PORT = 9501;
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
-    public String testRoomSn = "000003";
+    public String testRoomSn = "R170413034374";
     private ReadThread mReadThread;
     private HeatBeatThread mHeatBeatThread;
@@ -83,7 +83,7 @@ public class SocketService extends Service {
         context = this;
         //TODO change the room sn
         if (!"LETEST".equals(SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE))) {
-            testRoomSn = "000002";
+            testRoomSn = "R170413034374";
         }
         new InitSocketThread().start();
         Log.d(TAG, "socket service onCreate");
@@ -197,7 +197,7 @@ public class SocketService extends Service {
                             Log.d(TAG, "end:" + message.contains(END_SYMBOL) + "");
                             Log.d(TAG, "recv msg:" + message);
                             try {
-                                SocketResponse socketResponse = gson.fromJson(message.trim(), SocketResponse.class);
+                                SocketResponse socketResponse = gson.fromJson(message.substring(0, message.length() - 8), SocketResponse.class);
                                 switch (socketResponse.getCode()) {
                                     case SUCESS_MESSAGE:
                                         Log.d(TAG, "success:" + socketResponse.getCmd());
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @5db5faa
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @5db5faa
@@ -17,7 +17,7 @@ import com.xgimi.gimicinema.application.FangTangApplication;
  * Created by wugian on 2017/4/7
  */
 public class RoomInfoModelImpl implements IRoomInfoModel {
-    private static final String ROOT_URL = "https:/hulong.nat123.net/";
+    private static final String ROOT_URL = "https://ft.qnbar.cn/develop/";
     private static final String ROOM_INFO_BY_IMEI_URL = ROOT_URL + "tcp/getRoomInfoByimei?imei=";
     private static final String ROOM_STATUS_BY_ROOM_SN_URL = ROOT_URL + "tcp/getRoomStatus?room_sn=";
     private static final String ROOM_QRCODE_BY_ORDER_SN = ROOT_URL + "tcp/getEndQRCode?order_sn=";
@@ -54,7 +54,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                             e.printStackTrace();
                         }
                         boolean equals = roomInfoStr.equals(response);
-                        if (roomInfo1 != null && !equals) {
+                        if (roomInfo1 != null && roomInfo1.getData() != null && !equals) {
                             Utils.saveString(applicationContext, "room-info", response);
                             listener.onGetRoomInfoUpdate(roomInfo1);
                         } else {