不同平台差异化处理,添加心跳异常重新连接及已连接重新连接

wugian
1 parent 2de7bfcc
Showing 2 changed files with 55 additions and 11 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @672f1ef
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @672f1ef
@@ -32,7 +32,7 @@ import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR;
 import static com.qnbar.smc.service.SocketService.USER_OPEN_DOOR_AND_GET_MOVIE;
 public class SocketService1 extends Service {
-    private static final String TAG = "BackService";
+    private static final String TAG = "BackService1";
     private static final long HEART_BEAT_RATE = 2 * 1000;
     //    public static final int USER_OPEN_DOOR_AND_GET_MOVIE = 1703;
@@ -61,7 +61,8 @@ public class SocketService1 extends Service {
     private static final int CONNECTION_BEFORE_AUTHENTICATION = 10003;//还未注册连接就进行认证
     private static final int NOT_SEND_ROOM_SN = 10004;//终端编号未传
     private static final int HEART_BEAR_ERROR = 10005; //心跳异常,没有找到房间连接信息
-    private static final int HEART_BEAR_ERROR_SYMBOL = 10006;//心跳异常,连接标识符不一致
+    private static final int HEART_BEAT_ERROR_SYMBOL = 10006;//心跳异常,连接标识符不一致
+    private static final int ROOM_SN_CONNECTED = 10010;//room_sn 已连接,不能再连接
     private static final int OPEN_DOOR = 50001;//开门命令
     private static final int CLEAN_OVER = 50002;//
@@ -292,6 +293,23 @@ public class SocketService1 extends Service {
                                     case HEART_BEAT_SUCCESS:
                                         Log.d(TAG, "HEART_BEAT_SUCCESS");
                                         break;
+                                    case HEART_BEAT_ERROR_SYMBOL:
+                                    case ROOM_SN_CONNECTED:
+                                        String msg1 = socketResponse.getCode() == HEART_BEAT_ERROR_SYMBOL ? "HEART_BEAT_ERROR_SYMBOL" : "ROOM_SN_CONNECTED";
+                                        Log.d(TAG, msg1);
+                                        mHandler.removeCallbacks(heartBeatRunnable);
+                                        mReadThread.release();
+                                        sendRegister = false;
+                                        releaseLastSocket(mSocket);
+                                        Log.d(TAG, msg1 + " before:" + +System.currentTimeMillis());
+                                        try {
+                                            Thread.sleep(10 * 1000);
+                                        } catch (InterruptedException e) {
+                                            e.printStackTrace();
+                                        }
+                                        Log.d(TAG, msg1 + "  after:" + System.currentTimeMillis());
+                                        new InitSocketThread().start();
+                                        break;
                                     case RETURN_VERIFY_CODE:
                                         Log.d(TAG, "RETURN_VERIFY_CODE");
                                         if (!TextUtils.isEmpty(socketResponse.getData().getVerify())) {
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @672f1ef
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @672f1ef
@@ -15,6 +15,7 @@
 package com.xgimi.gimicinema.activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
@@ -45,7 +46,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
-
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
@@ -73,6 +73,7 @@ import com.gimi.common.cinema.utils.OpenMMUtils;
 import com.gimi.common.cinema.utils.ScreenUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.Utils;
+import com.gimi.common.cinema.utils.XgimiDevice;
 import com.google.gson.Gson;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
@@ -109,7 +110,6 @@ import com.xgimi.gimicinema.view.MovieItem;
 import com.xgimi.gimicinema.view.OrderRecyclerView;
 import com.xgimi.smartscreen.SmartScreenBean;
 import com.xgimi.smartscreen.service.ConfigService;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -240,13 +240,15 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
-//        if (!new SystemUtils().isServiceRunning(getApplicationContext(), "com.qnbar.smc.service.SocketService1")) {
-        System.out.println("com.qnbar.smc.service.SocketService1 is not running then will start again");
-        Intent intent = new Intent(this, SocketService1.class);
-        startService(intent);
-//        } else {
-//            System.out.println("com.qnbar.smc.service.SocketService1");
-//        }
+//        if (!isServiceRunning(context, "com.qnbar.smc.service.SocketService1")) {
+        //918清空内存后表现和928不同,获取不到此service是否运行,或者没有启动此service
+        if (XgimiDevice.isZ4X() || XgimiDevice.isZ3S() || XgimiDevice.isZ4X() || !new SystemUtils().isServiceRunning(context, "com.qnbar.smc.service.SocketService1")) {
+            Log.d("BackService", "SocketService1 is not running then will start again");
+            Intent intent = new Intent(this, SocketService1.class);
+            startService(intent);
+        } else {
+            Log.d("BackService", "SocketService1 is running");
+        }
 //        initGetOrderInfo = true;
 //        presenter.getOrderInfo();
 //        new Handler().postDelayed(new Runnable() {
@@ -261,6 +263,30 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //        PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
     }
+    /*
+         * 判断服务是否启动,context上下文对象 ，className服务的name
+         */
+    public static boolean isServiceRunning(Context mContext, String className) {
+
+        boolean isRunning = false;
+        ActivityManager activityManager = (ActivityManager) mContext
+                .getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningServiceInfo> serviceList = activityManager
+                .getRunningServices(Integer.MAX_VALUE);
+
+        if (!(serviceList.size() > 0)) {
+            return false;
+        }
+
+        for (int i = 0; i < serviceList.size(); i++) {
+            if (serviceList.get(i).service.getClassName().equals(className)) {
+                isRunning = true;
+                break;
+            }
+        }
+        return isRunning;
+    }
+
     private boolean initGetOrderInfo;
     public void getTimeByCalendar() {