Merge branch 'master' of gitlab.qnbar.com:pan.li/fangTang

@@ -45,6 +45,7 @@ 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;
@@ -107,6 +108,7 @@ 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;
@@ -238,8 +240,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
         Intent intent = new Intent(this, SocketService.class);
         startService(intent);
-//        getTimeByCalendar();
-
 //        initGetOrderInfo = true;
 //        presenter.getOrderInfo();
 //        new Handler().postDelayed(new Runnable() {
@@ -535,7 +535,10 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo info) {
         this.info = info;
-        startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", info.getData().getCode()));
+        startActivity(new Intent(this, QrCodeShowActivity.class)
+                .putExtra("qr", info.getData().getCode())
+                .putExtra("room_sn", roomInfo.getData().getRoom_sn())
+                .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn()));
     }
 
     private RoomInfo roomInfo;

@@ -4,12 +4,15 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.widget.ImageView;
+
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.QRCodeUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.google.zxing.WriterException;
 import com.qnbar.smc.utils.LightOperationUtils;
 import com.xgimi.gimicinema.R;
+import com.xgimi.gimicinema.presenter.QrCodeShowPresent;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -17,6 +20,7 @@ import org.greenrobot.eventbus.ThreadMode;
 public class QrCodeShowActivity extends Activity {
     public static final int KILL_SELF = 0x9983;
     private Handler handler = new Handler();
+    private QrCodeShowPresent present;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -24,7 +28,11 @@ public class QrCodeShowActivity extends Activity {
         setContentView(R.layout.activity_qr_code_show);
         EventBus.getDefault().register(this);
 
+        present = new QrCodeShowPresent();
+
         final String qr = getIntent().getStringExtra("qr");
+        final String oderSn = getIntent().getStringExtra("order_sn");
+        final String roomSn = getIntent().getStringExtra("room_sn");
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         try {
             iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
@@ -37,6 +45,8 @@ public class QrCodeShowActivity extends Activity {
                 LightOperationUtils.close();
                 LightOperationUtils.setLightValue(5);
                 new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
+                present.reportSleepStatus(oderSn, roomSn);
+                QrCodeShowActivity.this.finish();
             }
         }, 20 * 60 * 1000);
     }
@@ -44,6 +54,7 @@ public class QrCodeShowActivity extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        handler.removeCallbacks(null);
         EventBus.getDefault().unregister(this);
     }
 

@@ -11,4 +11,6 @@ public interface IRoomInfoModel {
     void getRoomQrCode(String orderSn, String roomSn, RoomInfoModelImpl.GetRoomQrCodeListener listener);
 
     void reportOpenDoorStatus(String orderSn, RoomInfoModelImpl.OpenDoorStatusListener listener);
+
+    void reportSleepSysStatus(String orderSn,String roomSn, RoomInfoModelImpl.SleepSysStatusListener listener);
 }

@@ -3,6 +3,7 @@ package com.xgimi.gimicinema.model;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.model.RoomStatusInfo;
@@ -20,31 +21,33 @@ import com.xgimi.gimicinema.application.FangTangApplication;
 public class RoomInfoModelImpl implements IRoomInfoModel {
     //    private static final String roomUrl = "https://ft.qnbar.cn/develop/api/";
     private static String roomUrl = "https://ft.qnbar.cn/test/api/";
-    private static final String FT_ROOT_URL = "https://ft.qnbar.cn/test/api/";
+    private static final String FT_ROOT_TEST_URL = "https://ft.qnbar.cn/test/api/";
     private static final String FT_ROOT_DEVELOP_URL = "https://ft.qnbar.cn/develop/api/";
     private static String ROOM_INFO_BY_IMEI_URL = roomUrl + "tcp/getRoomInfoByimei?imei=";
     private static String ROOM_STATUS_BY_ROOM_SN_URL = roomUrl + "tcp/getRoomStatus?room_sn=";
     private static String ROOM_QRCODE_BY_ORDER_SN = roomUrl + "tcp/getEndQRCode?order_sn=";
     private static String ROOM_REPORT_ROOM_STATUS = roomUrl + "tcp/reportRoomStatus?order_sn=";
+    private static String ROOM_REPORT_SLEEP_STATUS = roomUrl + "tcp/recvSleepCmdTimeout?order_sn=";
 
     public RoomInfoModelImpl() {
         Context applicationContext = FangTangApplication.getInstance().getApplicationContext();
         int ftTest = Utils.getInt(applicationContext, "ft-test", 0);
         switch (ftTest) {
             case 0:
-                roomUrl = FT_ROOT_URL;
+                roomUrl = FT_ROOT_TEST_URL;
                 break;
             case 1:
                 roomUrl = FT_ROOT_DEVELOP_URL;
                 break;
             case 2:
-                roomUrl = FT_ROOT_URL;
+                roomUrl = FT_ROOT_TEST_URL;
                 break;
         }
         ROOM_INFO_BY_IMEI_URL = roomUrl + "tcp/getRoomInfoByimei?imei=";
         ROOM_STATUS_BY_ROOM_SN_URL = roomUrl + "tcp/getRoomStatus?room_sn=";
         ROOM_QRCODE_BY_ORDER_SN = roomUrl + "tcp/getEndQRCode?order_sn=";
         ROOM_REPORT_ROOM_STATUS = roomUrl + "tcp/reportRoomStatus?order_sn=";
+        ROOM_REPORT_SLEEP_STATUS = roomUrl + "tcp/recvSleepCmdTimeout?order_sn=";
     }
 
     @Override
@@ -179,6 +182,25 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                 });
     }
 
+    @Override
+    public void reportSleepSysStatus(String orderSn, String roomSn, final SleepSysStatusListener listener) {
+        Log.d("room-info", "request:reportSleepSysStatus,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn);
+        OkHttpClientManager.getAsyn(ROOM_REPORT_SLEEP_STATUS + orderSn + "&room_sn=" + roomSn,
+                new OkHttpClientManager.ResultCallback<String>() {
+                    @Override
+                    public void onError(Request request, Exception e) {
+                        Log.d("room-info", request.toString() + "," + e.getMessage());
+                        listener.onSleepSuccess();
+                    }
+
+                    @Override
+                    public void onResponse(String response) {
+                        Log.d("room-info", "reportSleepSysStatus:" + response);
+                        listener.onSleepFailure();
+                    }
+                });
+    }
+
     public interface GetRoomInfoListener {
         void onGetRoomInfoSuccess(RoomInfo info);
 
@@ -204,4 +226,10 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
 
         void onOpenDoorFailure();
     }
+
+    public interface SleepSysStatusListener {
+        void onSleepSuccess();
+
+        void onSleepFailure();
+    }
 }

@@ -93,13 +93,13 @@ public class MainPresenter extends BasePresenter
         mountSamba(context);
         loadRecommend(context);
         loadClassification(context);
-        getVideoAdsPath(context);
+//        getVideoAdsPath(context);
 
-        updatePoster(context);
-        updateVideoInfo(context);
-        updateAgentInfo(context);
+//        updatePoster(context);
+//        updateVideoInfo(context);
+//        updateAgentInfo(context);
         updateAppVersion(context);
-        updateClazz(context);
+//        updateClazz(context);
         updateDb(context);
         updateRoomInfo(context);
 //        mainView.showMsg("abc");

+package com.xgimi.gimicinema.presenter;
+
+import android.util.Log;
+
+import com.xgimi.gimicinema.model.IRoomInfoModel;
+import com.xgimi.gimicinema.model.RoomInfoModelImpl;
+
+/**
+ * Created by wugian on 2017/5/2
+ */
+
+public class QrCodeShowPresent {
+    IRoomInfoModel roomInfoModel;
+
+    public QrCodeShowPresent() {
+        roomInfoModel = new RoomInfoModelImpl();
+    }
+
+    public void reportSleepStatus(String orderSn, String roomSn) {
+        roomInfoModel.reportSleepSysStatus(orderSn, roomSn, new RoomInfoModelImpl.SleepSysStatusListener() {
+            @Override
+            public void onSleepSuccess() {
+                Log.d("room-info", "onSleepSuccess");
+            }
+
+            @Override
+            public void onSleepFailure() {
+                Log.d("room-info", "onSleepFailure");
+            }
+        });
+    }
+}

@@ -76,7 +76,15 @@ public class CinemaControlService extends Service {
             currentPosition = duration;
             if (saveBeat-- <= 0) {
                 //TODO 保存当前进度,需要时从保存位置开始播放,取消播放器播放记录功能
+                //TODO 播放一段时间确保状态为关闭
                 saveBeat = SAVE_BEAT;
+                try {
+                    if (Lights.getInstance().getByMeshAddress(((FangTangApplication)getApplication()).getConnectDevice().meshAddress).status== ConnectionStatus.ON) {
+                        fadeOut();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }