online envroment,toast

Penley
1 parent 901f3d9c
Showing 9 changed files with 41 additions and 24 deletions
gimiCinema/src/main/AndroidManifest.xml
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MovieDetailMsgActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CountService.java
--- a/gimiCinema/src/main/AndroidManifest.xml
View file @e099c4c
+++ b/gimiCinema/src/main/AndroidManifest.xml
View file @e099c4c
@@ -147,7 +147,7 @@
         <service android:name="com.xgimi.smartscreen.service.ConfigService"/>
         <service android:name=".poll.PollingServiceDemo"/>
-        <activity android:name=".activity.QrCodeShowActivity" android:launchMode="singleTop">
+        <activity android:name=".activity.QrCodeShowActivity"><!-- android:launchMode="singleTop"-->
         </activity>
         <activity android:name=".activity.ConfigWifiActivity">
         </activity>
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @e099c4c
@@ -61,6 +61,10 @@ public class SocketService extends Service {
     private static final int ROOM_NOT_EXIST_M = 1002;
     private static final int HEAT_BEAT_RTN = 1003;
+    //    online
+    public static final String SERVER_HOST_ONLINE = "conn.ft.qnbar.com";// "192.168.1.21";//
+    public static final int SERVER_PORT_ONLINE= 8899;
+
     //    develop
     public static final String SERVER_HOST_DEVELOP = "10.10.4.6";// "192.168.1.21";//
     public static final int SERVER_PORT_DEVELOP = 9501;
@@ -128,8 +132,8 @@ public class SocketService extends Service {
         int ftTest = Utils.getInt(this, "ft-test", 0);
         switch (ftTest) {
             case 0:
-                serverHost = SERVER_HOST;
-                serverPort = SERVER_PORT;
+                serverHost = SERVER_HOST_ONLINE;
+                serverPort = SERVER_PORT_ONLINE;
                 break;
             case 1:
                 serverHost = SERVER_HOST_DEVELOP;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @e099c4c
@@ -535,10 +535,21 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo info) {
         this.info = info;
-        startActivity(new Intent(this, QrCodeShowActivity.class)
+        try {
+            new SystemUtils().stopMediaPlayer(context.getApplicationContext());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        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()));
+                .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
+        if ("count_service".equals(countMsg)) {
+            intent.putExtra("count_call", true);
+        }
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
     }
     private RoomInfo roomInfo;
@@ -1014,6 +1025,10 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                     }
                     if (!TextUtils.isEmpty(roomStatusInfo.getData().getFilm_hash())) {
                         LocalMovieMessage lmm = new NewDBManager(this).queryPlayMovie(roomStatusInfo.getData().getFilm_hash());
+                        if (lmm == null) {
+                            Log.d("room-info", "movie not exits");
+                            break;
+                        }
                         if (!roomStatusInfo.getData().getFilm_hash().equals(lmm.getMd5())) {
                             //当前播放电影信息不正确正在重新拉取
                             show("当前播放电影信息不正确正在重新拉取");
@@ -1064,6 +1079,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 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 {
@@ -1076,6 +1092,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     }
     private long lastRequest = 0;
+    private String countMsg = "";
     private void openDoor() {
         Log.d("room-info", "openDoor called");
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MovieDetailMsgActivity.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MovieDetailMsgActivity.java
View file @e099c4c
@@ -30,6 +30,7 @@ import android.widget.RatingBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.MovieCast;
 import com.gimi.common.cinema.model.MovieMessage;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/QrCodeShowActivity.java
View file @e099c4c
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.widget.ImageView;
+import android.widget.Toast;
 import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.QRCodeUtils;
@@ -45,6 +46,12 @@ public class QrCodeShowActivity extends Activity {
         final String qr = getIntent().getStringExtra("qr");
         oderSn = 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();
+        }else{
+            Toast.makeText(this,"电影观看完成，请携带好随身物品，欢迎下次光临",Toast.LENGTH_LONG).show();
+        }
         ImageView iv = (ImageView) findViewById(R.id.qrCodeIv);
         try {
             iv.setImageBitmap(QRCodeUtils.createQRCode(qr, 400));
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @e099c4c
@@ -22,6 +22,7 @@ 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_TEST_URL = "https://ft.qnbar.cn/test/api/";
+    private static final String FT_ROOT_URL = "https://ft.qnbar.com/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=";
@@ -34,7 +35,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
         int ftTest = Utils.getInt(applicationContext, "ft-test", 0);
         switch (ftTest) {
             case 0:
-                roomUrl = FT_ROOT_TEST_URL;
+                roomUrl = FT_ROOT_URL;
                 break;
             case 1:
                 roomUrl = FT_ROOT_DEVELOP_URL;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
View file @e099c4c
@@ -23,9 +23,8 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+
 import com.gimi.common.cinema.model.Constant;
-import com.gimi.common.cinema.utils.SystemUtils;
-import com.gimi.common.cinema.utils.WifiApManger;
 import com.xgimi.gimicinema.activity.StartActivity;
 import com.xgimi.gimicinema.service.AskService;
@@ -34,9 +33,6 @@ import com.xgimi.gimicinema.service.AskService;
  */
 public class BootReceiver extends BroadcastReceiver {
     static final String ACTION = "android.intent.action.BOOT_COMPLETED";
-    private int workMode;
-    private boolean startOpen;
-    private boolean openAp;
     public void onReceiveIntent(Context context, Intent intent) {
         if (intent.getAction().equals(ACTION)) {
@@ -45,9 +41,6 @@ public class BootReceiver extends BroadcastReceiver {
             SharedPreferences.Editor editor = sharedPreferences.edit();
             editor.putBoolean("has_enter_pwd", false);
             editor.apply();
-            startOpen = sharedPreferences.getBoolean("start_open", false);
-            openAp = sharedPreferences.getBoolean("open_ap", false);
-            workMode = new SystemUtils().getYbProp();
             mConnectivityManager = (ConnectivityManager)
                     context.getSystemService(Context.CONNECTIVITY_SERVICE);
             netInfo = mConnectivityManager.getActiveNetworkInfo();
@@ -93,17 +86,10 @@ public class BootReceiver extends BroadcastReceiver {
     };
     private void bootInit(Context context) {
-        if (workMode != 3) {
-            Intent intents = new Intent(context, AskService.class);
-            context.startService(intents);
-        }
-//        if (startOpen && !Constant.userOpen) {
+        Intent intents = new Intent(context, AskService.class);
+        context.startService(intents);
         Intent openIntent = new Intent(context, StartActivity.class);
         openIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(openIntent);
-//        }
-        if (openAp) {
-            WifiApManger.openWifiAp(context);
-        }
     }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @e099c4c
@@ -78,7 +78,7 @@ public class CinemaControlService extends Service {
             currentPosition = duration;
             if (saveBeat-- <= 0) {
                 //TODO 保存当前进度,需要时从保存位置开始播放,取消播放器播放记录功能
-                //TODO 播放一段时间确保状态为关闭
+                // 播放一段时间确保状态为关闭
                 saveBeat = SAVE_BEAT;
                 try {
                     if (!fadeOuting && Lights.getInstance().getByMeshAddress(
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CountService.java
View file @e099c4c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CountService.java
View file @e099c4c
@@ -61,6 +61,7 @@ public class CountService extends Service {
                 MessageEvent messageEvent = new MessageEvent();
                 messageEvent.setEventId(COUNT_DOWN_ZERO);
                 messageEvent.setMessage("记数为0");
+                messageEvent.setMessage("count_service");
                 EventBus.getDefault().post(messageEvent);
                 CountService.this.onDestroy();
             }