wfsdf

李攀
1 parent 6c745e31
Showing 12 changed files with 192 additions and 55 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomQrCodeInfo.java
gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/ResUtils.java
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlContract.java
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.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/service/CountService.java
gimiCinema/src/main/res/values/strings.xml
--- a/gimiCinema/build.gradle
View file @0bc9e82
+++ b/gimiCinema/build.gradle
View file @0bc9e82
@@ -11,8 +11,8 @@ def isWindows = {
 }
 ext {
-    APP_VERSION_CODE = 5;
-    APP_VERSION_NAME = "v2.2-0606";
+    APP_VERSION_CODE = 6;
+    APP_VERSION_NAME = "v2.3-0608";
 }
 android {
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomQrCodeInfo.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomQrCodeInfo.java
View file @0bc9e82
@@ -18,6 +18,7 @@ public class RoomQrCodeInfo extends BaseModel {
     public static class DataEntity {
         private String code;
+        private String room_sn;
         public String getCode() {
             return code;
@@ -27,10 +28,19 @@ public class RoomQrCodeInfo extends BaseModel {
             this.code = code;
         }
+        public String getRoom_sn() {
+            return room_sn;
+        }
+
+        public void setRoom_sn(String room_sn) {
+            this.room_sn = room_sn;
+        }
+
         @Override
         public String toString() {
             return "DataEntity{" +
                     "code='" + code + '\'' +
+                    ", room_sn='" + room_sn + '\'' +
                     '}';
         }
     }
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
View file @0bc9e82
@@ -22,6 +22,7 @@ public class RoomStatusInfo extends BaseModel {
         private int end_time;
         private int status;
         private String film_hash;
+        private String film_name;
         private int now_time;
         public String getOrder_sn() {
@@ -64,6 +65,14 @@ public class RoomStatusInfo extends BaseModel {
             this.film_hash = film_hash;
         }
+        public String getFilm_name() {
+            return film_name;
+        }
+
+        public void setFilm_name(String film_name) {
+            this.film_name = film_name;
+        }
+
         public int getNow_time() {
             return now_time;
         }
@@ -80,6 +89,7 @@ public class RoomStatusInfo extends BaseModel {
                     ", end_time=" + end_time +
                     ", status=" + status +
                     ", film_hash='" + film_hash + '\'' +
+                    ", film_name='" + film_name + '\'' +
                     ", now_time=" + now_time +
                     '}';
         }
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/ResUtils.java 0 → 100644
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/ResUtils.java 0 → 100644
View file @0bc9e82
+package com.gimi.common.cinema.utils;
+
+import android.content.Context;
+
+/**
+ * Created by wugian on 2017/6/12.
+ */
+
+public class ResUtils {
+    public static String getResResult(Context context, int... resIds) {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int resId : resIds) {
+            stringBuilder.append(context.getString(resId));
+        }
+        return stringBuilder.toString();
+    }
+}
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlContract.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlContract.java
View file @0bc9e82
@@ -57,5 +57,7 @@ public interface SmartControlContract {
         void getCleanQrCode(String orderSn, String roomSn);
         void getSysTime(Context context);
+
+        void getNextOrderInfo(Context context, String roomSn);
     }
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0bc9e82
@@ -122,6 +122,23 @@ public class SmartControlPresenter implements SmartControlContract.Presenter {
         });
     }
+
+    @Override
+    public void getNextOrderInfo(Context context, String roomSn) {
+        roomInfoModel.getRoomNestOrderInfo(roomSn, new RoomInfoModelImpl.GetRoomStatusListener() {
+            @Override
+            public void onGetRoomStatusSuccess(RoomStatusInfo info) {
+                LogUtils.i("room-info", "onGetRoomStatusSuccess:" + info.toString());
+                mainView.updateOrderInfo(info);
+            }
+
+            @Override
+            public void onGetRoomStatusFailure(WrongMsg wrongMsg) {
+                LogUtils.i("room-info", "onGetRoomStatusFailure:" + wrongMsg.toString());
+            }
+        });
+    }
+
     @Override
     public void reportOpenDoorStatus(String oderSn) {
         roomInfoModel.reportOpenDoorStatus(oderSn, new RoomInfoModelImpl.OpenDoorStatusListener() {
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0bc9e82
@@ -29,6 +29,7 @@ import com.gimi.common.cinema.utils.ActivityCollector;
 import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.OpenMMUtils;
+import com.gimi.common.cinema.utils.ResUtils;
 import com.gimi.common.cinema.utils.SambaFileCharge;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
@@ -51,6 +52,7 @@ import com.telink.bluetooth.light.Parameters;
 import com.telink.bluetooth.light.model.Mesh;
 import com.telink.util.Event;
 import com.telink.util.EventListener;
+import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.activity.AdsPreVideoPlayerActivity;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
 import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
@@ -68,6 +70,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     public static final int ORDER_PLAY_COMPLETE = 0x1101;
+    private Context mContext;
     private boolean hasSystemFeatureBluetoothLe = true;
     private BLEBroadcastReceiver bleBroadcastReceiver = new BLEBroadcastReceiver();
     private SmartControlContract.Presenter presenter;
@@ -102,6 +105,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
+        mContext = this;
         new SmartControlPresenter(this);
         mApplication = (FangTangApplication) getApplication();
         mApplication.doInit();
@@ -331,23 +335,35 @@ public class SmartControlService extends BaseService implements EventListener<St
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intent);
                 roomStatusInfo = null;
-//                if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
-//                    if (System.currentTimeMillis() - lastRequest > 3000) {
-//                        lastRequest = System.currentTimeMillis();
-//                        countMsg = messageEvent.getMessage();
-//                        presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
-//                    }
-//                } else {
-//                    String msg = "roomStatusInfo is Null:" + (roomStatusInfo == null) +
-//                            ",roomInfo is Null:" + (roomInfo == null);
-//                    Log.d("room-info", msg);
-//                    Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
-//                }
+                if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
+                    if (System.currentTimeMillis() - lastRequest > 3000) {
+                        lastRequest = System.currentTimeMillis();
+                        countMsg = messageEvent.getMessage();
+                        presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
+                    }
+                } else {
+                    String msg = "roomStatusInfo is Null:" + (roomStatusInfo == null) +
+                            ",roomInfo is Null:" + (roomInfo == null);
+                    Log.d("room-info", msg);
+                    Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+                }
                 break;
             case ORDER_PLAY_COMPLETE:
+                if (roomStatusInfo != null && roomStatusInfo.getData() != null & roomInfo != null && roomInfo.getData() != null) {
+                    if (System.currentTimeMillis() - lastRequest > 3000) {
+                        lastRequest = System.currentTimeMillis();
+                        countMsg = messageEvent.getMessage();
+                        presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn(), roomInfo.getData().getRoom_sn());
+                    }
+                } else {
+                    String msg = "roomStatusInfo is Null:" + (roomStatusInfo == null) +
+                            ",roomInfo is Null:" + (roomInfo == null);
+                    Log.i("room-info", msg);
+                    Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+                }
                 LogUtils.i("room-info", messageEvent.getMessage());
                 Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
-                playEndAds();
+//                playEndAds();
                 break;
             default:
                 Log.d("room-info", messageEvent.getMessage());
@@ -597,20 +613,23 @@ public class SmartControlService extends BaseService implements EventListener<St
         if (!TextUtils.isEmpty(data.getFilm_hash())) {
             localMovieMessages = new NewDBManager(this).queryPlayMovie(data.getFilm_hash());
             if (localMovieMessages == null) {
-                show("电影信息出错,找不到相关电影");
                 LogUtils.e("room-info", "file not exists:" + orderInfo.toString());
-                if (offset > 3) {
-                    CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影信息,请联系客服", 90 * 1000).show();
-                } else {
-                    CToast.makeText(this, "没有找到电影信息,请联系客服", 90 * 1000).show();
-                }
+                CToast.makeText(this, "没有找到电影信息,请联系客服", 90 * 1000).show();
             }
         }
         if (localMovieMessages != null) {
-            if (offset > 3) {
-                CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间", 100 * 1000).show();
-            }
             LogUtils.i("room-info", "play movie" + localMovieMessages.toString());
+            String showMsg;
+            if (offset > 0) {
+                showMsg = String.format(ResUtils.getResResult(mContext,
+                        R.string.welcome, R.string.ads_promote,
+                        R.string.delay_time_fill_time,
+                        R.string.play_movie_fill_name),
+                        offset, roomStatusInfo.getData().getFilm_name());
+            } else {
+                showMsg = String.format(ResUtils.getResResult(mContext, R.string.welcome, R.string.ads_promote, R.string.play_movie_fill_name), roomStatusInfo.getData().getFilm_name());
+            }
+            CToast.makeText(this, showMsg, 100 * 1000).show();
             OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null);
         } else {
             LogUtils.e("room-info", "file not exists:" + orderInfo.toString());
@@ -621,15 +640,24 @@ public class SmartControlService extends BaseService implements EventListener<St
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo qrCodeInfo) {
         this.info = qrCodeInfo;
-        Intent intent = new Intent(this, QrCodeShowActivity.class)
-                .putExtra("qr", info.getData().getCode())
-                .putExtra("room_sn", roomInfo.getData().getRoom_sn())
-                .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
-        if ("count_service".equals(countMsg)) {
-            intent.putExtra("count_call", true);
+        if (info != null && info.getData() != null && TextUtils.isEmpty(info.getData().getRoom_sn())) {
+            LogUtils.i(TAG, "order_sn is null,play end ads");
+            playEndAds();
+//            Intent intent = new Intent(this, QrCodeShowActivity.class)
+//                    .putExtra("qr", info.getData().getCode())
+//                    .putExtra("room_sn", roomInfo.getData().getRoom_sn())
+//                    .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
+//            if ("count_service".equals(countMsg)) {
+//                intent.putExtra("count_call", true);
+//            }
+//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//            startActivity(intent);
+        } else {
+            LogUtils.i(TAG, "order_sn not null:" + qrCodeInfo.toString());
+            String showMsg = ResUtils.getResResult(mContext, R.string.ads_promote, R.string.play_next_fill_name);
+            CToast.makeText(mContext, showMsg, 30 * 1000).show();
+            presenter.getNextOrderInfo(SmartControlService.this, info.getData().getRoom_sn());
         }
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
     }
     @Override
@@ -656,6 +684,10 @@ public class SmartControlService extends BaseService implements EventListener<St
             return;
         }
         if (roomStatusInfo != null && roomStatusInfo.getData() != null && roomInfo != null && roomInfo.getData() != null) {
+            if (Constant.count > 30) {
+                String showMsg = ResUtils.getResResult(mContext, R.string.ads_promote, R.string.end_ads);
+                CToast.makeText(mContext, showMsg, 30 * 1000).show();
+            }
             Intent intentAds = new Intent(this.getApplicationContext(), SimpleAdsPlayer2.class);
             intentAds.putExtra("ads_path", adsVideoPath);
             intentAds
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0bc9e82
@@ -228,7 +228,6 @@ public class SocketService1 extends BaseService {
             LogUtils.i(TAG, "send msg:" + msg);
         } else {
             if (heartBeatErrorCount.getAndIncrement() > 3) {
-//            if (heartBeatErrorCount.getAndDecrement() >= 0) {
                 LogUtils.i(TAG, "heartBeatErrorCount:" + heartBeatErrorCount.get());
                 clearConnect();
                 return false;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @0bc9e82
@@ -10,6 +10,8 @@ public interface IRoomInfoModel {
     void getRoomStatus(String roomSn, RoomInfoModelImpl.GetRoomStatusListener listener);
+    void getRoomNestOrderInfo(String orderSn, RoomInfoModelImpl.GetRoomStatusListener 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 @0bc9e82
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @0bc9e82
@@ -2,11 +2,11 @@ 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;
 import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.gimi.common.cinema.utils.OkHttpClientManager;
 import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
@@ -31,6 +31,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     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=";
+    private static String ROOM_NEXT_STATUS_BY_ROOM_SN = roomUrl + "tcp/getRoomStatusByOrderSN?order_sn=";
     public RoomInfoModelImpl() {
         Context applicationContext = FangTangApplication.getInstance().getApplicationContext();
@@ -51,6 +52,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
         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=";
+        ROOM_NEXT_STATUS_BY_ROOM_SN = roomUrl + "tcp/getRoomStatusByOrderSN?order_sn=";
     }
     @Override
@@ -67,7 +69,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
             }
         }
-        Log.d("room-info", "request:getRoomInfo,url = " + ROOM_INFO_BY_IMEI_URL + imei);
+        LogUtils.i("room-info", "request:getRoomInfo,url = " + ROOM_INFO_BY_IMEI_URL + imei);
         OkHttpClientManager.getAsyn(ROOM_INFO_BY_IMEI_URL + imei,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
@@ -80,7 +82,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomInfo roomInfo1 = null;
-                        Log.d("room-info", "getRoomInfo" + response);
+                        LogUtils.i("room-info", "getRoomInfo" + response);
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomInfo.class);
                         } catch (JsonSyntaxException e) {
@@ -105,12 +107,10 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
             @Override
             public void doSomeThing() {
                 long time = -1;
-                Log.d("room-info", "request:getRoomInfo,url = " + ROOM_INFO_BY_IMEI_URL + imei);
+                LogUtils.i("room-info", "request:getRoomInfo,url = " + ROOM_INFO_BY_IMEI_URL + imei);
                 try {
                     time = OkHttpClientManager.getSysTime(ROOM_INFO_BY_IMEI_URL + imei);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (ParseException e) {
+                } catch (IOException | ParseException e) {
                     e.printStackTrace();
                 }
                 if (time != -1) {
@@ -120,13 +120,11 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                 }
             }
         });
-
-
     }
     @Override
     public void getRoomStatus(String roomSn, final GetRoomStatusListener listener) {
-        Log.d("room-info", "request:getRoomStatus,url = " + ROOM_STATUS_BY_ROOM_SN_URL + roomSn);
+        LogUtils.i("room-info", "request:getRoomStatus,url = " + ROOM_STATUS_BY_ROOM_SN_URL + roomSn);
         OkHttpClientManager.getAsyn(ROOM_STATUS_BY_ROOM_SN_URL + roomSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
@@ -139,8 +137,41 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomStatusInfo roomInfo1 = null;
-                        Log.d("room-info", "getRoomStatus" + response);
+                        LogUtils.i("room-info", "getRoomStatus" + response);
+
+                        try {
+                            roomInfo1 = new Gson().fromJson(response, RoomStatusInfo.class);
+                        } catch (JsonSyntaxException e) {
+                            e.printStackTrace();
+                        }
+                        if (roomInfo1 != null) {
+                            listener.onGetRoomStatusSuccess(roomInfo1);
+                        } else {
+                            WrongMsg wrongMsg = new WrongMsg();
+                            wrongMsg.setMsg(response);
+                            listener.onGetRoomStatusFailure(wrongMsg);
+                        }
+                    }
+                });
+    }
+
+
+    @Override
+    public void getRoomNestOrderInfo(String orderSn, final GetRoomStatusListener listener) {
+        LogUtils.i("room-info", ROOM_NEXT_STATUS_BY_ROOM_SN + orderSn);
+        OkHttpClientManager.getAsyn(ROOM_NEXT_STATUS_BY_ROOM_SN + orderSn,
+                new OkHttpClientManager.ResultCallback<String>() {
+                    @Override
+                    public void onError(Request request, Exception e) {
+                        WrongMsg wrongMsg = new WrongMsg();
+                        wrongMsg.setMsg(e.getMessage());
+                        listener.onGetRoomStatusFailure(wrongMsg);
+                    }
+                    @Override
+                    public void onResponse(String response) {
+                        RoomStatusInfo roomInfo1 = null;
+                        LogUtils.i("room-info", "getRoomStatus" + response);
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomStatusInfo.class);
                         } catch (JsonSyntaxException e) {
@@ -159,7 +190,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     @Override
     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);
+        LogUtils.i("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
@@ -171,7 +202,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
-                        Log.d("room-info", "getRoomQrCode:" + response);
+                        LogUtils.i("room-info", "getRoomQrCode:" + response);
                         RoomQrCodeInfo roomInfo1 = null;
                         try {
@@ -193,18 +224,18 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     @Override
     public void reportOpenDoorStatus(String orderSn, final OpenDoorStatusListener listener) {
-        Log.d("room-info", "request:reportOpenDoorStatus,url = " + ROOM_REPORT_ROOM_STATUS + orderSn);
+        LogUtils.i("room-info", "request:reportOpenDoorStatus,url = " + ROOM_REPORT_ROOM_STATUS + orderSn);
         OkHttpClientManager.getAsyn(ROOM_REPORT_ROOM_STATUS + orderSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
                     public void onError(Request request, Exception e) {
-                        Log.d("room-info", request.toString() + "," + e.getMessage());
+                        LogUtils.i("room-info", request.toString() + "," + e.getMessage());
                         listener.onOpenDoorFailure();
                     }
                     @Override
                     public void onResponse(String response) {
-                        Log.d("room-info", "reportOpenDoorStatus:" + response);
+                        LogUtils.i("room-info", "reportOpenDoorStatus:" + response);
                         listener.onOpenDoorSuccess();
                     }
                 });
@@ -212,18 +243,18 @@ 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);
+        LogUtils.i("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());
+                        LogUtils.i("room-info", request.toString() + "," + e.getMessage());
                         listener.onSleepSuccess();
                     }
                     @Override
                     public void onResponse(String response) {
-                        Log.d("room-info", "reportSleepSysStatus:" + response);
+                        LogUtils.i("room-info", "reportSleepSysStatus:" + response);
                         listener.onSleepFailure();
                     }
                 });
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CountService.java
View file @0bc9e82
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CountService.java
View file @0bc9e82
@@ -19,10 +19,15 @@ package com.xgimi.gimicinema.service;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
+import android.text.TextUtils;
 import android.util.Log;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.MessageEvent;
+import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.LogUtils;
+import com.gimi.common.cinema.utils.ResUtils;
+import com.xgimi.gimicinema.R;
+import com.xgimi.gimicinema.application.FangTangApplication;
 import org.greenrobot.eventbus.EventBus;
 import static com.gimi.common.cinema.model.Constant.count;
@@ -45,6 +50,16 @@ public class CountService extends Service {
         LogUtils.d(TAG, "count is :" + count);
         if (Constant.count > 0) {
             Log.d(TAG, "if");
+            if (Constant.count == 5) {
+                String showMsg = ResUtils.getResResult(this, R.string.ads_promote, R.string.welcome_again);
+                CToast.makeText(this, showMsg, 30 * 1000).show();
+            }
+            if (Constant.count == 10) {
+                if (!TextUtils.isEmpty(((FangTangApplication) getApplicationContext()).getCurrentPlayUrl())) {
+                    String showMsg = ResUtils.getResResult(this, R.string.ads_promote, R.string.time_ends_ten_min);
+                    CToast.makeText(this, showMsg, 30 * 1000).show();
+                }
+            }
             new CountDownThread().start();
         } else {
             Log.d(TAG, "else");
--- a/gimiCinema/src/main/res/values/strings.xml
View file @0bc9e82
+++ b/gimiCinema/src/main/res/values/strings.xml
View file @0bc9e82
@@ -106,11 +106,13 @@
     <string name="pre_ads_times">映前广告次数</string>
     <string name="set_sm_light">设置智能灯光</string>
+    <string name="welcome">欢迎您的光临。</string>
     <string name="ads_promote">青柠影咖，年轻人的奇幻乐园。</string>
-    <string name="delay_time">您已迟到%d分钟，</string>
-    <string name="play_movie">即将为你播放%s</string>
+    <string name="delay_time_fill_time">您已迟到%d分钟，</string>
+    <string name="play_movie_fill_name">即将为你播放%s</string>
     <string name="end_ads">本场电影已结束，请观看《青柠电影先锋》</string>
     <string name="welcome_again">离场时请携带好随身物品，欢迎下次光临。</string>
-    <string name="play_next">本场电影已结束，将于广告后为您播放下一部影片%s</string>
+    <string name="play_next_fill_name">本场电影已结束，即将为您播放下一部影片</string>
+    <string name="time_ends_ten_min">距观景时间结束还有10分钟。</string>
 </resources>