流程部分异常处理，二维码更新功能

李攀
1 parent 55b014ef
Showing 19 changed files with 523 additions and 130 deletions
gimiCinema/build.gradle
gimiCinema/src/main/AndroidManifest.xml
gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.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/activity/QrCodeShowActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.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/mview/IUpdateQrCodeView.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/QrCodeShowPresent.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/UpdateQrCodePresenter.java
gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/AppInstalledReceiver.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/MovieCompleteReceiver.java
gimiCinema/src/main/res/layout/a_ads_player2.xml
gimiCinema/src/main/res/values/strings.xml
--- a/gimiCinema/build.gradle
View file @0612c99
+++ b/gimiCinema/build.gradle
View file @0612c99
@@ -11,8 +11,8 @@ def isWindows = {
 }
 ext {
-    APP_VERSION_CODE = 1;
-    APP_VERSION_NAME = "v1.0";
+    APP_VERSION_CODE = 2;
+    APP_VERSION_NAME = "v2.0";
 }
 android {
--- a/gimiCinema/src/main/AndroidManifest.xml
View file @0612c99
+++ b/gimiCinema/src/main/AndroidManifest.xml
View file @0612c99
@@ -19,6 +19,9 @@
             tools:ignore="ProtectedPermissions"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <action android:name="android.intent.action.PACKAGE_ADDED"/>
+    <action android:name="android.intent.action.PACKAGE_REMOVED"/>
+    <action android:name="android.intent.action.PACKAGE_REPLACED"/>
     <!--
     windows not support lable replace by gradle,just replace by string values
@@ -85,6 +88,28 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
+        <receiver android:enabled="true" android:exported="true" android:name=".receiver.AppInstalledReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_ADDED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_INSTALL"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_CHANGED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+                <data android:scheme="package"/>
+            </intent-filter>
+        </receiver>
         <receiver android:name=".service.MovieCompleteReceiver">
             <intent-filter>
                 <action android:name="com.xgimi.gimicinema.get_data.movie_complete"/>
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OkHttpClientManager.java
View file @0612c99
@@ -173,6 +173,7 @@ public class OkHttpClientManager {
 //        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date parse = new Date(date);
         return parse.getTime() / 1000;
+
     }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlContract.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlContract.java
View file @0612c99
@@ -40,6 +40,10 @@ public interface SmartControlContract {
         void updateOrderInfo(RoomStatusInfo oderInfo);
         void prepareRoomQrCodeInfo(RoomQrCodeInfo qrCodeInfo);
+
+        void updateInitGetOrderInfo(boolean b);
+
+        void setOpenDoorTime(int i);
     }
     interface Presenter extends BasePresenter {
@@ -51,5 +55,7 @@ public interface SmartControlContract {
         void reportOpenDoorStatus(String oderSn);
         void getCleanQrCode(String orderSn, String roomSn);
+
+        void getSysTime(Context context);
     }
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlPresenter.java
View file @0612c99
@@ -14,6 +14,8 @@ import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.model.IRoomInfoModel;
 import com.xgimi.gimicinema.model.RoomInfoModelImpl;
+import java.util.Calendar;
+
 /**
  * Created by zyh on 2017/5/19
  */
@@ -96,11 +98,13 @@ public class SmartControlPresenter implements SmartControlContract.Presenter {
                     public void onGetRoomStatusSuccess(RoomStatusInfo info) {
                         Log.d("room-info", "getOrderInfo#onGetRoomStatusSuccess:" + info.toString());
                         mainView.updateOrderInfo(info);
+                        mainView.updateInitGetOrderInfo(false);
                     }
                     @Override
                     public void onGetRoomStatusFailure(WrongMsg wrongMsg) {
                         Log.d("room-info", "onGetRoomStatusFailure :" + wrongMsg.toString());
+                        mainView.updateInitGetOrderInfo(false);
                     }
                 });
             }
@@ -149,4 +153,36 @@ public class SmartControlPresenter implements SmartControlContract.Presenter {
             }
         });
     }
+
+    @Override
+    public void getSysTime(Context context) {
+        String imei = SystemUtils.getPid(context, BuildConfig.BUILD_TYPE);
+        roomInfoModel.getRoomSysTime(imei, new RoomInfoModelImpl.GetServerTimeListener() {
+            @Override
+            public void onGetTimeSuccess(long time) {
+                Calendar instance = Calendar.getInstance();
+                instance.setTimeInMillis(time * 1000);
+                int hour = instance.get(Calendar.HOUR_OF_DAY);
+                int minute = instance.get(Calendar.MINUTE);
+                Log.d("getSysTime", "current minute:" + (hour * 60 + minute) + "");
+                mainView.setOpenDoorTime(hour * 60 + minute);
+            }
+
+            @Override
+            public void onGetTimeFailure(WrongMsg wrongMsg) {
+                Log.d("getSysTime", calServerTimeMin() + "");
+                mainView.setOpenDoorTime(calServerTimeMin());
+
+            }
+        });
+    }
+
+    private int calServerTimeMin() {
+        Calendar cal = Calendar.getInstance();
+        int hour = cal.get(Calendar.HOUR_OF_DAY);//小时
+        int minute = cal.get(Calendar.MINUTE);//分
+        int serverTimeMin = (hour * 60 + minute);
+        Log.d("room-info", "current minute:" + (hour * 60 + minute) + "");
+        return serverTimeMin;
+    }
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @0612c99
@@ -6,6 +6,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.IBinder;
@@ -23,8 +24,14 @@ import com.gimi.common.cinema.model.MessageEvent;
 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.SambaMsg;
+import com.gimi.common.cinema.utils.ActivityCollector;
 import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.OpenMMUtils;
+import com.gimi.common.cinema.utils.SambaFileCharge;
+import com.gimi.common.cinema.utils.Utils;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
 import com.telink.bluetooth.LeBluetooth;
@@ -43,7 +50,9 @@ 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.activity.AdsPreVideoPlayerActivity;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
+import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.poll.PollingUtils;
 import com.xgimi.gimicinema.service.CountService;
@@ -56,6 +65,8 @@ import java.util.List;
 public class SmartControlService extends BaseService implements EventListener<String>, SmartControlContract.View {
     public static final String TAG = "SmartControlService";
+    public static final int ORDER_PLAY_COMPLETE = 0x1101;
+
     private boolean hasSystemFeatureBluetoothLe = true;
     private BLEBroadcastReceiver bleBroadcastReceiver = new BLEBroadcastReceiver();
     private SmartControlContract.Presenter presenter;
@@ -63,10 +74,12 @@ public class SmartControlService extends BaseService implements EventListener<St
     private RoomStatusInfo roomStatusInfo;
     private RoomInfo roomInfo;
     private RoomQrCodeInfo info;
-
     private String lockMac = "CA:EC:56:60:CA:79";
     private boolean needReport = false;
     //___________________________________________
+    private boolean initGetOderInfo;
+    private RoomStatusInfo lastCompleteRoomStatusInfo;
+    private int openDoorServerTime = 0;
     private void initLock() {
         // 检查当前手机是否支持ble 蓝牙,如果不支持退出程序
@@ -78,6 +91,7 @@ public class SmartControlService extends BaseService implements EventListener<St
         }
     }
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -111,6 +125,7 @@ public class SmartControlService extends BaseService implements EventListener<St
         if (!LeBluetooth.getInstance().isEnabled()) {
             LeBluetooth.getInstance().enable(getApplicationContext());
         }
+        updateLastCompleteMovieInfo();
         // 监听各种事件
         mApplication.addEventListener(DeviceEvent.STATUS_CHANGED, this);
@@ -125,9 +140,19 @@ public class SmartControlService extends BaseService implements EventListener<St
             }
         }, 3 * 1000);
         presenter.updateRoomInfo(this);
+//        presenter.getOrderInfo(this);
         return START_STICKY;
     }
+    private void updateLastCompleteMovieInfo() {
+        try {
+            lastCompleteRoomStatusInfo = new Gson().fromJson(Utils.getString(this, "oder-play-completed"), RoomStatusInfo.class);
+        } catch (JsonSyntaxException e) {
+            e.printStackTrace();
+        }
+        Log.d("room-info", "lastCompleteRoomStatusInfo null:" + (lastCompleteRoomStatusInfo == null));
+    }
+
     @Override
     public void onDestroy() {
         Log.d("room-info", "SmartControlService onDestroy");
@@ -173,6 +198,8 @@ public class SmartControlService extends BaseService implements EventListener<St
     };
     private void openDoor() {
+        updateLastCompleteMovieInfo();
+        presenter.getSysTime(this);
         Log.d("room-info", "openDoor called");
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
@@ -202,8 +229,39 @@ public class SmartControlService extends BaseService implements EventListener<St
     public void onMoonEvent(MessageEvent messageEvent) {
         switch (messageEvent.getEventId()) {
             case SocketService.JUST_OPEN_DOOR:
+                //check qr code is showing
                 openDoor();
+                if (ActivityCollector.isActivityExist(QrCodeShowActivity.class)
+                        || ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)
+                        || !TextUtils.isEmpty(((FangTangApplication) FangTangApplication.getInstance()).getCurrentPlayUrl())) {
+                    break;
+                }
                 Log.d("event bus", "open door" + messageEvent.getMessage());
+                //异常2清理时段管理扫码进入，没有显示清洁码
+                if (messageEvent.getMessage().startsWith("administrator")) {
+                    if (roomStatusInfo != null) {
+                        int spaceTime = openDoorServerTime - roomStatusInfo.getData().getEnd_time();
+                        if (spaceTime < 20 && spaceTime > 0) {
+                            if (!ActivityCollector.isActivityExist(QrCodeShowActivity.class)) {
+                                Intent intent = new Intent(this, QrCodeShowActivity.class)
+                                        .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);
+                                break;
+                            }
+                            //异常3 观景时段内 没有放电影
+                            if (roomStatusInfo.getData().getEnd_time() > openDoorServerTime
+                                    && openDoorServerTime > roomStatusInfo.getData().getBegin_time()
+                                    && TextUtils.isEmpty(((FangTangApplication) FangTangApplication.getInstance()).getCurrentPlayUrl())) {
+                                presenter.getOrderInfo(this);
+                            }
+                        }
+                    }
+                }
                 break;
             case SocketService.USER_OPEN_DOOR_AND_GET_MOVIE:
                 needReport = true;
@@ -217,6 +275,11 @@ public class SmartControlService extends BaseService implements EventListener<St
 //                if (rightSn) {
 //                    down();
 //                }
+                //用户时段已在播放映后广告，不再获取订单信息
+                if (ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)
+                        || ActivityCollector.isActivityExist(AdsPreVideoPlayerActivity.class)) {
+                    break;
+                }
                 //check the movie
                 if (TextUtils.isEmpty(mApplication.getCurrentPlayUrl())) {
                     presenter.getOrderInfo(this);
@@ -251,19 +314,41 @@ public class SmartControlService extends BaseService implements EventListener<St
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                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 (ActivityCollector.isActivityExist(SimpleAdsPlayer2.class)) {
+                    ActivityCollector.getActivity(SimpleAdsPlayer2.class).finish();
+                }
+//                cc
+                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);
+                roomStatusInfo = null;
+                Log.d("room-info", "into clean activity clear oder info");
+//                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:
+                Log.d("room-info", messageEvent.getMessage());
+                Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
+                playEndAds();
+                break;
+            default:
+                Log.d("room-info", messageEvent.getMessage());
         }
     }
@@ -485,7 +570,6 @@ public class SmartControlService extends BaseService implements EventListener<St
     public void updateOrderInfo(RoomStatusInfo orderInfo) {
         this.roomStatusInfo = orderInfo;
         Log.d("room-info", "update order info");
-        roomStatusInfo = orderInfo;
         RoomStatusInfo.DataEntity data = orderInfo.getData();
         int offset = data.getNow_time() - data.getBegin_time();
         if (offset > 3) {
@@ -499,18 +583,34 @@ public class SmartControlService extends BaseService implements EventListener<St
         Constant.count = durationMinutes + 1;
         PollingUtils.startPollingService(this, 60, CountService.class, CountService.STATUS_ACTION);
+        //异常1，若在观影时间内，非正常关闭，扫描更新订单后播放广告，显示清洁码
+        if (lastCompleteRoomStatusInfo != null) {
+            if (lastCompleteRoomStatusInfo.getData().getOrder_sn().equals(roomStatusInfo.getData().getOrder_sn())) {
+                if (openDoorServerTime > roomStatusInfo.getData().getBegin_time() && openDoorServerTime < roomStatusInfo.getData().getEnd_time()) {
+                    playEndAds();
+
+                }
+                return;
+            }
+        }
+
         LocalMovieMessage localMovieMessages = null;
         if (!TextUtils.isEmpty(data.getFilm_hash())) {
             localMovieMessages = new NewDBManager(this).queryPlayMovie(data.getFilm_hash());
             if (localMovieMessages == null) {
                 show("电影信息出错,找不到相关电影");
+                if (offset > 3) {
+                    CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影输电网信息,请联系客服", 90 * 1000).show();
+                } else {
+                    CToast.makeText(this, "没有找到电影输电网信息,请联系客服", 90 * 1000).show();
+                }
             }
         }
-        if (localMovieMessages == null) {
-            show("没有获取到相应订单信息,即将为您播放银河护卫队");
-            localMovieMessages = new NewDBManager(this).queryPlayMovie("f1ebaee0a7fe50c7c5ce786b2eb9e753");
-        }
-
+//        if (localMovieMessages == null) {
+//            show("没有获取到相应订单信息,即将为您播放银河护卫队");
+//            localMovieMessages = new NewDBManager(this).queryPlayMovie("f1ebaee0a7fe50c7c5ce786b2eb9e753");
+//        }
+//
         if (localMovieMessages != null) {
             OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null);
         } else {
@@ -531,4 +631,38 @@ public class SmartControlService extends BaseService implements EventListener<St
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
     }
+
+    @Override
+    public void updateInitGetOrderInfo(boolean b) {
+        initGetOderInfo = b;
+    }
+
+    @Override
+    public void setOpenDoorTime(int i) {
+        openDoorServerTime = i;
+    }
+
+    private void playEndAds() {
+        SharedPreferences sharedPreferences = getSharedPreferences(Constant.XML_NAME, Context.MODE_PRIVATE);
+        SambaMsg sambaMsg = Utils.getSambaMsg(sharedPreferences);
+        String adsVideoPath;
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        adsVideoPath = sambaMsg.getLocalPath() + "qnyk.mp4";
+        if (!SambaFileCharge.fileExist(adsVideoPath)) {
+            return;
+        }
+        if (roomStatusInfo != null && roomStatusInfo.getData() != null && roomInfo != null && roomInfo.getData() != null) {
+            Intent intentAds = new Intent(this.getApplicationContext(), SimpleAdsPlayer2.class);
+            intentAds.putExtra("ads_path", adsVideoPath);
+            intentAds
+                    .putExtra("room_sn", roomInfo.getData().getRoom_sn())
+                    .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
+            intentAds.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intentAds);
+        }
+    }
 }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @0612c99
@@ -146,8 +146,6 @@ public class SocketService1 extends BaseService {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
-//        ServiceCommandCollector.addService(this, this.getClass());
-//        Log.d("BaseService1", this.getClass().toString() + "");
         Log.d(TAG, "onStartCommand");
         int ftTest = Utils.getInt(this, "ft-test", 0);
         switch (ftTest) {
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @0612c99
@@ -3,22 +3,28 @@ package com.xgimi.gimicinema.activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.ImageView;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
+import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.WrongMsg;
 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.mview.IUpdateQrCodeView;
 import com.xgimi.gimicinema.presenter.QrCodeShowPresent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-public class QrCodeShowActivity extends Activity {
+import static com.xgimi.gimicinema.R.id.qrCodeIv;
+
+public class QrCodeShowActivity extends Activity implements IUpdateQrCodeView {
     public static final int KILL_SELF = 0x9983;
     private Handler handler = new Handler();
     private QrCodeShowPresent present;
@@ -28,11 +34,21 @@ public class QrCodeShowActivity extends Activity {
             LightOperationUtils.close();
             LightOperationUtils.setLightValue(5);
             new SystemUtils().closeFtLed(QrCodeShowActivity.this.getApplicationContext());
-            present.reportSleepStatus(oderSn, roomSn);
+            present.reportSleepStatus(orderSn, roomSn);
             QrCodeShowActivity.this.finish();
         }
     };
-    private String oderSn, roomSn;
+    private String orderSn;
+    private String roomSn;
+    private ImageView iv;
+    private Runnable updateQrCodeRunnable = new Runnable() {
+        @Override
+        public void run() {
+            Log.d("room-info", "QrCodeShowActivity update qr code runnable run");
+            handler.postDelayed(this, 10 * 60 * 1000);
+            present.getQrCode(roomSn, orderSn);
+        }
+    };
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,25 +56,24 @@ public class QrCodeShowActivity extends Activity {
         setContentView(R.layout.activity_qr_code_show);
         EventBus.getDefault().register(this);
         //back press,movie length
-        present = new QrCodeShowPresent();
-
-        final String qr = getIntent().getStringExtra("qr");
-        oderSn = getIntent().getStringExtra("order_sn");
+        present = new QrCodeShowPresent(this);
+//        final String qr = getIntent().getStringExtra("qr");
+        orderSn = getIntent().getStringExtra("order_sn");
         roomSn = getIntent().getStringExtra("room_sn");
-        boolean countCall = getIntent().getBooleanExtra("count_call", false);
-        if (countCall) {
-            Toast.makeText(this, "你预定的时段已结束，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
+//        boolean countCall = getIntent().getBooleanExtra("count_call", false);
+//        if (countCall) {
+//            Toast.makeText(this, "你预定的时段已结束，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
+//        } else {
+//            Toast.makeText(this, "电影观看完成，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
+//        }
+        iv = (ImageView) findViewById(qrCodeIv);
+        handler.postDelayed(r, 20 * 60 * 1000);
+
+        if (!TextUtils.isEmpty(roomSn) && !TextUtils.isEmpty(orderSn)) {
+            handler.post(updateQrCodeRunnable);
         } else {
-            Toast.makeText(this, "电影观看完成，请携带好随身物品，欢迎下次光临", Toast.LENGTH_LONG).show();
-        }
-        ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
-        try {
-            iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
-        } catch (WriterException e) {
-            e.printStackTrace();
+            Log.d("room-info", "roomSn:" + roomSn + ",orderSn:" + orderSn);
         }
-
-        handler.postDelayed(r, 20 * 60 * 1000);
     }
     @Override
@@ -84,7 +99,7 @@ public class QrCodeShowActivity extends Activity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            Toast.makeText(this,"请用管理端扫描或者等待清理时间结束",Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "请用管理端扫描或者等待清理时间结束", Toast.LENGTH_SHORT).show();
             return true;
         }
         return super.onKeyDown(keyCode, event);
@@ -99,4 +114,19 @@ public class QrCodeShowActivity extends Activity {
                 break;
         }
     }
+
+    @Override
+    public void getQrCodeSuccess(RoomQrCodeInfo info) {
+        try {
+            Log.d("QrCodeShowActivity", info.getData().getCode());
+            iv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
+        } catch (WriterException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void getQrCodeFailure(WrongMsg wrongMsg) {
+        Toast.makeText(this, wrongMsg.getMsg(), Toast.LENGTH_SHORT).show();
+    }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SimpleAdsPlayer2.java
View file @0612c99
 package com.xgimi.gimicinema.activity;
-import android.app.Activity;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
 import android.widget.VideoView;
 import com.gimi.common.cinema.model.Constant;
+import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.WrongMsg;
+import com.gimi.common.cinema.utils.QRCodeUtils;
+import com.google.zxing.WriterException;
 import com.xgimi.gimicinema.R;
+import com.xgimi.gimicinema.mview.IUpdateQrCodeView;
+import com.xgimi.gimicinema.presenter.UpdateQrCodePresenter;
-public class SimpleAdsPlayer2 extends Activity {
+public class SimpleAdsPlayer2 extends BaseActivity implements IUpdateQrCodeView {
+
+    private UpdateQrCodePresenter presenter;
     private VideoView videoView;
-    //    private TextView textviewP;
+    private ImageView cleanQrCodeIv;
+    private LinearLayout qrCodeIv;
     public String playUrl;
-    private Handler handler = new Handler();
-//    private Runnable killSelfRunnable = new Runnable() {
-//        @Override
-//        public void run() {
-//            handler.postDelayed(this, 3 * 1000);
-//            if (Constant.messageRun) {
-//                SimpleAdsPlayer2.this.finish();
-//            }
-//        }
-//    };
-
+    private String roomSn;
+    private String orderSn;
     private AudioManager audioManager;
     private boolean fromService;
     private long startAdsTime = 0;
     private int streamVolume;
+    private Handler handler = new Handler();
+    private Runnable updateQrCodeRunnable = new Runnable() {
+        @Override
+        public void run() {
+            Log.d("room-info", "update qr code runnable run");
+            handler.postDelayed(this, 10 * 60 * 1000);
+            presenter.getQrCode(roomSn, orderSn);
+        }
+    };
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,10 +58,12 @@ public class SimpleAdsPlayer2 extends Activity {
         startAdsTime = System.currentTimeMillis();
         Constant.isAdsOn = true;
         videoView = (VideoView) findViewById(R.id.videoView);
-//        textviewP = (TextView) findViewById(R.id.promoteTv);
+        cleanQrCodeIv = (ImageView) findViewById(R.id.cleanQrCodeIv);
+        qrCodeIv = (LinearLayout) findViewById(R.id.qrCodeIv);
         playUrl = getIntent().getStringExtra("ads_path");
+        orderSn = getIntent().getStringExtra("order_sn");
+        roomSn = getIntent().getStringExtra("room_sn");
         fromService = getIntent().getBooleanExtra("from_service", false);
-//        playUrl = "/mnt/samba/172.21.16.83/APicture/qnyk.mp4";
         Uri videoUri = Uri.parse(playUrl);
         videoView.setVideoURI(videoUri);
         videoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@@ -58,7 +71,6 @@ public class SimpleAdsPlayer2 extends Activity {
             public void onCompletion(MediaPlayer mp) {
                 videoView.start();
                 videoView.seekTo(0);
-
             }
         });
         videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@@ -74,10 +86,12 @@ public class SimpleAdsPlayer2 extends Activity {
                 }
             }
         });
-//        if (fromService) {
-//            textviewP.setVisibility(View.VISIBLE);
-//            handler.postDelayed(killSelfRunnable, 3 * 1000);
-//        }
+        if (!TextUtils.isEmpty(roomSn) && !TextUtils.isEmpty(orderSn)) {
+            presenter = new UpdateQrCodePresenter(this);
+            handler.post(updateQrCodeRunnable);
+        } else {
+            Log.d("room-info", "roomSn:" + roomSn + ",orderSn:" + orderSn);
+        }
     }
     @Override
@@ -97,6 +111,7 @@ public class SimpleAdsPlayer2 extends Activity {
         super.onStop();
         Constant.isAdsOn = false;
         if (handler != null) {
+            handler.removeCallbacks(null);
             handler.removeCallbacksAndMessages(null);
         }
         if (audioManager != null) {
@@ -104,36 +119,29 @@ public class SimpleAdsPlayer2 extends Activity {
             audioManager = null;
         }
         handler = null;
-//        Constant.needStartScreenSaver = true;
         playUrl = null;
         videoView = null;
         System.gc();
     }
     @Override
-    protected void onResume() {
-        super.onResume();
-        IntentFilter networkFilter = new IntentFilter(
-                "com.xgimi.gimicinema_close_led");
-        registerReceiver(closeLedReceiver, networkFilter);
+    protected void onDestroy() {
+        super.onDestroy();
     }
-    BroadcastReceiver closeLedReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(Constant.ACTION_GET_MESSAGE_CLOSE_LED)) {
-                SimpleAdsPlayer2.this.finish();
-            }
-        }
-    };
-
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
+    public void getQrCodeSuccess(RoomQrCodeInfo info) {
         try {
-            unregisterReceiver(closeLedReceiver);
-        } catch (Exception e) {
+            Log.d("SimpleAdsPlayer2", info.getData().getCode());
+            cleanQrCodeIv.setImageBitmap(QRCodeUtils.createQRCode(info.getData().getCode(), 400));
+            qrCodeIv.setVisibility(View.VISIBLE);
+        } catch (WriterException e) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void getQrCodeFailure(WrongMsg wrongMsg) {
+        Toast.makeText(this, wrongMsg.getMsg(), Toast.LENGTH_SHORT).show();
+    }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/IRoomInfoModel.java
View file @0612c99
@@ -6,11 +6,13 @@ package com.xgimi.gimicinema.model;
 public interface IRoomInfoModel {
     void getRoomInfo(String imei, boolean needUpdate, RoomInfoModelImpl.GetRoomInfoListener listener);
+    void getRoomSysTime(String imei, RoomInfoModelImpl.GetServerTimeListener listener);
+
     void getRoomStatus(String roomSn, RoomInfoModelImpl.GetRoomStatusListener listener);
     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);
+    void reportSleepSysStatus(String orderSn, String roomSn, RoomInfoModelImpl.SleepSysStatusListener listener);
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @0612c99
@@ -3,7 +3,6 @@ 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;
@@ -15,6 +14,9 @@ import com.google.gson.JsonSyntaxException;
 import com.squareup.okhttp.Request;
 import com.xgimi.gimicinema.application.FangTangApplication;
+import java.io.IOException;
+import java.text.ParseException;
+
 /**
  * Created by wugian on 2017/4/7
  */
@@ -97,6 +99,31 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                 });
     }
+    public void getRoomSysTime(final String imei, final GetServerTimeListener listener) {
+        ThreadUtils.subThread(new ThreadUtils.DoSomeThing() {
+
+            @Override
+            public void doSomeThing() {
+                long time = -1;
+                Log.d("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) {
+                    e.printStackTrace();
+                }
+                if (time != -1) {
+                    listener.onGetTimeSuccess(time);
+                } else {
+                    listener.onGetTimeFailure(new WrongMsg());
+                }
+            }
+        });
+
+
+    }
+
     @Override
     public void getRoomStatus(String roomSn, final GetRoomStatusListener listener) {
         Log.d("room-info", "request:getRoomStatus,url = " + ROOM_STATUS_BY_ROOM_SN_URL + roomSn);
@@ -210,6 +237,12 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
         void onGetRoomInfoFailure(WrongMsg wrongMsg);
     }
+    public interface GetServerTimeListener {
+        void onGetTimeSuccess(long time);
+
+        void onGetTimeFailure(WrongMsg wrongMsg);
+    }
+
     public interface GetRoomStatusListener {
         void onGetRoomStatusSuccess(RoomStatusInfo info);
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IUpdateQrCodeView.java 0 → 100644
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IUpdateQrCodeView.java 0 → 100644
View file @0612c99
+package com.xgimi.gimicinema.mview;
+
+import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.WrongMsg;
+
+/**
+ * Created by wugian on 2017/5/25.
+ */
+
+public interface IUpdateQrCodeView {
+    void getQrCodeSuccess(RoomQrCodeInfo info);
+
+    void getQrCodeFailure(WrongMsg wrongMsg);
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/QrCodeShowPresent.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/QrCodeShowPresent.java
View file @0612c99
 package com.xgimi.gimicinema.presenter;
 import android.util.Log;
-
+import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.WrongMsg;
 import com.xgimi.gimicinema.model.IRoomInfoModel;
 import com.xgimi.gimicinema.model.RoomInfoModelImpl;
+import com.xgimi.gimicinema.mview.IUpdateQrCodeView;
 /**
  * Created by wugian on 2017/5/2
@@ -12,8 +14,9 @@ import com.xgimi.gimicinema.model.RoomInfoModelImpl;
 public class QrCodeShowPresent {
     IRoomInfoModel roomInfoModel;
-    public QrCodeShowPresent() {
+    public QrCodeShowPresent(IUpdateQrCodeView view) {
         roomInfoModel = new RoomInfoModelImpl();
+        this.view = view;
     }
     public void reportSleepStatus(String orderSn, String roomSn) {
@@ -29,4 +32,21 @@ public class QrCodeShowPresent {
             }
         });
     }
+
+    private IUpdateQrCodeView view;
+
+
+    public void getQrCode(String roomSn, String oderSn) {
+        roomInfoModel.getRoomQrCode(oderSn, roomSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
+            @Override
+            public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
+                view.getQrCodeSuccess(info);
+            }
+
+            @Override
+            public void onGetRoomQrCodeFailure(WrongMsg wrongMsg) {
+                view.getQrCodeFailure(wrongMsg);
+            }
+        });
+    }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/UpdateQrCodePresenter.java 0 → 100644
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/UpdateQrCodePresenter.java 0 → 100644
View file @0612c99
+package com.xgimi.gimicinema.presenter;
+
+import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.WrongMsg;
+import com.xgimi.gimicinema.model.IRoomInfoModel;
+import com.xgimi.gimicinema.model.RoomInfoModelImpl;
+import com.xgimi.gimicinema.mview.IUpdateQrCodeView;
+
+/**
+ * Created by wugian on 2017/5/25
+ */
+
+public class UpdateQrCodePresenter {
+    private IRoomInfoModel roomInfoModel;
+    private IUpdateQrCodeView view;
+
+    public UpdateQrCodePresenter(IUpdateQrCodeView updateView) {
+        this.roomInfoModel = new RoomInfoModelImpl();
+        this.view = updateView;
+    }
+
+    public void getQrCode(String roomSn, String oderSn) {
+        roomInfoModel.getRoomQrCode(oderSn, roomSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
+            @Override
+            public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
+                view.getQrCodeSuccess(info);
+            }
+
+            @Override
+            public void onGetRoomQrCodeFailure(WrongMsg wrongMsg) {
+                view.getQrCodeFailure(wrongMsg);
+            }
+        });
+    }
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/AppInstalledReceiver.java 0 → 100644
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/AppInstalledReceiver.java 0 → 100644
View file @0612c99
+package com.xgimi.gimicinema.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class AppInstalledReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        String action = intent.getAction();
+        String packageName = intent.getData().getSchemeSpecificPart();
+        if (intent.getAction().equals(Intent.ACTION_PACKAGE_ADDED)) {
+//            Toast.makeText(context, "添加了新的应用" + packageName, Toast.LENGTH_LONG).show();
+            Log.d("install", "Intent.ACTION_PACKAGE_ADDED:" + packageName);
+//            Intent serviceIntent = new Intent();
+//            serviceIntent.setClass(context, Controller.class);
+//            serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//            context.startActivity(serviceIntent);
+        } else {
+            Log.d("install", "Intent.ACTION_PACKAGE_ADDED:" + packageName + "," + action);
+            if (intent.getAction().equals(Intent.ACTION_PACKAGE_REPLACED)) {
+//                Toast.makeText(context, "添加了新的应用" + action, Toast.LENGTH_LONG).show();
+                Log.d("install", "Intent.ACTION_PACKAGE_ADDED:" + packageName);
+//                Intent serviceIntent = new Intent();
+//                serviceIntent.setClass(context, Controller.class);
+//                serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                context.startActivity(serviceIntent);
+            }
+        }
+    }
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @0612c99
@@ -24,11 +24,11 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
-import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.Utils;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
+import com.qnbar.smc.service.SmartControlService;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
@@ -39,8 +39,6 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
 import java.util.List;
-import static com.xgimi.gimicinema.service.CountService.COUNT_DOWN_ZERO;
-
 public class CinemaControlService extends Service {
     private static final int LIGHT_MIN_VALUE = 5;
     private ArrayList<String> movies = new ArrayList<>();
@@ -108,7 +106,8 @@ public class CinemaControlService extends Service {
             }
             if (state != currentState) {
                 currentState = state;
-                Log.d("aidl", "state change," + currentPath + "," + duration + "," + currentPosition);
+//                ShellUtils.execCommand("input keyevent 23", false);
+                Log.d("aidl", "state change," + currentPath + "," + duration + "," + currentPosition + ",state:" + state);
                 Log.d("aidl", "state change cinemaSMC not null");
 //                if (true) {
 //                    return;
@@ -338,10 +337,15 @@ public class CinemaControlService extends Service {
     private void showQrCodeRightNow() {
         if (duration - currentPosition < 1000 * 60) {
-            Constant.count = -1;
+            //save order complete
+//            Constant.count = -1;
+//            MessageEvent messageEvent = new MessageEvent();
+//            messageEvent.setEventId(COUNT_DOWN_ZERO);
+//            messageEvent.setMessage("CinemaControlService,记数为0");
+//            EventBus.getDefault().post(messageEvent);
             MessageEvent messageEvent = new MessageEvent();
-            messageEvent.setEventId(COUNT_DOWN_ZERO);
-            messageEvent.setMessage("CinemaControlService,记数为0");
+            messageEvent.setEventId(SmartControlService.ORDER_PLAY_COMPLETE);
+            messageEvent.setMessage("电影播放完成，记录完成订单信息");
             EventBus.getDefault().post(messageEvent);
         } else {
             Log.d("room-info", "stop media but not completed");
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/MovieCompleteReceiver.java
View file @0612c99
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/MovieCompleteReceiver.java
View file @0612c99
@@ -3,13 +3,6 @@ package com.xgimi.gimicinema.service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import com.gimi.common.cinema.model.Constant;
-import com.gimi.common.cinema.model.SambaMsg;
-import com.gimi.common.cinema.utils.AdsVideoUtils;
-import com.gimi.common.cinema.utils.SambaFileCharge;
-import com.gimi.common.cinema.utils.Utils;
-import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
 /**
  * Created by wugian on 2016/8/22
@@ -17,28 +10,26 @@ import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
 public class MovieCompleteReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(Constant.ACTION_GET_MESSAGE_MEDIA_PLAYER_MOVIE_COMPLETE)) {
-
-            SharedPreferences sharedPreferences = context.getSharedPreferences(Constant.XML_NAME, Context.MODE_PRIVATE);
-            SambaMsg sambaMsg = Utils.getSambaMsg(sharedPreferences);
-            String adsVideoPath;
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            if (Constant.startAds && Constant.messageRun) {
-                Constant.startAds = false;
-                adsVideoPath = AdsVideoUtils.getAdsVideoPath(sambaMsg.getLocalPath());
-                if (!SambaFileCharge.fileExist(adsVideoPath)) {
-                    return;
-                }
-                Intent intentAds = new Intent(context.getApplicationContext(), SimpleAdsPlayer2.class);
-                intentAds.putExtra("ads_path", adsVideoPath);
-                intentAds.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intentAds);
-            }
-        }
+//        if (intent.getAction().equals(Constant.ACTION_GET_MESSAGE_MEDIA_PLAYER_MOVIE_COMPLETE)) {
+//
+//            SharedPreferences sharedPreferences = context.getSharedPreferences(Constant.XML_NAME, Context.MODE_PRIVATE);
+//            SambaMsg sambaMsg = Utils.getSambaMsg(sharedPreferences);
+//            String adsVideoPath;
+//            try {
+//                Thread.sleep(2000);
+//            } catch (InterruptedException e) {
+//                e.printStackTrace();
+//            }
+//            Constant.startAds = false;
+//            adsVideoPath = sambaMsg.getLocalPath() + "qnyk.mp4";
+//            if (!SambaFileCharge.fileExist(adsVideoPath)) {
+//                return;
+//            }
+//            Intent intentAds = new Intent(context.getApplicationContext(), SimpleAdsPlayer2.class);
+//            intentAds.putExtra("ads_path", adsVideoPath);
+//            intentAds.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//            context.startActivity(intentAds);
+//        }
     }
 }
--- a/gimiCinema/src/main/res/layout/a_ads_player2.xml
View file @0612c99
+++ b/gimiCinema/src/main/res/layout/a_ads_player2.xml
View file @0612c99
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:gravity="center"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:gravity="center"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
     <com.xgimi.gimicinema.view.FullScreenVideoView
             android:id="@+id/videoView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,5 +22,20 @@
             android:padding="5dp"
             android:background="@color/dark_background"
             android:layout_gravity="center_horizontal|top"/>
+    <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent"
+                  android:padding="10dp"
+                  android:gravity="bottom|right">
+        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content"
+                      android:gravity="center"
+                      android:visibility="gone"
+                      android:id="@+id/qrCodeIv"
+                      android:background="@color/white"
+                      android:orientation="vertical">
+
+            <ImageView android:layout_width="200dp" android:layout_height="200dp"
+                       android:id="@+id/cleanQrCodeIv"/>
+        </LinearLayout>
+
+    </LinearLayout>
 </FrameLayout>
--- a/gimiCinema/src/main/res/values/strings.xml
View file @0612c99
+++ b/gimiCinema/src/main/res/values/strings.xml
View file @0612c99
@@ -106,4 +106,11 @@
     <string name="pre_ads_times">映前广告次数</string>
     <string name="set_sm_light">设置智能灯光</string>
+    <string name="ads_promote">青柠影咖，年轻人的奇幻乐园。</string>
+    <string name="delay_time">您已迟到%d分钟，</string>
+    <string name="play_movie">即将为你播放%s</string>
+    <string name="end_ads">本场电影已结束，请观看《青柠电影先锋》</string>
+    <string name="welcome_again">离场时请携带好随身物品，欢迎下次光临。</string>
+    <string name="play_next">本场电影已结束，将于广告后为您播放下一部影片%s</string>
+
 </resources>