fix search ,light and server status,scan ,admin player movie

李攀
1 parent baaf8a93
Showing 10 changed files with 181 additions and 75 deletions
gimiCinema/src/main/aidl/com/xgimi/gimicinema/ICinemaControl.aidl
gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/DbUpdateUtils.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/AdsPreVideoPlayerActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/entity/Status.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/DBUpdateModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
gimiCinema/src/main/res/layout/activity_qr_code_show.xml
--- a/gimiCinema/src/main/aidl/com/xgimi/gimicinema/ICinemaControl.aidl
View file @43179bd
+++ b/gimiCinema/src/main/aidl/com/xgimi/gimicinema/ICinemaControl.aidl
View file @43179bd
@@ -41,4 +41,6 @@ interface ICinemaControl {
     void openLight();
     void closeLight();
+
+    void setUserControl(boolean userOperate);
 }
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @43179bd
@@ -9,6 +9,7 @@ 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;
+import com.gimi.common.cinema.utils.LogUtils;
 import com.xgimi.gimicinema.activity.CinemaConfig;
 import java.io.File;
@@ -170,6 +171,32 @@ public class NewDBManager {
         return result;
     }
+    /**
+     * 利用事务批量添加本地数据,存在的数据不再更新，不存在的直接插入
+     *
+     * @param localMovieMessageList lst
+     * @return boolean
+     */
+    public boolean addByTransaction(List<LocalMovieMessage> localMovieMessageList) {
+        boolean result = false;
+        LogUtils.i("scan-time Transaction", System.currentTimeMillis() + "");
+        db.beginTransaction();  //开始事务
+        try {
+            for (int i = 0; i < localMovieMessageList.size(); i++) {
+                ContentValues values = constructCv(localMovieMessageList.get(i));
+                db.insertWithOnConflict(NewDBHelper.TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+            }
+            db.setTransactionSuccessful();
+            result = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            db.endTransaction();    //结束事务
+        }
+        LogUtils.i("scan-time Transaction", System.currentTimeMillis() + ":" + result);
+        return result;
+    }
+
     public void deleteFileNotExists() {
         List<LocalMovieMessage> result = query();
         for (LocalMovieMessage lmm : result)
@@ -604,7 +631,7 @@ public class NewDBManager {
         }
         keyBuffer.append("'");*/
 //        Cursor c = db.rawQuery("SELECT * FROM movie_message where pinyin LIKE '%" + key + "%' order by length(pinyin) asc limit 0,20", null);
-        String sql = "SELECT * FROM movie_message where pinyin LIKE  " + "'%" + key + "%'" + "  order by length(name) asc limit 20";
+        String sql = "SELECT * FROM movie_message where pinyin LIKE  " + "'%" + key + "%'" + "  order by length(name) asc limit 99";
         Cursor c = db.rawQuery(sql, null);
         readCursor2List(persons, c);
         c.close();
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/DbUpdateUtils.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/DbUpdateUtils.java
View file @43179bd
@@ -66,7 +66,7 @@ public class DbUpdateUtils {
                     //区分结束还是卡死
                     callback.onMessage("已扫描:" + allLocalMovies.size());
                     if (allLocalMovies.size() != 0) {
-                        dbManager.add(allLocalMovies);
+                        dbManager.addByTransaction(allLocalMovies);
                         callback.onSuccess(allLocalMovies.size());
                     } else {
                         caught.setCode(0);
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SmartControlService.java
View file @43179bd
@@ -6,10 +6,12 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -52,6 +54,7 @@ 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.ICinemaControl;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.activity.AdsPreVideoPlayerActivity;
 import com.xgimi.gimicinema.activity.QrCodeShowActivity;
@@ -59,6 +62,7 @@ import com.xgimi.gimicinema.activity.SimpleAdsPlayer2;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import com.xgimi.gimicinema.entity.Status;
 import com.xgimi.gimicinema.poll.PollingUtils;
+import com.xgimi.gimicinema.service.CinemaControlService;
 import com.xgimi.gimicinema.service.CountService;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -85,6 +89,18 @@ public class SmartControlService extends BaseService implements EventListener<St
     private boolean initGetOderInfo;
     private RoomStatusInfo lastCompleteRoomStatusInfo;
     private int openDoorServerTime = 0;
+    private ICinemaControl iPlayer = null;
+    private ServiceConnection conn = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            LogUtils.i("bind cinema control service success");
+            iPlayer = ICinemaControl.Stub.asInterface(service);
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            LogUtils.i("cinema control service error");
+            iPlayer = null;
+        }
+    };
     private void initLock() {
         // 检查当前手机是否支持ble 蓝牙,如果不支持退出程序
@@ -101,6 +117,7 @@ public class SmartControlService extends BaseService implements EventListener<St
     public void onCreate() {
         super.onCreate();
         Log.d(TAG, "onCreate");
+        bindService(new Intent(SmartControlService.this, CinemaControlService.class), conn, Context.BIND_AUTO_CREATE);
     }
     @Override
@@ -321,6 +338,14 @@ public class SmartControlService extends BaseService implements EventListener<St
 //                if (info == null || info.getData() == null) {
 //                    break;
 //                }
+                if (iPlayer != null) {
+                    try {
+                        // end user control
+                        iPlayer.setUserControl(false);
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    }
+                }
                 Log.i("room-info", "COUNT_DOWN_ZERO stop polling finish some activity,jump to qr code activity");
                 try {
                     PollingUtils.stopPollingService(this, CountService.class, CountService.STATUS_ACTION);
@@ -367,9 +392,13 @@ public class SmartControlService extends BaseService implements EventListener<St
                     Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
                 }
                 LogUtils.i("room-info", messageEvent.getMessage());
-                Utils.saveString(this, "oder-play-completed", new Gson().toJson(roomStatusInfo));
-                roomStatusInfo = null;
-//                playEndAds();
+                String value = new Gson().toJson(roomStatusInfo);
+                if (!TextUtils.isEmpty(value)) {
+                    LogUtils.i("room-info", "room status info is:" + value);
+                    Utils.saveString(this, "oder-play-completed", value);
+                } else {
+                    LogUtils.i("room-info", "room status info is null");
+                }
                 break;
             default:
                 Log.d("room-info", messageEvent.getMessage());
@@ -712,6 +741,7 @@ public class SmartControlService extends BaseService implements EventListener<St
                     .putExtra("room_sn", roomInfo.getData().getRoom_sn())
                     .putExtra("order_sn", roomStatusInfo.getData().getOrder_sn());
             intentAds.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            roomStatusInfo = null;
             startActivity(intentAds);
         }
     }
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService1.java
View file @43179bd
@@ -113,7 +113,7 @@ public class SocketService1 extends BaseService {
     AtomicBoolean sendRegister = new AtomicBoolean(false);
     AtomicInteger heartBeatErrorCount = new AtomicInteger(0);
-    public ICinemaControl iPlayer = null;
+    private ICinemaControl iPlayer = null;
     private ServiceConnection conn = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder service) {
             LogUtils.i("bind cinema control service success");
@@ -122,6 +122,7 @@ public class SocketService1 extends BaseService {
         public void onServiceDisconnected(ComponentName className) {
             LogUtils.i("cinema control service error");
+            iPlayer = null;
         }
     };
@@ -646,15 +647,36 @@ public class SocketService1 extends BaseService {
             e.printStackTrace();
         }
-        if (op == 1 && status == 2) {
+        if (op == 1 && status == Status.PlayerStatus.PLAYER_PAUSE) {
             Log.d("setEqu", "开始播放");
-            ShellUtils.execCommand("input keyevent 23", false);
-        } else if (op == 2 && status == 1) {
+            mHandler.removeCallbacks(resumeRunnable);
+            pressCenterKey();
+        } else if (op == 2 && status == Status.PlayerStatus.PLAYER_PLAY) {
             Log.d("setEqu", "暂停播放");
-            ShellUtils.execCommand("input keyevent 23", false);
+            mHandler.postDelayed(resumeRunnable, 3 * 60 * 1000);
+            pressCenterKey();
         }
     }
+    private void pressCenterKey() {
+        ShellUtils.execCommand("input keyevent 23", false);
+    }
+
+    private Runnable resumeRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (iPlayer != null) {
+                try {
+                    if (iPlayer.getCurrentStatus() == Status.PlayerStatus.PLAYER_PAUSE) {
+                        pressCenterKey();
+                    }
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    };
+
     private void setEquipmentStatus(EquipmentControl equc) {
         setLight(equc.getLightCtl());
         playCtl(equc.getPlayCtl());
@@ -690,12 +712,13 @@ public class SocketService1 extends BaseService {
     }
     public int getLightStatus() {
-        int lightStatus = 3;
+        int lightStatus = 2;
         try {
             DeviceInfo connectDevice = ((FangTangApplication) getApplication()).
                     getConnectDevice();
             if (connectDevice == null) {
                 LogUtils.i(TAG, "connectDevice is null");
+                lightStatus = 3;
                 return lightStatus;
             }
             ConnectionStatus stu = Lights.getInstance().
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/AdsPreVideoPlayerActivity.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/AdsPreVideoPlayerActivity.java
View file @43179bd
@@ -4,7 +4,6 @@ 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;
@@ -27,8 +26,8 @@ public class AdsPreVideoPlayerActivity extends BaseActivity {
     private String playUrl;
     private String videoPath;
-    private AudioManager audioManager;
-    private int streamVolume;
+//    private AudioManager audioManager;
+//    private int streamVolume;
     private int playCount = 1;
     private int duration;
@@ -40,11 +39,11 @@ public class AdsPreVideoPlayerActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.a_pre_ads_player);
-        audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        streamVolume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM);
-        if (audioManager != null) {
-            audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, 20, 0);
-        }
+//        audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+//        streamVolume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM);
+//        if (audioManager != null) {
+//            audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, 20, 0);
+//        }
         playCount = Utils.getSp(this).getInt("play_count", 1);
         videoView = (VideoView) findViewById(R.id.videoView);
         timeCount = (TextView) findViewById(R.id.promoteTv);
@@ -115,10 +114,10 @@ public class AdsPreVideoPlayerActivity extends BaseActivity {
     protected void onStop() {
         super.onStop();
         Constant.isAdsOn = false;
-        if (audioManager != null) {
-            audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, streamVolume, 0);
-            audioManager = null;
-        }
+//        if (audioManager != null) {
+//            audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, streamVolume, 0);
+//            audioManager = null;
+//        }
         playUrl = null;
         videoView = null;
         System.gc();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/entity/Status.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/entity/Status.java
View file @43179bd
@@ -13,4 +13,32 @@ public class Status {
     public enum LightStatus {
         LIGHT_IDLE, LIGHT_CONNECTED
     }
+
+    public class PlayerStatus {
+        public static final int PLAYER_IDLE = 0;
+        public static final int PLAYER_PLAY = 1;
+        public static final int PLAYER_PAUSE = 2;
+    }
+
+    public enum PlayerStatusEnum {
+        PLAYER_IDLE(0), PLAYER_PLAY(1), PLAYER_PAUSE(2);
+
+        private int index;
+
+        PlayerStatusEnum(int idx) {
+            this.index = idx;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+    }
+
+    public static void main(String[] args) {
+//        PlayerStatusEnum playerStatusEnum = PlayerStatusEnum.PLAYER_IDLE;
+//        switch (playerStatusEnum){
+//            case 0:
+//                break;
+//        }
+    }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/DBUpdateModelImpl.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/DBUpdateModelImpl.java
View file @43179bd
@@ -76,8 +76,7 @@ public class DBUpdateModelImpl implements IDBUpdateModel {
             @Override
             public void doSomeThing() {
                 try {
-                    dbManager.add(all);
-                    dbManager.deleteFileNotExists();
+                    dbManager.addByTransaction(all);
                 } catch (Exception e) {
                     handler.post(new Runnable() {
                         @Override
@@ -94,6 +93,12 @@ public class DBUpdateModelImpl implements IDBUpdateModel {
                         l.insertSuccess(all.size());
                     }
                 });
+
+                try {
+                    dbManager.deleteFileNotExists();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @43179bd
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @43179bd
@@ -35,6 +35,7 @@ import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.xgimi.gimicinema.ICinemaControl;
 import com.xgimi.gimicinema.application.FangTangApplication;
+import com.xgimi.gimicinema.entity.Status;
 import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
@@ -48,8 +49,9 @@ public class CinemaControlService extends Service {
     private int currentState = 0;
     private String currentPath = null;
     //    private static final int SAVE_BEAT = 500;
-    private static final int SAVE_BEAT = 5;//default 50
+    private static final int SAVE_BEAT = 50;//default 50
     private int saveBeat = SAVE_BEAT;
+    private boolean userControl = false;
     private final ICinemaControl.Stub cinemaControl = new ICinemaControl.Stub() {
@@ -73,10 +75,10 @@ public class CinemaControlService extends Service {
         public void setCurrentMoviePosition(long duration) throws RemoteException {
 //            Log.d("aidl", "setCurrentMoviePosition: " + duration);
             currentPosition = duration;
-            if (saveBeat-- == 0) {
+            if (!userControl && saveBeat-- == 0) {
                 //TODO 保存当前进度,需要时从保存位置开始播放,取消播放器播放记录功能
                 // 播放一段时间确保状态为关闭
-//                saveBeat = SAVE_BEAT;
+                saveBeat = SAVE_BEAT;
                 try {
                     if (!fadeOuting && Lights.getInstance().getByMeshAddress(
                             ((FangTangApplication) getApplication()).getConnectDevice().meshAddress).status
@@ -114,24 +116,19 @@ public class CinemaControlService extends Service {
 //                }
 //                MessageEvent msgEvent = new MessageEvent();
                 switch (state) {
-                    case 0://空闲
+                    case Status.PlayerStatus.PLAYER_IDLE://空闲
                         fadeIn();
                         showQrCodeRightNow();
-//                        msgEvent.setEventId(0x19910);
-//                        msgEvent.setMessage("open_switch");
-//                        EventBus.getDefault().post(msgEvent);
                         break;
-                    case 1://播放
-                        fadeOut();
-//                        msgEvent.setEventId(0x19910);
-//                        msgEvent.setMessage("close_switch");
-//                        EventBus.getDefault().post(msgEvent);
+                    case Status.PlayerStatus.PLAYER_PLAY://播放
+                        if (!userControl) {
+                            fadeOut();
+                        }
                         break;
-                    case 2://暂停
-//                        fadeIn();
-//                        msgEvent.setEventId(0x19910);
-//                        msgEvent.setMessage("open_switch");
-//                        EventBus.getDefault().post(msgEvent);
+                    case Status.PlayerStatus.PLAYER_PAUSE://暂停
+                        if (!userControl) {
+                            fadeIn();
+                        }
                         break;
                 }
             }
@@ -140,15 +137,10 @@ public class CinemaControlService extends Service {
         @Override
         public void addPlayPath(String path) throws RemoteException {
             movies.add(path);//strict contract
-//            MessageEvent msgEvent = new MessageEvent();
-//            msgEvent.setEventId(0x19910);
-//            msgEvent.setMessage("open_switch");
-//            EventBus.getDefault().post(msgEvent);
         }
         @Override
         public void setCurrentPlayPath(String path) throws RemoteException {
-//            Log.d("aidl", "setCurrentPlayPath: " + path);
             CinemaControlService.this.currentPath = path;
             FangTangApplication application = (FangTangApplication) getApplication();
             application.setCurrentPlayUrl(path);
@@ -174,12 +166,19 @@ public class CinemaControlService extends Service {
         }
         public void openLight() throws RemoteException {
+            userControl = true;
             fadeIn();
         }
         public void closeLight() throws RemoteException {
+            userControl = true;
             fadeOut();
         }
+
+        @Override
+        public void setUserControl(boolean userOperate) throws RemoteException {
+            userControl = userOperate;
+        }
     };
     public CinemaControlService() {
@@ -198,11 +197,11 @@ public class CinemaControlService extends Service {
         public void run() {
             setLightValue(value);
             if (value-- == maxValue) {
-                handler.postDelayed(this, 4 * 1000);
+                handler.postDelayed(this, 2 * 1000);
             } else {
                 if (value == 0) {
                     //how to remove
-                    handler.postDelayed(doClose, 3 * 1000);
+                    handler.postDelayed(doClose, 2 * 1000);
                 } else {
                     handler.postDelayed(this, 80);
                 }
@@ -286,12 +285,7 @@ public class CinemaControlService extends Service {
             setLightValue(maxValue);
             return;
         }
-//        int status = mApplication.getConnectDevice().status;
-//        Log.d("status_charge", "fadeIn: " + status);
         value = LIGHT_MIN_VALUE;
-//        if (byMeshAddress.brightness > value) {
-//            value = byMeshAddress.brightness;
-//        }
         handler.post(openRunnable);
     }
@@ -317,9 +311,6 @@ public class CinemaControlService extends Service {
             return;
         }
         maxValue = Utils.getInt(context, "brightness", 50);
-
-//        int status = connectDevice.status;
-//        Log.d("status_charge", "fadeOut: " + status);
         value = maxValue;
         handler.post(closeRunnable);
     }
@@ -337,7 +328,6 @@ public class CinemaControlService extends Service {
         } else {
             Log.d("aidl", "set value failure:" + (TelinkLightService.Instance() != null));
         }
-
 //        opcode = (byte) 0xE2;
 //        params = new byte[]{0x05, (byte) value};
 //        TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
@@ -345,6 +335,7 @@ public class CinemaControlService extends Service {
     private void showQrCodeRightNow() {
         if (duration - currentPosition < 1000 * 60) {
+            userControl = false;
             MessageEvent messageEvent = new MessageEvent();
             messageEvent.setEventId(SmartControlService.ORDER_PLAY_COMPLETE);
             messageEvent.setMessage("电影播放完成，记录完成订单信息");
--- a/gimiCinema/src/main/res/layout/activity_qr_code_show.xml
View file @43179bd
+++ b/gimiCinema/src/main/res/layout/activity_qr_code_show.xml
View file @43179bd
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:background="@color/white"
-        tools:context="com.xgimi.gimicinema.activity.QrCodeShowActivity">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:context="com.xgimi.gimicinema.activity.QrCodeShowActivity">
-    <ImageView android:layout_width="400dp"
-               android:id="@+id/qrCodeIv"
-               android:layout_height="400dp"/>
+    <ImageView
+        android:id="@+id/qrCodeIv"
+        android:layout_width="300dp"
+        android:layout_height="300dp" />
-    <TextView android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textSize="30sp"
-              android:textColor="@color/black"
-              android:text="打扫完成后请扫二维码确认"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="打扫完成后请扫二维码确认"
+        android:textColor="@color/black"
+        android:textSize="30sp" />
 </LinearLayout>