Merge branch 'master' of gitlab.qnbar.com:pan.li/fangTang

wugian
2 parents 5db5faa2 af0f2452
Showing 10 changed files with 52 additions and 90 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
switchcontrol/build.gradle
switchcontrol/src/main/AndroidManifest.xml
switchcontrol/src/main/java/com/qnbar/switchcontrol/MainActivity.java
switchcontrol/src/main/res/layout/activity_main.xml
switchcontrollib/build.gradle
--- a/gimiCinema/build.gradle
View file @2359ee8
+++ b/gimiCinema/build.gradle
View file @2359ee8
@@ -148,7 +148,7 @@ dependencies {
     //    compile 'com.android.support:support-v4:25.2.0'
     compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
+//    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
 }
 def getPwd(modifyPwd) {
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @2359ee8
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @2359ee8
@@ -6,6 +6,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.QueryType;
 import com.gimi.common.cinema.model.SourceType;
@@ -457,6 +458,23 @@ public class NewDBManager {
      *
      * @return persons
      */
+    public List<LocalMovieMessage> queryPlayMovie(String md5) {
+        String sql = "SELECT * FROM movie_message where md5 = '" + md5 + "'";
+
+        ArrayList<LocalMovieMessage> persons = new ArrayList<LocalMovieMessage>();
+        StringBuffer sb = new StringBuffer(sql);
+
+        Cursor c = db.rawQuery(sb.toString(), null);
+        readCursor2List(persons, c);
+        c.close();
+        return persons;
+    }
+
+    /**
+     * query all recommend qn
+     *
+     * @return persons
+     */
     public List<LocalMovieMessage> queryAllDemandMovies() {
         String sql = "SELECT * FROM movie_message order by cast(" + NewDBHelper.MOVIE_COUNT + " as int) desc, cast(movie_dl_time as int) desc limit " + PXB_MOVIE_COUNT;/* + " path like '%" + key + "%'";*/
         ArrayList<LocalMovieMessage> persons = new ArrayList<LocalMovieMessage>();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @2359ee8
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @2359ee8
@@ -44,6 +44,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;
@@ -51,7 +52,6 @@ import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
 import com.bluetoothle.BLEBroadcastReceiver;
 import com.bluetoothle.BLEOpenRecord;
 import com.bluetoothle.GREENBluetoothLeService;
-import com.bluetoothle.greencity.GREENBLE;
 import com.bluetoothle.greencity.GREENCITYBLEProtocolFactory;
 import com.gimi.common.cinema.db.NewDBManager;
 import com.gimi.common.cinema.model.ClassificationItem;
@@ -61,6 +61,7 @@ import com.gimi.common.cinema.model.LocalMovieMessage;
 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.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.M1905Utils;
@@ -104,6 +105,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;
@@ -451,12 +453,28 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     }
     @Override
-    public void countDownOrderTime(int durationMinutes) {
+    public void updateOrderInfo(RoomStatusInfo info) {
+        RoomStatusInfo.DataEntity data = info.getData();
+        int durationMinutes = data.getEnd_time() - data.getBegin_time();
+        Log.d("CountService", "durationMinutes:" + durationMinutes);
         if (durationMinutes <= 1) {
             return;
         }
         Constant.count = durationMinutes + 1;
         PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
+
+        List<LocalMovieMessage> localMovieMessages = null;
+        if (!TextUtils.isEmpty(data.getFilm_hash())) {
+            localMovieMessages = new NewDBManager(this).queryPlayMovie(data.getFilm_hash());
+        }
+        if (localMovieMessages == null || localMovieMessages.size() == 0) {
+            show("没有获取到相应订单信息,即将为您播放银河护卫队");
+            localMovieMessages = new NewDBManager(this).queryPlayMovie("C1584FFF17811A7FAE58BC564AE79488");
+        }
+        if (localMovieMessages != null && localMovieMessages.size() > 0) {
+            OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);
+        }
+
     }
     private RoomQrCodeInfo info;
@@ -464,6 +482,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo info) {
         this.info = info;
+
     }
     @Override
@@ -922,7 +941,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                     break;
                 }
                 startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", info.getData().getCode()));
-//                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "countDownOrderTime"));
+//                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
         }
     }
@@ -951,12 +970,12 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
             }
         });
-        String openCMD = "Open the door";
-        GREENBLE.send(this, lockMac, openCMD.getBytes());
-        List<LocalMovieMessage> localMovieMessages = new NewDBManager(this).queryRandomMovies();
-        if (localMovieMessages != null && localMovieMessages.size() > 0) {
-            OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);
-        }
+//        String openCMD = "Open the door";
+//        GREENBLE.send(this, lockMac, openCMD.getBytes());
+//        List<LocalMovieMessage> localMovieMessages = new NewDBManager(this).queryRandomMovies();
+//        if (localMovieMessages != null && localMovieMessages.size() > 0) {
+//            OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);
+//        }
     }
     //---------------------------about switch-----------------------------------
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
View file @2359ee8
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
View file @2359ee8
@@ -21,6 +21,7 @@ import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
+import com.gimi.common.cinema.model.RoomStatusInfo;
 import java.util.List;
@@ -56,7 +57,7 @@ public interface IMainView {
     void openClazz(ClassificationItem classificationItem);
-    void countDownOrderTime(int durationMinutes);
+    void updateOrderInfo(RoomStatusInfo info);
     void prepareRoomQrCodeInfo(RoomQrCodeInfo info);
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @2359ee8
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @2359ee8
@@ -242,7 +242,7 @@ public class MainPresenter extends BasePresenter
                         RoomStatusInfo.DataEntity data = info.getData();
                         int durationMinutes = data.getEnd_time() - data.getBegin_time();
                         Log.d("CountService", "durationMinutes:" + durationMinutes);
-                        mainView.countDownOrderTime(durationMinutes);
+                        mainView.updateOrderInfo(info);
                         roomInfoModel.getRoomQrCode(data.getOrder_sn(), new RoomInfoModelImpl.GetRoomQrCodeListener() {
                             @Override
                             public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
--- a/switchcontrol/build.gradle
View file @2359ee8
+++ b/switchcontrol/build.gradle
View file @2359ee8
@@ -37,7 +37,7 @@ dependencies {
     })
     compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
     compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
+//    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
     compile 'com.android.support:design:25.2.0'
     compile 'org.greenrobot:eventbus:3.0.0'
     testCompile 'junit:junit:4.12'
--- a/switchcontrol/src/main/AndroidManifest.xml
View file @2359ee8
+++ b/switchcontrol/src/main/AndroidManifest.xml
View file @2359ee8
@@ -11,19 +11,6 @@
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
         <activity
-                android:name=".MainActivity"
-                android:label="@string/title_activity_main"
-                android:theme="@style/AppTheme.NoActionBar">
-
-            <!--
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            -->
-        </activity>
-        <activity
                 android:name=".SwitchControlActivity"
                 android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
--- a/switchcontrol/src/main/java/com/qnbar/switchcontrol/MainActivity.java deleted 100644 → 0
View file @5db5faa
+++ b/switchcontrol/src/main/java/com/qnbar/switchcontrol/MainActivity.java deleted 100644 → 0
View file @5db5faa
-package com.qnbar.switchcontrol;
-
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
-    }
-
-}
--- a/switchcontrol/src/main/res/layout/activity_main.xml deleted 100644 → 0
View file @5db5faa
+++ b/switchcontrol/src/main/res/layout/activity_main.xml deleted 100644 → 0
View file @5db5faa
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.qnbar.switchcontrol.MainActivity">
-
-    <android.support.design.widget.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="@style/AppTheme.PopupOverlay"/>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_main"/>
-
-    <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            app:srcCompat="@android:drawable/ic_dialog_email"/>
-
-</android.support.design.widget.CoordinatorLayout>
--- a/switchcontrollib/build.gradle
View file @2359ee8
+++ b/switchcontrollib/build.gradle
View file @2359ee8
@@ -36,7 +36,7 @@ dependencies {
     })
     compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
     compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
+//    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
     compile 'com.android.support:design:25.2.0'
     compile 'org.greenrobot:eventbus:3.0.0'
     testCompile 'junit:junit:4.12'