update heart beat rate,update get qrcode params,优化灯光及投影光机的开关

wugian
1 parent 78583677
Showing 8 changed files with 132 additions and 91 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/qnbar/smc/utils/LightOperationUtils.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @26fc740
@@ -9,9 +9,13 @@ import android.util.Log;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.RoomInfo;
+import com.gimi.common.cinema.utils.SystemUtils;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
+import com.qnbar.smc.utils.LightOperationUtils;
+import com.xgimi.gimicinema.activity.QrCodeShowActivity;
+import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.smartscreen.encrypt.AuthCode;
 import org.greenrobot.eventbus.EventBus;
@@ -24,7 +28,7 @@ import java.util.Arrays;
 public class SocketService extends Service {
     private static final String TAG = "BackService";
-    private static final long HEART_BEAT_RATE = 20 * 1000;
+    private static final long HEART_BEAT_RATE = 5 * 1000;
     public static final int JUST_OPEN_DOOR = 1701;
     public static final int USER_OPEN_DOOR_AND_GET_MOVIE = 1703;
@@ -49,6 +53,7 @@ public class SocketService extends Service {
     private static final int HEART_BEAR_ERROR = 10005; //心跳异常,没有找到房间连接信息
     private static final int HEART_BEAR_ERROR_SYMBOL = 10006;//心跳异常,连接标识符不一致
     private static final int OPEN_DOOR = 50001;//开门命令
+    private static final int CLEAN_OVER = 50002;//
     private static final int ROOM_HAS_REGISTERED = 1001;
     private static final int ROOM_NOT_EXIST_M = 1002;
@@ -264,32 +269,51 @@ public class SocketService extends Service {
                                         }
                                         break;
                                     case CONTAIN_MESSAGE:
-                                        if (socketResponse.getData() != null && socketResponse.getCmd() == OPEN_DOOR) {
-                                            switch (socketResponse.getData().getUser()) {
-                                                //10用户,20管理员,默认值为0
-                                                case 10:
-                                                    if (socketResponse.getData().getFirst() == 1) {
-                                                        openDoor(USER_OPEN_DOOR_AND_GET_MOVIE, "user first open the door");
-                                                    } else {
-                                                        openDoor(USER_OPEN_DOOR, "user open the door");
-                                                    }
-                                                    break;
-                                                case 20:
-                                                    openDoor(JUST_OPEN_DOOR, "administrator open the door");
-                                                    break;
-                                                case 0:
-                                                    openDoor(JUST_OPEN_DOOR, "get zero none user or administrator open the door");
-                                                    break;
-                                                default:
-                                                    openDoor(JUST_OPEN_DOOR, "none user or administrator open the door");
-                                                    break;
+                                        if (socketResponse.getData() != null) {
+                                            if (socketResponse.getCmd() == OPEN_DOOR) {
+//                                                new SystemUtils().openFtLed(context.getApplicationContext());
+                                                switch (socketResponse.getData().getUser()) {
+                                                    //10用户,20管理员,默认值为0
+                                                    case 10:
+                                                        new SystemUtils().openFtLed(context.getApplicationContext());
+                                                        if (TextUtils.isEmpty(((FangTangApplication) getApplication()).getCurrentPlayUrl())) {
+                                                            LightOperationUtils.open();
+                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
+                                                        }
+                                                        if (socketResponse.getData().getFirst() == 1) {
+//                                                            LightOperationUtils.open();
+//                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
+                                                            sendMessage(USER_OPEN_DOOR_AND_GET_MOVIE, "user first open the door");
+                                                        } else {
+                                                            sendMessage(USER_OPEN_DOOR, "user open the door");
+                                                        }
+                                                        break;
+                                                    case 20:
+                                                        if (TextUtils.isEmpty(((FangTangApplication) getApplication()).getCurrentPlayUrl())) {
+                                                            LightOperationUtils.open();
+                                                            LightOperationUtils.setLightValue(Utils.getInt(context, "brightness", 50));
+                                                        }
+                                                        sendMessage(JUST_OPEN_DOOR, "administrator open the door");
+                                                        break;
+                                                    case 0:
+                                                        sendMessage(JUST_OPEN_DOOR, "get zero none user or administrator open the door");
+                                                        break;
+                                                    default:
+                                                        sendMessage(JUST_OPEN_DOOR, "none user or administrator open the door");
+                                                        break;
+                                                }
+                                            } else if (socketResponse.getCmd() == CLEAN_OVER) {
+                                                LightOperationUtils.close();
+                                                LightOperationUtils.setLightValue(5);
+                                                new SystemUtils().closeFtLed(context.getApplicationContext());
+                                                sendMessage(QrCodeShowActivity.KILL_SELF, "finish the QR CODE activity when clean over");
                                             }
                                         }
                                         break;
                                     default:
                                         Log.d(TAG, "print msg:" + socketResponse.toString());
                                 }
-//                                if (("openDoor").equals(socketResponse.getCmd())) {
+//                                if (("sendMessage").equals(socketResponse.getCmd())) {
 //                                    MessageEvent messageEvent = new MessageEvent();
 //                                    messageEvent.setEventId(JUST_OPEN_DOOR);
 //                                    messageEvent.setMessage("click item");
@@ -318,7 +342,7 @@ public class SocketService extends Service {
         }
     }
-    private void openDoor(int type, String msg) {
+    private void sendMessage(int type, String msg) {
         MessageEvent messageEvent = new MessageEvent();
         messageEvent.setEventId(type);
         messageEvent.setMessage(msg);
--- a/gimiCinema/src/main/java/com/qnbar/smc/utils/LightOperationUtils.java 0 → 100644
View file @26fc740
+++ b/gimiCinema/src/main/java/com/qnbar/smc/utils/LightOperationUtils.java 0 → 100644
View file @26fc740
+package com.qnbar.smc.utils;
+
+import android.util.Log;
+import com.qnbar.smc.service.TelinkLightService;
+
+/**
+ * Created by wugian on 2017/4/27
+ */
+public class LightOperationUtils {
+    public static void setLightValue(int value) {
+        int addr = 0xFFFF;//addr of all
+        //change group brightness or color temperature
+//            addr = 0x8003;
+        byte opcode;
+        byte[] params;
+        opcode = (byte) 0xD2;//brightness
+        params = new byte[]{(byte) value};
+        if (TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true)) {
+            Log.d("LightOperationUtils", "setLightValue success");
+        }
+//        opcode = (byte) 0xE2;//temperature
+//        params = new byte[]{0x05, (byte) value};
+//        TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
+    }
+
+    public static void open() {
+        byte opcode = (byte) 0xD0;
+        int address = 0xFFFF;
+        byte[] params = new byte[]{0x01, 0x00, 0x00};
+        if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
+            Log.d("LightOperationUtils", "open all success");
+        }
+    }
+
+    public static void close() {
+        byte opcode = (byte) 0xD0;
+        int address = 0xFFFF;
+        byte[] params = new byte[]{0x00, 0x00, 0x00};
+        if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
+            Log.d("LightOperationUtils", "close all success");
+        }
+    }
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @26fc740
@@ -238,10 +238,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
         Intent intent = new Intent(this, SocketService.class);
         startService(intent);
-        final long l = (System.currentTimeMillis() / 60000) % (24 * 60) + 480;
-        SimpleDateFormat sdf = new SimpleDateFormat(" yyyy-MM-dd ", Locale.SIMPLIFIED_CHINESE);
-        getTimeByCalendar();
-        presenter.getOrderInfo();
+//        getTimeByCalendar();
+//        presenter.getOrderInfo();
 //        new Handler().postDelayed(new Runnable() {
 //            @Override
 //            public void run() {
@@ -380,30 +378,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void showUnauthorized() {
-//        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-//        builder.setTitle("提示");
-//        String promote = getString(R.string.unauthorized_promote);
-//        if (BuildConfig.MACHINE_TYPE.equals("himedia")) {
-//            promote += "串号：" + SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE);
-//        }
-//        builder.setMessage(promote);
-//        builder.setOnKeyListener(new DialogInterface.OnKeyListener() {
-//            @Override
-//            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-//                return keyCode == KeyEvent.KEYCODE_BACK;
-//            }
-//        });
-//        builder.setCancelable(false);
-//        builder.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-//            @Override
-//            public void onClick(DialogInterface dialog, int which) {
-//                if (Constant.gimiAuth) {
-//                    dialog.dismiss();
-//                } else {
-//                    MainActivity.this.finish();
-//                }
-//            }
-//        }).show();
     }
     @Override
@@ -551,8 +525,11 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", info.getData().getCode()));
     }
+    private RoomInfo roomInfo;
+
     @Override
     public void notifyGetRoomInfo(RoomInfo info) {
+        this.roomInfo = info;
         if (!TextUtils.isEmpty(info.getData().getMac_address())) {
             lockMac = info.getData().getMac_address();
         } else {
@@ -562,6 +539,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void notifyUpdateRoomInfo(RoomInfo info) {
+        this.roomInfo = info;
         if (!TextUtils.isEmpty(info.getData().getMac_address())) {
             lockMac = info.getData().getMac_address();
         } else {
@@ -1067,16 +1045,19 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //                if (info == null || info.getData() == null) {
 //                    break;
 //                }
-                presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn());
+                presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
         }
     }
     private void openDoor() {
-        //open LED
-        new SystemUtils().openFtLed(context);
         Log.d("room-info", "openDoor called");
+        //TODO move to write success if release
+        if (needReport) {
+            handler.postDelayed(reportRunnable, 10 * 1000);
+            Log.d("room-info", "user open door ,report the open success status");
+        }
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
@@ -1090,10 +1071,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 intent.setAction(GREENBluetoothLeService.ACTION_OPEN_SUCCESS);
                 intent.putExtra("openrecord", bleOpenRecord);
                 sendBroadcast(intent);
-                if (needReport) {
-                    handler.postDelayed(reportRunnable, 10 * 1000);
-                    Log.d("room-info", "user open door ,report the open success status");
-                }
+
                 Log.d("room-info", "open success");
             }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @26fc740
@@ -3,16 +3,23 @@ package com.xgimi.gimicinema.activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.ImageView;
+import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.QRCodeUitls;
 import com.google.zxing.WriterException;
 import com.xgimi.gimicinema.R;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 public class QrCodeShowActivity extends Activity {
+    public static final int KILL_SELF = 0x9983;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qr_code_show);
+        EventBus.getDefault().register(this);
+
         final String qr = getIntent().getStringExtra("qr");
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         try {
@@ -21,4 +28,19 @@ public class QrCodeShowActivity extends Activity {
             e.printStackTrace();
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMoonEvent(MessageEvent messageEvent) {
+        switch (messageEvent.getEventId()) {
+            case KILL_SELF:
+                QrCodeShowActivity.this.finish();
+                break;
+        }
+    }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @26fc740
@@ -8,7 +8,7 @@ public interface IRoomInfoModel {
     void getRoomStatus(String roomSn, RoomInfoModelImpl.GetRoomStatusListener listener);
-    void getRoomQrCode(String orderSn, RoomInfoModelImpl.GetRoomQrCodeListener listener);
+    void getRoomQrCode(String orderSn, String roomSn, RoomInfoModelImpl.GetRoomQrCodeListener listener);
     void reportOpenDoorStatus(String orderSn, RoomInfoModelImpl.OpenDoorStatusListener listener);
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @26fc740
@@ -52,7 +52,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomInfo roomInfo1 = null;
-                        Log.d("room-info", "getRoomInfo" +response);
+                        Log.d("room-info", "getRoomInfo" + response);
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomInfo.class);
                         } catch (JsonSyntaxException e) {
@@ -86,7 +86,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomStatusInfo roomInfo1 = null;
-                        Log.d("room-info", "getRoomStatus" +response);
+                        Log.d("room-info", "getRoomStatus" + response);
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomStatusInfo.class);
@@ -105,9 +105,9 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     }
     @Override
-    public void getRoomQrCode(String orderSn, final GetRoomQrCodeListener listener) {
-        Log.d("room-info", "request:getRoomQrCode,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn);
-        OkHttpClientManager.getAsyn(ROOM_QRCODE_BY_ORDER_SN + orderSn,
+    public void getRoomQrCode(String orderSn, String roomSn, final GetRoomQrCodeListener listener) {
+        Log.d("room-info", "request:getRoomQrCode,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn + "&room_sn=" + roomSn);
+        OkHttpClientManager.getAsyn(ROOM_QRCODE_BY_ORDER_SN + orderSn + "&room_sn=" + roomSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
                     public void onError(Request request, Exception e) {
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @26fc740
@@ -281,8 +281,8 @@ public class MainPresenter extends BasePresenter
         });
     }
-    public void getCleanQrCode(String orderSn) {
-        roomInfoModel.getRoomQrCode(orderSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
+    public void getCleanQrCode(String orderSn, String roomSn) {
+        roomInfoModel.getRoomQrCode(orderSn, roomSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
             @Override
             public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
                 Log.d("room-info", "getCleanQrCode#onGetRoomQrCodeSuccess:" + info.toString());
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @26fc740
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @26fc740
@@ -214,32 +214,6 @@ public class CinemaControlService extends Service {
         return cinemaControl;
     }
-//    private boolean isSMCRun(Context context) {
-//        return isServiceRunning(context, "com.qnbar.smc.service.SMCService");
-//    }
-//
-//    private boolean isServiceRunning(Context context, String className) {
-//        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-//        boolean isRunning = false;
-//        List serviceList = activityManager.getRunningServices(2147483647);
-//        if (serviceList.size() <= 0) {
-//            return false;
-//        } else {
-//            Iterator i$ = serviceList.iterator();
-//
-//            while (i$.hasNext()) {
-//                ActivityManager.RunningServiceInfo aServiceList = (ActivityManager.RunningServiceInfo) i$.next();
-//                if (aServiceList.service.getClassName().equals(className)) {
-//                    isRunning = true;
-//                    break;
-//                }
-//            }
-//
-//            Log.i("SystemUtils", "service is running?==" + isRunning);
-//            return isRunning;
-//        }
-//    }
-
     private void open() {
         byte opcode = (byte) 0xD0;
         int address = 0xFFFF;