version clazz update,open door connect with server

@@ -133,6 +133,7 @@ android {
         }
     }
     return false
+    buildToolsVersion '25.0.0'
 }
 
 dependencies {

@@ -117,6 +117,7 @@
         <service
             android:name="com.qnbar.smc.service.TelinkLightService"
             android:enabled="true" />
+        <service android:name="com.qnbar.smc.service.SocketService"/>
 
         <activity android:name="com.qnbar.smc.SimpleLightDemo">
            <!-- <intent-filter>

+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
+     * data : []
+     * cmd :
+     */
+
+    private int code;
+    private String msg;
+    private String cmd;
+    private List<?> data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getCmd() {
+        return cmd;
+    }
+
+    public void setCmd(String cmd) {
+        this.cmd = cmd;
+    }
+
+    public List<?> getData() {
+        return data;
+    }
+
+    public void setData(List<?> data) {
+        this.data = data;
+    }
+}

+package com.qnbar.smc.service;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.util.Log;
+
+import com.gimi.common.cinema.model.MessageEvent;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.ref.WeakReference;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+
+public class SocketService extends Service {
+    private static final String TAG = "BackService";
+    private static final long HEART_BEAT_RATE = 30 * 1000;
+
+    public static final String HOST = "121.43.189.162";// "192.168.1.21";//
+    public static final int PORT = 9501;
+
+    public static final String MESSAGE_ACTION = "com.dingmore.terminal.socket";
+    public static final String HEART_BEAT_ACTION = "com.dingmore.terminal.socket.heart";
+
+    public static final String HEART_BEAT_STRING = "00";//心跳包内容
+
+    private ReadThread mReadThread;
+    private Gson gson;
+
+//    private LocalBroadcastManager mLocalBroadcastManager;
+
+    private WeakReference<Socket> mSocket;
+
+    // For heart Beat
+    private Handler mHandler = new Handler();
+    private Runnable heartBeatRunnable = new Runnable() {
+
+        @Override
+        public void run() {
+            if (System.currentTimeMillis() - sendTime >= HEART_BEAT_RATE) {
+                Log.d(TAG, "heart beat");
+                boolean isSuccess = sendMsg(HEART_BEAT_STRING);//就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
+                if (!isSuccess) {
+                    Log.d(TAG, "heart beat error restart");
+                    mHandler.removeCallbacks(heartBeatRunnable);
+                    mReadThread.release();
+                    releaseLastSocket(mSocket);
+                    new InitSocketThread().start();
+                }
+            } else {
+                Log.d(TAG, "heart beat less than beat rate");
+            }
+            mHandler.postDelayed(this, HEART_BEAT_RATE);
+        }
+    };
+
+    private long sendTime = 0L;
+
+    @Override
+    public IBinder onBind(Intent arg0) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        gson = new Gson();
+        new InitSocketThread().start();
+        Log.d(TAG, "socket service onCreate");
+//        mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
+
+    }
+
+    public boolean sendMsg(String msg) {
+        if (null == mSocket || null == mSocket.get()) {
+            return false;
+        }
+        Log.d(TAG, msg);
+        Socket soc = mSocket.get();
+        try {
+            if (!soc.isClosed() && !soc.isOutputShutdown()) {
+                OutputStream os = soc.getOutputStream();
+                String message = msg;
+                os.write(message.getBytes());
+                os.flush();
+                sendTime = System.currentTimeMillis();//每次发送成数据，就改一下最后成功发送的时间，节省心跳间隔时间
+            } else {
+                return false;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    private void initSocket() {//初始化Socket
+        try {
+            Socket so = new Socket(HOST, PORT);
+            mSocket = new WeakReference<Socket>(so);
+            mReadThread = new ReadThread(so);
+            mReadThread.start();
+//            new Thread(heartBeatRunnable).start();
+//            mHandler.post(heartBeatRunnable);//初始化成功后，就准备发送心跳包
+            new HeatBeat(so).start();//上面的 one plus 3t NetworkOnMainThreadException!!!
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void releaseLastSocket(WeakReference<Socket> mSocket) {
+        try {
+            if (null != mSocket) {
+                Socket sk = mSocket.get();
+                if (!sk.isClosed()) {
+                    sk.close();
+                }
+                sk = null;
+                mSocket = null;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    class InitSocketThread extends Thread {
+        @Override
+        public void run() {
+            super.run();
+            initSocket();
+        }
+    }
+
+    // Thread to read content from Socket
+    class ReadThread extends Thread {
+        private WeakReference<Socket> mWeakSocket;
+        private boolean isStart = true;
+
+        public ReadThread(Socket socket) {
+            mWeakSocket = new WeakReference<Socket>(socket);
+        }
+
+        public void release() {
+            isStart = false;
+            releaseLastSocket(mWeakSocket);
+        }
+
+        @Override
+        public void run() {
+            super.run();
+            Socket socket = mWeakSocket.get();
+            if (null != socket) {
+                try {
+                    if (!sendRegister) {
+                        Log.d(TAG, "send register mes");
+                        String msg = "{\"cmd\":\"register\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n";
+                        sendMsg(msg);
+                        Log.d(TAG, "" + msg);
+                        sendRegister = true;
+                    }
+                    Log.d(TAG, "send register mes end");
+                    InputStream is = socket.getInputStream();
+                    byte[] buffer = new byte[1024 * 4];
+                    int length = 0;
+                    while (!socket.isClosed() && !socket.isInputShutdown()
+                            && isStart && ((length = is.read(buffer)) != -1)) {
+                        if (length > 0) {
+                            String message = new String(Arrays.copyOf(buffer,
+                                    length)).trim();
+                            Log.d(TAG, message);
+                            try {
+                                SocketResponse socketResponse = gson.fromJson(message.trim(), SocketResponse.class);
+                                switch (socketResponse.getCode()) {
+                                    case 1001:
+                                        sendMsg("{\"cmd\":\"reconnect\",\"data\":{\"room_sn\":\"000002\"}}\\r\\n\\r\\n");
+                                        Log.d(TAG, "send reconnect mes");
+                                        break;
+                                    case 1002:
+                                        Log.d(TAG, "re init socket");
+                                        //                                    sendRegister = false;
+                                        releaseLastSocket(mWeakSocket);
+                                        initSocket();
+                                        break;
+                                }
+                                if (("openDoor").equals(socketResponse.getCmd())) {
+                                    MessageEvent messageEvent = new MessageEvent();
+                                    messageEvent.setEventId(1701);
+                                    messageEvent.setMessage("click item");
+                                    EventBus.getDefault().post(messageEvent);
+                                }
+                            } catch (JsonSyntaxException e) {
+                                Log.d(TAG, message);
+                                e.printStackTrace();
+                            }
+                            //收到服务器过来的消息，就通过Broadcast发送出去
+//                            if (message.equals(HEART_BEAT_STRING)) {//处理心跳回复
+//                                Intent intent = new Intent(HEART_BEAT_ACTION);
+//                                mLocalBroadcastManager.sendBroadcast(intent);
+//                            } else {
+//                                //其他消息回复
+//                                Intent intent = new Intent(MESSAGE_ACTION);
+//                                intent.putExtra("message", message);
+//                                mLocalBroadcastManager.sendBroadcast(intent);
+//                            }
+                        }
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    boolean sendRegister = false;
+
+
+    // Thread to read content from Socket
+    class HeatBeat extends Thread {
+        private WeakReference<Socket> mWeakSocket;
+        private boolean isStart = true;
+
+        public HeatBeat(Socket socket) {
+            mWeakSocket = new WeakReference<Socket>(socket);
+        }
+
+        @Override
+        public void run() {
+            super.run();
+            Socket socket = mWeakSocket.get();
+            if (null != socket) {
+                while (true) {
+                    if (System.currentTimeMillis() - sendTime >= HEART_BEAT_RATE) {
+                        Log.d(TAG, "heart beat");
+                        boolean isSuccess = sendMsg(HEART_BEAT_STRING);//就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
+                        if (!isSuccess) {
+                            Log.d(TAG, "heart beat error restart");
+//                            mHandler.removeCallbacks(heartBeatRunnable);
+                            mReadThread.release();
+                            releaseLastSocket(mSocket);
+                            new InitSocketThread().start();
+                        }
+                    } else {
+                        Log.d(TAG, "heart beat less than beat rate");
+                    }
+                    try {
+                        Thread.sleep(HEART_BEAT_RATE);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "socket service destroy");
+    }
+}
\ No newline at end of file

@@ -52,6 +52,7 @@ import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.FolderItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
+import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.M1905Utils;
@@ -86,6 +87,10 @@ import com.xgimi.gimicinema.view.ClazzItem;
 import com.xgimi.gimicinema.view.MovieItem;
 import com.xgimi.gimicinema.view.OrderRecyclerView;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -145,8 +150,10 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         mApplication = (FangTangApplication) getApplication();
         mApplication.doInit();
         setContentView(R.layout.a_main);
+        EventBus.getDefault().register(this);
+
         initLight();
-        initLock();
+//        initLock();
         context = this;
         mData = new ArrayList<>();
         clazzData = new ArrayList<>();
@@ -595,6 +602,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         super.onDestroy();
         presenter.umountSamba();
         unregisterReceiver(mReceiver);
+        EventBus.getDefault().unregister(this);
     }
 
 
@@ -836,4 +844,20 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY - 1);
         registerReceiver(mReceiver, filter);
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMoonEvent(MessageEvent messageEvent) {
+        switch (messageEvent.getEventId()) {
+            case 0:
+                Log.d("event bus", messageEvent.getMessage());
+                break;
+            case 1:
+                Log.d("event bus", messageEvent.getMessage());
+                break;
+            case 1701:
+                initLock();
+                Log.d("event bus", messageEvent.getMessage());
+                break;
+        }
+    }
 }

@@ -36,8 +36,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 
-import static android.R.attr.path;
-
 /**
  * Created by wugian on 2016/9/28
  */
@@ -73,15 +71,14 @@ public class OtherModelImpl implements IOtherModel {
 
                 com.gimi.common.cinema.model.CinemaConfig cfgSmb =
                         FileReadUtils.readConfigBySamba(localPath + ".time");
-                if (cfgLocal == null || (cfgLocal.getClassArray() != null &&
-                        cfgLocal.getClassArray().length < 1)) {
+                if (cfgLocal == null /*|| (cfgLocal.getClassArray() != null &&
+                        cfgLocal.getClassArray().length < 1)*/) {
                     return;
                 }
 
                 if (cfgLocal.getClassVersion() < cfgSmb.getClassVersion()) {
-                    if (cfgSmb.getClassArray() != null
-                            && cfgSmb.getClassArray().length > 0) {
-                        StringBuilder stringBuilder = new StringBuilder();
+                    StringBuilder stringBuilder = new StringBuilder();
+                    if (cfgSmb.getClassArray() != null && cfgSmb.getClassArray().length > 0) {
                         for (String trim : cfgSmb.getClassArray()) {
                             if (!trim.isEmpty()) {
                                 if (stringBuilder.length() != 0) {
@@ -90,18 +87,18 @@ public class OtherModelImpl implements IOtherModel {
                                 stringBuilder.append(trim);
                             }
                         }
-                        SharedPreferences.Editor edit = sp.edit();
-                        edit.putString("classifications", stringBuilder.toString());
-                        edit.putInt("classifications-version",
-                                cfgSmb.getClassVersion());
-                        edit.apply();
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                l.onUpdateClazzSuccess();
-                            }
-                        });
                     }
+                    SharedPreferences.Editor edit = sp.edit();
+                    edit.putString("classifications", stringBuilder.toString());
+                    edit.putInt("classifications-version",
+                            cfgSmb.getClassVersion());
+                    edit.apply();
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            l.onUpdateClazzSuccess();
+                        }
+                    });
                 } else if (cfgLocal.getClassVersion() > cfgSmb.getClassVersion()) {
                     String content = new Gson().toJson(cfgLocal);
                     FileReadUtils.writeDates(msg.getConfigPath(), content, false);

@@ -90,6 +90,9 @@ public class CinemaControlService extends Service {
                 currentState = state;
                 Log.d("aidl", "state change," + currentPath + "," + duration + "," + currentPosition);
                 Log.d("aidl", "state change cinemaSMC not null");
+                if (true) {
+                    return;
+                }
                 switch (state) {
                     case 0://空闲
 //                        open();

+package com.adroplat.fist_switch.utils.protocol.one;
+
+
+/**
+ * 协议类
+ * Created by WLJ on 2015/11/13.
+ */
+public class FistProtocol {
+    /**
+     * 包头
+     */
+    public static final byte[] COMMOND_PACKAGE_HEADER = {(byte) 0x83, (byte) 0xb3, (byte) 0xa9};
+    /**
+     * 协议版本
+     */
+    public static final byte[] COMMOND_PROTOCOL_VERSION = {0x01, 0x00, 0x00, 0x00};
+    /**
+     * 版本角标
+     */
+    public static final int INDEXT_OF_VERSION = COMMOND_PACKAGE_HEADER.length;
+    /**
+     * 命令类型角标
+     */
+    public static final int INDEXT_OF_CMD = COMMOND_PACKAGE_HEADER.length + COMMOND_PROTOCOL_VERSION.length;
+    /**
+     * 命令类型长度
+     */
+    public static final int LENGTH_OF_CMD = 1;
+    /**
+     * 包长角标
+     */
+    public static final int INDEXT_OF_PACKAGE_LENGTH = INDEXT_OF_CMD + LENGTH_OF_CMD;
+    /**
+     * 包长长度
+     */
+    public static final int LENGTH_OF_PACKAGE_LENGTH = 2;
+    /**
+     * 随机数角标
+     */
+    public static final int INDEXT_OF_RANDOM = INDEXT_OF_PACKAGE_LENGTH + LENGTH_OF_PACKAGE_LENGTH;
+
+    /**
+     * 随机数长度
+     */
+    public static final int LENGTH_OF_RANDOM = 2;
+    /**
+     * 设备类型长度
+     */
+    public static final int LENGTH_OF_DEVICE_TYPE = 2;
+    /**
+     * 设备号角标
+     */
+    public static final int INDEXT_OF_DEVICE_NUM = INDEXT_OF_RANDOM + LENGTH_OF_RANDOM + LENGTH_OF_DEVICE_TYPE;
+    /**
+     * 设备号长度
+     */
+    public static final int LENGTH_OF_DEVICE_NUM = 6;
+    /**
+     * 设备ip角标
+     */
+    public static final int INDEXT_OF_DEVICE_IP = INDEXT_OF_DEVICE_NUM + LENGTH_OF_DEVICE_NUM;
+    /**
+     * 设备IP长度
+     */
+    public static final int LENGTH_OF_DEVICE_IP = 4;
+
+    /**
+     * UDP搜索响应包长
+     */
+    public static final byte COMMOND_UDP_QUERY_RESPONSE_DATA_LENGTH = 0x18;
+    /**
+     * 超时
+     */
+    public static final byte ERROR_CODE_TIMEOUT = (byte) 0xFE;
+
+    /**
+     * 在线状态
+     */
+
+    public class OnlineState {
+        /**
+         * 未知
+         */
+        public static final int UNKNOW = 0;
+        /**
+         * 掉线
+         */
+        public static final int OFFLINE = 0x1;
+        /**
+         * 在线
+         */
+        public static final int ONLINE = 0x2;
+        /**
+         * 不存在
+         */
+        public static final int NOTHINGNESS = 0x20;
+    }
+
+    /**
+     * 命令类型
+     */
+    public class CommondType {
+        /**
+         * 查询
+         */
+        public static final byte CMD_TYPE_QUERY = 0x10;
+        /**
+         * 查询反馈
+         */
+        public static final byte CMD_TYPE_QUERY_RESPONSE = 0x11;
+        /**
+         * 控制
+         */
+        public static final byte CMD_TYPE_CONTROL = 0x20;
+        /**
+         * 控制响应
+         */
+        public static final byte CMD_TYPE_CONTROL_RESPONSE = 0x21;
+        /**
+         * 子设备控制完毕响应包
+         */
+        public static final byte CMD_TYPE_CONTROL_DONE_RESPONSE = 0x22;
+        /**
+         * 命令控制完毕响应包：
+         */
+        public static final byte CMD_TYPE_CONTROL_OVER = 0x23;
+        /**
+         * UDP搜索
+         */
+        public static final byte CMD_TYPE_SEARCH = 0x30;
+        /**
+         * UDP搜索响应
+         */
+        public static final byte CMD_TYPE_SEARCH_RESPONSE = 0x31;
+        /**
+         * 配置完成通知
+         */
+        public static final byte CMD_TYPE_CONFIG_DONE = 0x32;
+        /**
+         * 设备启动、网络重连通知包
+         */
+        public static final byte CMD_TYPE_ONLINE = 0x33;
+
+        /**
+         * 子设备入网申请
+         */
+        public static final byte CMD_TYPE_ADD = 0x40;
+        /**
+         * 子设备入网申请响应
+         */
+        public static final byte CMD_TYPE_ADD_RESPONSE = 0x41;
+        /**
+         * 子设备入网结束
+         */
+        public static final byte CMD_TYPE_ADD_OVER = 0x42;
+        /**
+         * 子设备入网结束响应
+         */
+        public static final byte CMD_TYPE_ADD_OVER_RESPONSE = 0x43;
+        /**
+         * 开关删除
+         */
+        public static final byte CMD_TYPE_DELETE = 0x50;
+        /**
+         * 开关删除响应
+         */
+        public static final byte CMD_TYPE_DELETE_RESPONSE = 0x51;
+        /**
+         * 网关工作模式查询包命令类型
+         */
+        public static final byte CMD_DEVICE_MODEL_REQUEST = 0x60;
+        /**
+         * 网关工作模式响应包命令类型
+         */
+        public static final byte CMD_DEVICE_MODEL_RESPONSE = 0x61;
+        /**
+         * 软件版本查询包命令类型
+         */
+        public static final byte CMD_SOFTWARE_VER_REQUEST = 0x70;
+        /**
+         * 软件版本响应包命令类型
+         */
+        public static final byte CMD_SOFTWARE_VER_RESPONSE = 0x71;
+        /**
+         * 链接路由器包命令类型
+         */
+        public static final byte CMD_LINK_REQUEST = (byte) 0x80;
+        /**
+         * 链接路由器响应包命令类型
+         */
+        public static final char CMD_LINK_RESPONSE = 0x81;
+        /**
+         * 修改SSID和密码包命令类型
+         */
+        public static final byte CMD_MODIFY_SSID_AND_PWD_REQUEST = (byte) 0x90;
+        /**
+         * 修改SSID和密码响应包命令类型
+         */
+        public static final char CMD_MODIFY_SSID_AND_PWD_RESPONSE = 0x91;
+        /**
+         * 修改控制密码包命令类型
+         */
+        public static final byte CMD_MODIFY_CTRL_AND_PWD_REQUEST = (byte) 0x92;
+        /**
+         * 修改控制密码响应包命令类型
+         */
+        public static final char CMD_MODIFY_CTRL_PWD_RESPONSE = 0x93;
+        /**
+         * 获取主机联网状态命令类型
+         */
+        public static final byte CMD_NET_LINK_STATUS = (byte) 0xA0;
+        /**
+         * 获取主机联网状态响应包命令类型
+         */
+        public static final char CMD_NET_LINK_STATUS_RESPONSE = 0xA1;
+        /**
+         * 获取主机联网状态命令类型
+         */
+        public static final byte CMD_ROUTER_LIST_REQUEST = (byte) 0xB0;
+        /**
+         * 获取主机联网状态响应包命令类型
+         */
+        public static final char CMD_ROUTER_LIST_RESPONSE = 0xB1;
+    }
+}