开关门时间调整,显示清理二维码,更新库

wugian
1 parent e9f800d8
Showing 10 changed files with 198 additions and 34 deletions
gimiCinema/build.gradle
gimiCinema/libs/CinemaLibs-170426.jar
gimiCinema/src/main/AndroidManifest.xml
gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SettingActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/poll/PollingServiceDemo.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
--- a/gimiCinema/build.gradle
View file @7858367
+++ b/gimiCinema/build.gradle
View file @7858367
@@ -123,7 +123,7 @@ android {
 dependencies {
     compile files('libs/decoder.jar')
-    compile files('libs/cinemaLib-1220.jar')
+    compile files('libs/CinemaLibs-170426.jar')
     compile files('libs/glide-3.7.0.jar')
     compile files('libs/greenbluetoothlelib.jar')
--- a/gimiCinema/libs/CinemaLibs-170426.jar 0 → 100644
View file @7858367
+++ b/gimiCinema/libs/CinemaLibs-170426.jar 0 → 100644
View file @7858367
--- a/gimiCinema/src/main/AndroidManifest.xml
View file @7858367
+++ b/gimiCinema/src/main/AndroidManifest.xml
View file @7858367
@@ -145,6 +145,7 @@
         </activity>
         <service android:name="com.xgimi.smartscreen.service.ConfigService"/>
+        <service android:name=".poll.PollingServiceDemo"/>
         <activity android:name=".activity.QrCodeShowActivity">
         </activity>
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/model/RoomStatusInfo.java
View file @7858367
@@ -22,6 +22,7 @@ public class RoomStatusInfo extends BaseModel {
         private int end_time;
         private int status;
         private String film_hash;
+        private int now_time;
         public String getOrder_sn() {
             return order_sn;
@@ -63,6 +64,14 @@ public class RoomStatusInfo extends BaseModel {
             this.film_hash = film_hash;
         }
+        public int getNow_time() {
+            return now_time;
+        }
+
+        public void setNow_time(int now_time) {
+            this.now_time = now_time;
+        }
+
         @Override
         public String toString() {
             return "DataEntity{" +
@@ -71,6 +80,7 @@ public class RoomStatusInfo extends BaseModel {
                     ", end_time=" + end_time +
                     ", status=" + status +
                     ", film_hash='" + film_hash + '\'' +
+                    ", now_time=" + now_time +
                     '}';
         }
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @7858367
@@ -64,6 +64,7 @@ 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.utils.AuthUtils;
+import com.gimi.common.cinema.utils.CToast;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.M1905Utils;
 import com.gimi.common.cinema.utils.NetStatusUtils;
@@ -120,6 +121,7 @@ import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -181,7 +183,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         setContentView(R.layout.a_main);
         EventBus.getDefault().register(this);
         context = this;
-
         initLight();
         initLock();
         initScreen();
@@ -237,13 +238,31 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         presenter.load(this);
         Intent intent = new Intent(this, SocketService.class);
         startService(intent);
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                Log.d("room-info", "test open door report");
-                openDoor();
-            }
-        }, 5 * 1000);
+        final long l = (System.currentTimeMillis() / 60000) % (24 * 60) + 480;
+        SimpleDateFormat sdf = new SimpleDateFormat(" yyyy-MM-dd ", Locale.SIMPLIFIED_CHINESE);
+        getTimeByCalendar();
+        presenter.getOrderInfo();
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                Log.d("room-info", "test open door report");
+//                openDoor();
+//            }
+//        }, 5 * 1000);
+    }
+
+    public void getTimeByCalendar() {
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);//获取年份
+        int month = cal.get(Calendar.MONTH);//获取月份
+        int day = cal.get(Calendar.DATE);//获取日
+        int hour = cal.get(Calendar.HOUR_OF_DAY);//小时
+        int minute = cal.get(Calendar.MINUTE);//分
+        int second = cal.get(Calendar.SECOND);//秒
+        int WeekOfYear = cal.get(Calendar.DAY_OF_WEEK);//一周的第几天
+        Log.d("room-info", "现在的时间是：公元" + year + "年" + month + "月" + day + "日      " + hour + "时" + minute + "分" + second + "秒       星期" + WeekOfYear);
+        Log.d("room-info", "current minute:" + (hour * 60 + minute) + "");
+
     }
     @Override
@@ -284,7 +303,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
             registerReceiver(bleBroadcastReceiver, intentFilter);
         }
         if (!LeBluetooth.getInstance().isSupport(getApplicationContext())) {
-            Toast.makeText(this, "ble not support", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "蓝牙不支持", Toast.LENGTH_SHORT).show();
 //            finish();
 //            return;
         }
@@ -316,15 +335,15 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     protected void onPause() {
         super.onPause();
         isSearching = false;
-        if (HAS_SYSTEM_FEATURE_BLUETOOTH_LE) {
-            unregisterReceiver(bleBroadcastReceiver);
-        }
     }
     @Override
     protected void onDestroy() {
         super.onDestroy();
         presenter.umountSamba();
+        if (HAS_SYSTEM_FEATURE_BLUETOOTH_LE) {
+            unregisterReceiver(bleBroadcastReceiver);
+        }
         unregisterReceiver(mReceiver);
         EventBus.getDefault().unregister(this);
     }
@@ -466,7 +485,12 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     public void updateOrderInfo(RoomStatusInfo info) {
         roomStatusInfo = info;
         RoomStatusInfo.DataEntity data = info.getData();
-        int durationMinutes = data.getEnd_time() - data.getBegin_time();
+        int offset = data.getNow_time() - data.getBegin_time();
+        if (offset > 3) {
+            CToast.makeText(context, "您已迟到" + offset + "分钟,请注意把握时间", 100 * 1000).show();
+        }
+//        int durationMinutes = data.getEnd_time() - data.getBegin_time() - offset;
+        int durationMinutes = data.getEnd_time() - data.getNow_time();
         Log.d("CountService", "durationMinutes:" + durationMinutes);
         if (durationMinutes <= 1) {
             return;
@@ -477,6 +501,9 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         LocalMovieMessage localMovieMessages = null;
         if (!TextUtils.isEmpty(data.getFilm_hash())) {
             localMovieMessages = new NewDBManager(this).queryPlayMovie(data.getFilm_hash());
+            if (localMovieMessages == null) {
+                show("电影信息出错,找不到相关电影");
+            }
         }
         if (localMovieMessages == null) {
             show("没有获取到相应订单信息,即将为您播放银河护卫队");
@@ -753,6 +780,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     public void openSearch(View view) {
         presenter.jumpToSearch();
+//        openDoor();
+//        PollingUtils.startPollingService(this.getApplicationContext(), 60, PollingServiceDemo.class, PollingServiceDemo.ACTION);
     }
@@ -953,10 +982,13 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         registerReceiver(mReceiver, filter);
     }
+    boolean needReport = false;
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
         switch (messageEvent.getEventId()) {
             case SocketService.JUST_OPEN_DOOR:
+                needReport = false;
                 openDoor();
                 if (rightSn) {
                     down();
@@ -964,6 +996,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 Log.d("event bus", "open door" + messageEvent.getMessage());
                 break;
             case SocketService.USER_OPEN_DOOR_AND_GET_MOVIE:
+                needReport = true;
                 openDoor();
                 if (rightSn) {
                     down();
@@ -972,6 +1005,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 Log.d("event bus", "open door" + messageEvent.getMessage());
                 break;
             case SocketService.USER_OPEN_DOOR:
+                needReport = true;
                 openDoor();
                 if (rightSn) {
                     down();
@@ -1030,9 +1064,9 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 }
                 break;
             case CountService.COUNT_DOWN_ZERO:
-                if (info == null || info.getData() == null) {
-                    break;
-                }
+//                if (info == null || info.getData() == null) {
+//                    break;
+//                }
                 presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn());
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
@@ -1040,6 +1074,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     }
     private void openDoor() {
+        //open LED
+        new SystemUtils().openFtLed(context);
         Log.d("room-info", "openDoor called");
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
@@ -1054,8 +1090,11 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 intent.setAction(GREENBluetoothLeService.ACTION_OPEN_SUCCESS);
                 intent.putExtra("openrecord", bleOpenRecord);
                 sendBroadcast(intent);
+                if (needReport) {
+                    handler.postDelayed(reportRunnable, 10 * 1000);
+                    Log.d("room-info", "user open door ,report the open success status");
+                }
                 Log.d("room-info", "open success");
-                handler.postDelayed(reportRunnable, 30 * 1000);
             }
             @Override
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SettingActivity.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SettingActivity.java
View file @7858367
@@ -24,6 +24,7 @@ import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.utils.T;
 import com.gimi.common.cinema.utils.WifiApManger;
+import com.qnbar.smc.service.SocketService;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.mview.ISettingView;
@@ -34,8 +35,6 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
 import java.util.HashMap;
-import static com.qnbar.smc.service.SocketService.JUST_OPEN_DOOR;
-
 /**
  * 设置类
  * Created by pc on 2014/12/16.
@@ -337,7 +336,9 @@ public class SettingActivity extends BaseActivity implements ISettingView {
     }
     public void testOpenDoor(View view) {
-        openDoor(JUST_OPEN_DOOR, "setting test open door");
+        openDoor(SocketService.JUST_OPEN_DOOR, "setting test open door");
+//        PollingUtils.stopPollingService(this.getApplicationContext(), PollingServiceDemo.class, PollingService.ACTION);
+//        new SystemUtils().closeFtLed(this);;//test close led,could open by power
     }
     private void openDoor(int type, String msg) {
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @7858367
@@ -52,6 +52,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomInfo roomInfo1 = null;
+                        Log.d("room-info", "getRoomInfo" +response);
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomInfo.class);
                         } catch (JsonSyntaxException e) {
@@ -85,6 +86,8 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
                         RoomStatusInfo roomInfo1 = null;
+                        Log.d("room-info", "getRoomStatus" +response);
+
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomStatusInfo.class);
                         } catch (JsonSyntaxException e) {
@@ -115,6 +118,8 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
+                        Log.d("room-info", "getRoomQrCode:" + response);
+
                         RoomQrCodeInfo roomInfo1 = null;
                         try {
                             roomInfo1 = new Gson().fromJson(response, RoomQrCodeInfo.class);
@@ -146,7 +151,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
                     @Override
                     public void onResponse(String response) {
-                        Log.d("room-info", response);
+                        Log.d("room-info", "reportOpenDoorStatus:" + response);
                         listener.onOpenDoorSuccess();
                     }
                 });
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/poll/PollingServiceDemo.java 0 → 100644
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/poll/PollingServiceDemo.java 0 → 100644
View file @7858367
+/*
+ *  Copyright (c)  2017.  wugian
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.xgimi.gimicinema.poll;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * PollingService Demo do something in PollingThread
+ */
+public class PollingServiceDemo extends Service {
+    //name of this service action
+    public static final String ACTION = "com.qnbar.service.PollingServiceDemo";
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        Log.d("polling-demo", "onCreate");
+//        initNotifiManager();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.d("polling-demo", "onStartCommand");
+        new PollingThread().start();
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    //    @Override
+//    public void onStart(Intent intent, int startId) {
+//        new PollingThread().start();
+//    }
+//    //初始化通知栏配置
+//    private void initNotifiManager() {
+//        mManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+//        int icon = R.drawable.ic_launcher;
+//        mNotification = new Notification();
+//        mNotification.icon = icon;
+//        mNotification.tickerText = "New Message";
+//        mNotification.defaults |= Notification.DEFAULT_SOUND;
+//        mNotification.flags = Notification.FLAG_AUTO_CANCEL;
+//    }
+//    //弹出Notification
+//    private void showNotification() {
+//        mNotification.when = System.currentTimeMillis();
+//        //Navigator to the new activity when click the notification title
+//        Intent i = new Intent(this, MessageActivity.class);
+//        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, i,
+//                Intent.FLAG_ACTIVITY_NEW_TASK);
+//        mNotification.setLatestEventInfo(this,
+//                getResources().getString(R.string.app_name), "You have new message!", pendingIntent);
+//        mManager.notify(0, mNotification);
+//    }
+    /**
+     * Polling thread
+     * 模拟向Server轮询的异步线程
+     *
+     * @Author Ryan
+     * @Create 2013-7-13 上午10:18:34
+     */
+    int count = 0;
+
+    class PollingThread extends Thread {
+        @Override
+        public void run() {
+            Log.d("polling-demo", "polling run");
+//            System.out.println("Polling...");
+            count++;
+            //当计数能被5整除时弹出通知
+//            if (count % 5 == 0) {
+////                showNotification();
+//                System.out.println("New message!");
+//            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d("polling-demo", "onDestroy");
+
+        System.out.println("Service:onDestroy");
+    }
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @7858367
@@ -256,21 +256,10 @@ public class MainPresenter extends BasePresenter
                     public void onGetRoomStatusSuccess(RoomStatusInfo info) {
                         Log.d("room-info", "getOrderInfo#onGetRoomStatusSuccess:" + info.toString());
                         RoomStatusInfo.DataEntity data = info.getData();
+                        int offset = data.getNow_time() - data.getBegin_time();
                         int durationMinutes = data.getEnd_time() - data.getBegin_time();
                         Log.d("CountService", "durationMinutes:" + durationMinutes);
                         mainView.updateOrderInfo(info);
-//                        roomInfoModel.getRoomQrCode(data.getOrder_sn(), new RoomInfoModelImpl.GetRoomQrCodeListener() {
-//                            @Override
-//                            public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
-//                                Log.d("room-info", "getOrderInfo#onGetRoomStatusSuccess#onGetRoomQrCodeSuccess:" + info.toString());
-//                                mainView.prepareRoomQrCodeInfo(info);
-//                            }
-//
-//                            @Override
-//                            public void onGetRoomQrCodeFailure(WrongMsg wrongMsg) {
-//                                Log.d("room-info", "onGetRoomQrCodeFailure:" + wrongMsg.toString());
-//                            }
-//                        });
                     }
                     @Override
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @7858367
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @7858367
@@ -24,6 +24,8 @@ 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;
@@ -32,10 +34,13 @@ import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.xgimi.gimicinema.ICinemaControl;
 import com.xgimi.gimicinema.application.FangTangApplication;
+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<>();
@@ -95,6 +100,7 @@ public class CinemaControlService extends Service {
                 switch (state) {
                     case 0://空闲
                         fadeIn();
+                        showQrCodeRightNow();
 //                        msgEvent.setEventId(0x19910);
 //                        msgEvent.setMessage("open_switch");
 //                        EventBus.getDefault().post(msgEvent);
@@ -313,4 +319,13 @@ public class CinemaControlService extends Service {
 //        params = new byte[]{0x05, (byte) value};
 //        TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
     }
+
+    private void showQrCodeRightNow() {
+        Constant.count = -1;
+//        PollingUtils.stopPollingService();
+        MessageEvent messageEvent = new MessageEvent();
+        messageEvent.setEventId(COUNT_DOWN_ZERO);
+        messageEvent.setMessage("记数为0");
+        EventBus.getDefault().post(messageEvent);
+    }
 }