solve conflic,确定观景时的关灯状态

@@ -61,7 +61,7 @@
         <activity android:name=".activity.AddCActivity"/>
         <activity android:name=".activity.SimpleAdsPlayActivity"/>
         <activity android:name=".activity.SimpleAdsPlayer2"/>
-        <activity android:name=".activity.AdsPreVideoPlayerActivity"/>
+        <activity android:name=".activity.AdsPreVideoPlayerActivity" android:launchMode="singleTop"/>
         <activity android:name=".activity.ImageShowActivity"/>
         <activity android:name=".activity.CheckActivity"/>
 

@@ -59,14 +59,17 @@ public class SocketService extends Service {
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int HEAT_BEAT_RTN = 1003;
 
-//    develop
-//    public static final String SERVER_HOST = "10.10.4.6";// "192.168.1.21";//
-//    public static final int SERVER_PORT = 9501;
-
-//    test
+    //    develop
+    public static final String SERVER_HOST_DEVELOP = "10.10.4.6";// "192.168.1.21";//
+    public static final int SERVER_PORT_DEVELOP = 9501;
+    //    test
     public static final String SERVER_HOST = "10.10.4.6";// "192.168.1.21";//
     public static final int SERVER_PORT = 8899;
 
+    private String serverHost = SERVER_HOST;
+    private int serverPort = SERVER_PORT;
+
+
     public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容
     //    public String testRoomSn = "R170413034374";
     public String testRoomSn = "c";
@@ -120,6 +123,22 @@ public class SocketService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        int ftTest = Utils.getInt(this, "ft-test", 0);
+        switch (ftTest) {
+            case 0:
+                serverHost = SERVER_HOST;
+                serverPort = SERVER_PORT;
+                break;
+            case 1:
+                serverHost = SERVER_HOST_DEVELOP;
+                serverPort = SERVER_PORT_DEVELOP;
+                break;
+            case 2:
+                serverHost = SERVER_HOST;
+                serverPort = SERVER_PORT;
+                break;
+        }
+
         String roomInfoStr = Utils.getString(this, "room-info");
         if (!TextUtils.isEmpty(roomInfoStr)) {
             Log.d("room-info", "room info not null");
@@ -169,7 +188,8 @@ public class SocketService extends Service {
     }
 
     private void initSocket() throws IOException {//初始化Socket
-        Socket so = new Socket(SERVER_HOST, SERVER_PORT);
+        Log.d(TAG, "serverHost:serverPort:" + serverHost + ":" + serverPort);
+        Socket so = new Socket(serverHost, serverPort);
         mSocket = new WeakReference<Socket>(so);
         mReadThread = new ReadThread(so);
         mReadThread.start();

@@ -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,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
         Intent intent = new Intent(this, SocketService.class);
         startService(intent);
-//        getTimeByCalendar();
-        presenter.getOrderInfo();
+//        initGetOrderInfo = true;
+//        presenter.getOrderInfo();
 //        new Handler().postDelayed(new Runnable() {
 //            @Override
 //            public void run() {
@@ -249,6 +251,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
 //        }, 5 * 1000);
     }
 
+    private boolean initGetOrderInfo;
+
     public void getTimeByCalendar() {
         Calendar cal = Calendar.getInstance();
         int year = cal.get(Calendar.YEAR);//获取年份
@@ -456,7 +460,16 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     private RoomStatusInfo roomStatusInfo;
 
     @Override
+    public void updateInitGetOrder(boolean b) {
+        initGetOrderInfo = false;
+    }
+
+    @Override
     public void updateOrderInfo(RoomStatusInfo info) {
+        if (initGetOrderInfo) {
+            show("你已有订单存在,正在为你播放");
+            initGetOrderInfo = false;
+        }
         roomStatusInfo = info;
         RoomStatusInfo.DataEntity data = info.getData();
         int offset = data.getNow_time() - data.getBegin_time();
@@ -524,8 +537,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         this.info = info;
         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()));
+                .putExtra("room_sn", roomInfo.getData().getRoom_sn())
+                .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn()));
     }
 
     private RoomInfo roomInfo;

@@ -19,13 +19,36 @@ import com.xgimi.gimicinema.application.FangTangApplication;
  * Created by wugian on 2017/4/7
  */
 public class RoomInfoModelImpl implements IRoomInfoModel {
-    //    private static final String ROOT_URL = "https://ft.qnbar.cn/develop/api/";
-    private static final String ROOT_URL = "https://ft.qnbar.cn/test/api/";
-    private static final String ROOM_INFO_BY_IMEI_URL = ROOT_URL + "tcp/getRoomInfoByimei?imei=";
-    private static final String ROOM_STATUS_BY_ROOM_SN_URL = ROOT_URL + "tcp/getRoomStatus?room_sn=";
-    private static final String ROOM_QRCODE_BY_ORDER_SN = ROOT_URL + "tcp/getEndQRCode?order_sn=";
-    private static final String ROOM_REPORT_ROOM_STATUS = ROOT_URL + "tcp/reportRoomStatus?order_sn=";
-    private static final String ROOM_REPORT_SLEEP_STATUS = ROOT_URL + "tcp/recvSleepCmdTimeout?order_sn=";
+    //    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_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_TEST_URL;
+                break;
+            case 1:
+                roomUrl = FT_ROOT_DEVELOP_URL;
+                break;
+            case 2:
+                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
     public void getRoomInfo(String imei, boolean needUpdate, final GetRoomInfoListener listener) {

@@ -16,7 +16,6 @@
 package com.xgimi.gimicinema.mview;
 
 import android.graphics.Bitmap;
-
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.RoomInfo;
@@ -59,6 +58,8 @@ public interface IMainView {
 
     void updateOrderInfo(RoomStatusInfo info);
 
+    void updateInitGetOrder(boolean b);
+
     void prepareRoomQrCodeInfo(RoomQrCodeInfo info);
 
     void notifyGetRoomInfo(RoomInfo info);

@@ -48,6 +48,9 @@ public class CinemaControlService extends Service {
     private long currentPosition = 0;
     private int currentState = 0;
     private String currentPath = null;
+    //    private static final int SAVE_BEAT = 500;
+    private static final int SAVE_BEAT = 100;//default 500
+    private int saveBeat = SAVE_BEAT;
 
     private final ICinemaControl.Stub cinemaControl = new ICinemaControl.Stub() {
 
@@ -71,6 +74,18 @@ public class CinemaControlService extends Service {
         public void setCurrentMoviePosition(long duration) throws RemoteException {
 //            Log.d("aidl", "setCurrentMoviePosition: " + duration);
             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();
+                }
+            }
         }
 
         @Override