gradle update,log file

wugian
1 parent ea30dfb9
Showing 2 changed files with 35 additions and 21 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
--- a/gimiCinema/build.gradle
View file @dbea6dc
+++ b/gimiCinema/build.gradle
View file @dbea6dc
@@ -104,7 +104,7 @@ android {
             if (variant.buildType.name.equals('release')) {
                 def fileName = output.outputFile.name.replace(output.outputFile.name,
-                        /*variant.productFlavors[0].name*/"方糖" + "-${variant.versionCode}-${releaseTime()}.apk")
+                        /*variant.productFlavors[0].name*/"方糖" + "-v${variant.versionCode}-${releaseTime()}.apk")
                 output.outputFile = new File(output.outputFile.parent, fileName)
                 // release to test folder
                 println fileName
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @dbea6dc
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @dbea6dc
@@ -18,7 +18,6 @@ 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 {
@@ -37,6 +36,7 @@ public class SocketService extends Service {
     public static final String HEART_BEAT_STRING = "\\r\\n\\r\\n";//心跳包内容
     public String testRoomSn = "000003";
     private ReadThread mReadThread;
+    private HeatBeatThread mHeatBeatThread;
     private Gson gson;
 //    private LocalBroadcastManager mLocalBroadcastManager;
@@ -56,6 +56,7 @@ public class SocketService extends Service {
                     Log.d(TAG, "heart beat error restart");
                     mHandler.removeCallbacks(heartBeatRunnable);
                     mReadThread.release();
+                    mHeatBeatThread.release();
                     releaseLastSocket(mSocket);
                     new InitSocketThread().start();
                 }
@@ -79,6 +80,7 @@ public class SocketService extends Service {
         super.onCreate();
         gson = new Gson();
         context = this;
+        //TODO change the room sn
         if (!"LETEST".equals(SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE))) {
             testRoomSn = "000002";
         }
@@ -109,20 +111,15 @@ public class SocketService extends Service {
         return true;
     }
-    private void initSocket() {//初始化Socket
-        try {
-            Socket so = new Socket(HOST, PORT);
-            mSocket = new WeakReference<Socket>(so);
-            mReadThread = new ReadThread(so);
-            mReadThread.start();
+    private void initSocket() throws IOException {//初始化Socket
+        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();
-        }
+        mHeatBeatThread = new HeatBeatThread(so);
+        mHeatBeatThread.start();//上面的 one plus 3t NetworkOnMainThreadException!!!
     }
     private void releaseLastSocket(WeakReference<Socket> mSocket) {
@@ -144,7 +141,18 @@ public class SocketService extends Service {
         @Override
         public void run() {
             super.run();
-            initSocket();
+            try {
+                initSocket();
+            } catch (IOException e) {
+                e.printStackTrace();
+                Log.d(TAG, "init socket thread error,restart again after 10's");
+                try {
+                    Thread.sleep(HEART_BEAT_RATE);
+                } catch (InterruptedException e1) {
+                    e1.printStackTrace();
+                }
+                this.run();
+            }
         }
     }
@@ -239,33 +247,39 @@ public class SocketService extends Service {
     // Thread to read content from Socket
-    class HeatBeat extends Thread {
+    class HeatBeatThread extends Thread {
         private WeakReference<Socket> mWeakSocket;
         private boolean isStart = true;
-        public HeatBeat(Socket socket) {
+        public HeatBeatThread(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) {
-                while (true) {
+                while (isStart) {
                     if (System.currentTimeMillis() - sendTime >= HEART_BEAT_RATE) {
-                        Log.d(TAG, "heart beat");
+                        Log.d(TAG, "heart beat:" + Thread.currentThread().getId());
                         boolean isSuccess = sendMsg(HEART_BEAT_STRING);//就发送一个HEART_BEAT_STRING过去 如果发送失败，就重新初始化一个socket
                         if (!isSuccess) {
-                            Log.d(TAG, "heart beat error restart");
+                            Log.d(TAG, "heart beat error restart:" + Thread.currentThread().getId());
 //                            mHandler.removeCallbacks(heartBeatRunnable);
                             mReadThread.release();
+                            mHeatBeatThread.release();
                             sendRegister = false;
                             releaseLastSocket(mSocket);
                             new InitSocketThread().start();
                         }
                     } else {
-                        Log.d(TAG, "heart beat less than beat rate");
+                        Log.d(TAG, "heart beat less than beat rate:" + Thread.currentThread().getId());
                     }
                     try {
                         Thread.sleep(HEART_BEAT_RATE);