基本开关门流程,开关有时候会回调失败,删除部分不需要代码

wugian
1 parent 97db1318
Showing 8 changed files with 100 additions and 328 deletions
gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/BaseActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/AskService.java
gimiCinema/src/main/res/layout/a_main.xml
--- a/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/qnbar/smc/service/SocketService.java
View file @b4a982c
@@ -42,6 +42,7 @@ public class SocketService extends Service {
       10009 //已经认证过了,不允许再认证
     */
     private static final int SUCCESS_MESSAGE = 10000;
+    private static final int CONTAIN_MESSAGE = 10001;
     private static final int AUTHENTICATION_FAILED = 10002; //连接(认证)失败
     private static final int CONNECTION_BEFORE_AUTHENTICATION = 10003;//还未注册连接就进行认证
     private static final int NOT_SEND_ROOM_SN = 10004;//终端编号未传
@@ -262,8 +263,8 @@ public class SocketService extends Service {
                                             sendMsg(msg);
                                         }
                                         break;
-                                    case OPEN_DOOR:
-                                        if (socketResponse.getData() != null) {
+                                    case CONTAIN_MESSAGE:
+                                        if (socketResponse.getData() != null && socketResponse.getCmd() == OPEN_DOOR) {
                                             switch (socketResponse.getData().getUser()) {
                                                 //10用户,20管理员,默认值为0
                                                 case 10:
@@ -288,12 +289,12 @@ public class SocketService extends Service {
                                     default:
                                         Log.d(TAG, "print msg:" + socketResponse.toString());
                                 }
-                                if (("openDoor").equals(socketResponse.getCmd())) {
-                                    MessageEvent messageEvent = new MessageEvent();
-                                    messageEvent.setEventId(JUST_OPEN_DOOR);
-                                    messageEvent.setMessage("click item");
-                                    EventBus.getDefault().post(messageEvent);
-                                }
+//                                if (("openDoor").equals(socketResponse.getCmd())) {
+//                                    MessageEvent messageEvent = new MessageEvent();
+//                                    messageEvent.setEventId(JUST_OPEN_DOOR);
+//                                    messageEvent.setMessage("click item");
+//                                    EventBus.getDefault().post(messageEvent);
+//                                }
                             } catch (JsonSyntaxException e) {
                                 Log.d(TAG, message);
                                 e.printStackTrace();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/BaseActivity.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/BaseActivity.java
View file @b4a982c
 package com.xgimi.gimicinema.activity;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.KeyEvent;
 import android.view.MotionEvent;
-import com.gimi.common.cinema.model.Constant;
-import com.gimi.common.cinema.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.SystemUtils;
-import com.gimi.common.cinema.utils.Utils;
 import com.umeng.analytics.MobclickAgent;
-import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.service.AskService;
 /**
@@ -23,15 +16,12 @@ public class BaseActivity extends Activity {
     //    public static final int THEME_DEFAULT = 1;
 //    public static final int THEME_GOOD = 2;
 //    public static final int THEME_THEME = 3;
-    private AlertDialog alertDialog;
-    private int agentType;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 //        setBaseTheme();
         super.onCreate(savedInstanceState);
         MobclickAgent.setDebugMode(true);
-        agentType = Utils.getInt(Utils.getSp(this), "agent-type", 0);
     }
@@ -44,9 +34,6 @@ public class BaseActivity extends Activity {
     protected void onDestroy() {
         super.onDestroy();
         LeeImageLoader.clearCache(this);
-        if (alertDialog != null) {
-            alertDialog.dismiss();
-        }
     }
 //    private void setBaseTheme() {
@@ -73,47 +60,11 @@ public class BaseActivity extends Activity {
 //    }
-    protected void showDialog() {
-        if (alertDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle("提示");
-            builder.setMessage("点播时间已到,如有需要,请到前台续时");
-            builder.setOnKeyListener(new DialogInterface.OnKeyListener() {
-                @Override
-                public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                    return keyCode == KeyEvent.KEYCODE_BACK;
-                }
-            });
-            builder.setCancelable(false);
-            builder.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (Constant.messageRun) {
-                        dialog.dismiss();
-                    } else {
-                        BaseActivity.this.finish();
-                    }
-                }
-            });
-            alertDialog = builder.create();
-        }
-        alertDialog.show();
-    }
-
-
     @Override
     protected void onResume() {
         super.onResume();
         MobclickAgent.onResume(this);
         bind();
-        if (agentType == 5 && AuthUtils.checkOfflineAuthTime(this)) {
-            return;
-        }
-        if (BuildConfig.MACHINE_TYPE.equals("himedia")) {
-            if (!Constant.messageRun) {
-                showDialog();
-            }
-        }
     }
     @Override
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @b4a982c
@@ -197,6 +197,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         ImageView sourceTypeIv = (ImageView) findViewById(R.id.movie_source_type_iv);
         controlQrCodeIv = (ImageView) findViewById(R.id.controlQrCode);
+        controlQrCodeIv.setVisibility(View.GONE);
         recommendRv = (OrderRecyclerView) findViewById(R.id.recommend);
         mainSearch = (Button) findViewById(R.id.mainSearch);
         scrollView = (ScrollView) findViewById(R.id.scrollView);
@@ -236,13 +237,13 @@ 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();
-//            }
-//        }, 20 * 1000);
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Log.d("room-info", "test open door report");
+                openDoor();
+            }
+        }, 5 * 1000);
     }
     @Override
@@ -360,30 +361,30 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void showUnauthorized() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle("提示");
-        String promote = getString(R.string.unauthorized_promote);
-        if (BuildConfig.MACHINE_TYPE.equals("himedia")) {
-            promote += "串号：" + SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE);
-        }
-        builder.setMessage(promote);
-        builder.setOnKeyListener(new DialogInterface.OnKeyListener() {
-            @Override
-            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                return keyCode == KeyEvent.KEYCODE_BACK;
-            }
-        });
-        builder.setCancelable(false);
-        builder.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (Constant.gimiAuth) {
-                    dialog.dismiss();
-                } else {
-                    MainActivity.this.finish();
-                }
-            }
-        }).show();
+//        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+//        builder.setTitle("提示");
+//        String promote = getString(R.string.unauthorized_promote);
+//        if (BuildConfig.MACHINE_TYPE.equals("himedia")) {
+//            promote += "串号：" + SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE);
+//        }
+//        builder.setMessage(promote);
+//        builder.setOnKeyListener(new DialogInterface.OnKeyListener() {
+//            @Override
+//            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+//                return keyCode == KeyEvent.KEYCODE_BACK;
+//            }
+//        });
+//        builder.setCancelable(false);
+//        builder.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+//            @Override
+//            public void onClick(DialogInterface dialog, int which) {
+//                if (Constant.gimiAuth) {
+//                    dialog.dismiss();
+//                } else {
+//                    MainActivity.this.finish();
+//                }
+//            }
+//        }).show();
     }
     @Override
@@ -506,7 +507,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
             }
             Log.d("room-info", "report the open door status");
             if (roomStatusInfo == null || roomStatusInfo.getData() == null) {
-                presenter.reportOpenDoorStatus("123456");
+//                presenter.reportOpenDoorStatus("123456");
+                Log.d("room-info", "report room status null");
             } else {
                 presenter.reportOpenDoorStatus(roomStatusInfo.getData().getOrder_sn());
             }
@@ -519,6 +521,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void prepareRoomQrCodeInfo(RoomQrCodeInfo info) {
         this.info = info;
+        startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", info.getData().getCode()));
     }
     @Override
@@ -1030,20 +1033,20 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 if (info == null || info.getData() == null) {
                     break;
                 }
-                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", info.getData().getCode()));
+                presenter.getCleanQrCode(roomStatusInfo.getData().getOrder_sn());
 //                startActivity(new Intent(this, QrCodeShowActivity.class).putExtra("qr", "updateOrderInfo"));
                 break;
         }
     }
     private void openDoor() {
+        Log.d("room-info", "openDoor called");
         bleBroadcastReceiver.setResponseObj(new GREENCITYBLEProtocolFactory.GREENCITYBleDataWritten() {
             @Override
             public void writeSuccess() {
                 bleBroadcastReceiver.setResponseObj(null);
                 Toast.makeText(MainActivity.this, "开门成功", Toast.LENGTH_SHORT).show();
-
                 BLEOpenRecord bleOpenRecord = new BLEOpenRecord();
                 bleOpenRecord.setLockmac(lockMac);
                 bleOpenRecord.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date()));
@@ -1052,7 +1055,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 intent.putExtra("openrecord", bleOpenRecord);
                 sendBroadcast(intent);
                 Log.d("room-info", "open success");
-                handler.post(reportRunnable);
+                handler.postDelayed(reportRunnable, 30 * 1000);
             }
             @Override
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/RoomInfoModelImpl.java
View file @b4a982c
@@ -39,6 +39,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
             }
         }
+        Log.d("room-info", "request:getRoomInfo,url = " + ROOM_INFO_BY_IMEI_URL + imei);
         OkHttpClientManager.getAsyn(ROOM_INFO_BY_IMEI_URL + imei,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
@@ -71,6 +72,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     @Override
     public void getRoomStatus(String roomSn, final GetRoomStatusListener listener) {
+        Log.d("room-info", "request:getRoomStatus,url = " + ROOM_STATUS_BY_ROOM_SN_URL + roomSn);
         OkHttpClientManager.getAsyn(ROOM_STATUS_BY_ROOM_SN_URL + roomSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
@@ -101,6 +103,7 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     @Override
     public void getRoomQrCode(String orderSn, final GetRoomQrCodeListener listener) {
+        Log.d("room-info", "request:getRoomQrCode,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn);
         OkHttpClientManager.getAsyn(ROOM_QRCODE_BY_ORDER_SN + orderSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
@@ -132,16 +135,18 @@ public class RoomInfoModelImpl implements IRoomInfoModel {
     @Override
     public void reportOpenDoorStatus(String orderSn, final OpenDoorStatusListener listener) {
+        Log.d("room-info", "request:reportOpenDoorStatus,url = " + ROOM_QRCODE_BY_ORDER_SN + orderSn);
         OkHttpClientManager.getAsyn(ROOM_REPORT_ROOM_STATUS + orderSn,
                 new OkHttpClientManager.ResultCallback<String>() {
                     @Override
                     public void onError(Request request, Exception e) {
+                        Log.d("room-info", request.toString() + "," + e.getMessage());
                         listener.onOpenDoorFailure();
                     }
                     @Override
                     public void onResponse(String response) {
-                        Log.d("cccccc", response);
+                        Log.d("room-info", response);
                         listener.onOpenDoorSuccess();
                     }
                 });
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @b4a982c
@@ -22,13 +22,11 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 import com.gimi.common.cinema.model.ClassificationItem;
-import com.gimi.common.cinema.model.Constant;
 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 com.gimi.common.cinema.model.WrongMsg;
-import com.gimi.common.cinema.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LocalDataUtils;
 import com.gimi.common.cinema.utils.SambaFileCharge;
 import com.gimi.common.cinema.utils.SystemUtils;
@@ -91,7 +89,7 @@ public class MainPresenter extends BasePresenter
     public void load(final Context context) {
         this.context = context;
-        loadCtrl(context);
+//        loadCtrl(context);
         mountSamba(context);
         loadRecommend(context);
         loadClassification(context);
@@ -261,18 +259,18 @@ public class MainPresenter extends BasePresenter
                         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());
-                            }
-                        });
+//                        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
@@ -294,6 +292,22 @@ public class MainPresenter extends BasePresenter
         });
     }
+    public void getCleanQrCode(String orderSn) {
+        roomInfoModel.getRoomQrCode(orderSn, new RoomInfoModelImpl.GetRoomQrCodeListener() {
+            @Override
+            public void onGetRoomQrCodeSuccess(RoomQrCodeInfo info) {
+                Log.d("room-info", "getCleanQrCode#onGetRoomQrCodeSuccess:" + info.toString());
+                mainView.prepareRoomQrCodeInfo(info);
+            }
+
+            @Override
+            public void onGetRoomQrCodeFailure(WrongMsg wrongMsg) {
+                Log.d("room-info", "onGetRoomQrCodeFailure:" + wrongMsg.toString());
+            }
+        });
+    }
+
+
     @Override
     public void onGetControlImageSuccess(Bitmap bitmap) {
         mainView.loadCtrlImg(bitmap);
@@ -346,17 +360,17 @@ public class MainPresenter extends BasePresenter
     }
     public void checkAuth() {
-        if (new SystemUtils().getYbProp() == 3 || Utils.getInt(context, "agent-type", 0) == 5) {
-            return;
-        }
-        if (!Constant.gimiAuth) {
-            mainView.showUnauthorized();
-        }
-        if (!AuthUtils.checkOfflineAuthTime(context)) {
-            if (AuthUtils.isFinish(context)) {
-                mainView.showUnauthorizedTimeOut();
-            }
-        }
+//        if (new SystemUtils().getYbProp() == 3 || Utils.getInt(context, "agent-type", 0) == 5) {
+//            return;
+//        }
+//        if (!Constant.gimiAuth) {
+//            mainView.showUnauthorized();
+//        }
+//        if (!AuthUtils.checkOfflineAuthTime(context)) {
+//            if (AuthUtils.isFinish(context)) {
+//                mainView.showUnauthorizedTimeOut();
+//            }
+//        }
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/receiver/BootReceiver.java
View file @b4a982c
@@ -23,7 +23,6 @@ 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;
@@ -98,11 +97,11 @@ public class BootReceiver extends BroadcastReceiver {
             Intent intents = new Intent(context, AskService.class);
             context.startService(intents);
         }
-        if (startOpen && !Constant.userOpen) {
-            Intent openIntent = new Intent(context, StartActivity.class);
-            openIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(openIntent);
-        }
+//        if (startOpen && !Constant.userOpen) {
+        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/AskService.java
View file @b4a982c
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/AskService.java
View file @b4a982c
 package com.xgimi.gimicinema.service;
 import android.app.Service;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.Message;
-import android.os.RemoteException;
-import android.text.TextUtils;
-import android.util.Log;
 import android.widget.Toast;
 import com.gimi.common.cinema.db.NewDBManager;
-import com.gimi.common.cinema.model.BaseData;
 import com.gimi.common.cinema.model.Constant;
-import com.gimi.common.cinema.model.ControlMessage;
-import com.gimi.common.cinema.model.GimiMessage;
-import com.gimi.common.cinema.model.GimiSysMsg;
-import com.gimi.common.cinema.model.PlayStatus;
-import com.gimi.common.cinema.model.PlayStatusMessage;
 import com.gimi.common.cinema.model.SambaMsg;
-import com.gimi.common.cinema.model.UdpModel;
-import com.gimi.common.cinema.utils.AuthUtils;
-import com.gimi.common.cinema.utils.FolderUtils;
 import com.gimi.common.cinema.utils.LocalDataUtils;
-import com.gimi.common.cinema.utils.MovieMessageUtils;
 import com.gimi.common.cinema.utils.OpenMMUtils;
-import com.gimi.common.cinema.utils.SambaFileCharge;
 import com.gimi.common.cinema.utils.SystemUtils;
-import com.gimi.common.cinema.utils.T;
 import com.gimi.common.cinema.utils.Utils;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.xgimi.gimicinema.BuildConfig;
-import com.xgimi.gimicinema.ICinemaControl;
-import com.xgimi.gimicinema.activity.CinemaConfig;
-import com.xgimi.gimicinema.deserializer.GimiMessageDeserializer;
-import com.xgimi.gimicinema.deserializer.GimiSysMsgDeserializer;
 import com.xgimi.gimicinema.mview.IAskView;
 import com.xgimi.gimicinema.presenter.AskPresenter;
-import java.util.ArrayList;
 import java.util.List;
@@ -63,36 +37,20 @@ public class AskService extends Service implements IAskView {
     private String folder = "";
     private SambaMsg sambaMsg;
-    private Gson gson;
-    private UdpPostSender sender;
+
     @Override
     public void onCreate() {
         super.onCreate();
         context = this;
-        if (!mBound) {
-            attemptToBindService();
-        }
-        gson = new GsonBuilder()
-                .registerTypeAdapter(GimiSysMsg.class, new GimiSysMsgDeserializer())
-                .registerTypeAdapter(GimiMessage.class, new GimiMessageDeserializer())
-//                .registerTypeAdapter(typeStatus, new QnMsgDeserializer<StatusData>())
-//                .registerTypeAdapter(typeMessage, new QnMsgDeserializer<List<MessageData>>())
-                .create();
-
         askPresenter = new AskPresenter(this);
         localDataUtils = new LocalDataUtils(context);
         dbManager = new NewDBManager(this);
         systemUtils = new SystemUtils();
         sharedPreferences = Utils.getSp(context);
         agentType = Utils.getInt(sharedPreferences, "agent-type", 0);
-        Log.d(TAG, "onCreate: " + BuildConfig.MACHINE_TYPE);
         updateMsg();
-
-        sender = new UdpPostSender("", 53301, 53301, _handler);
-
         askPresenter.load(context);
         handler.postDelayed(updateRunnable, 5 * 1000);
-//        PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
     }
     private void updateMsg() {
@@ -103,133 +61,8 @@ public class AskService extends Service implements IAskView {
     int agentType;
-    private Handler _handler = new Handler() {
-        @Override
-        public void dispatchMessage(Message msg) {
-            if (msg.what == UdpPostSender.MSG_PARSE_DATA) {
-                //maybe need delay
-                if (AuthUtils.isFinish(context)) {
-                    return;
-                }
-                String obj = (String) msg.obj;
-                ControlMessage controlMessage = gson.fromJson(obj, ControlMessage.class);
-                UdpModel udpModel1 = controlMessage.getUdpModel();
-                switch (controlMessage.getAction()) {
-                    case 0://播放点播电影
-                        playPath(getPlayUrl(udpModel1.getMovie_url()));
-                        break;
-                    case 1://播放点播电影列表
-//                        int length = udpModel1.getMovie_urls().length;
-//                        String[] trans = new String[length];
-//                        for (int i = 0; i < length; i++) {
-//                            trans[i] = getPlayUrl(udpModel1.getMovie_urls()[i]);
-//                        }
-                        playMultiPath(udpModel1.getMovie_urls(), udpModel1.getPosition());
-                        break;
-                    case 2://返回当前播放状态
-                        try {
-                            returnCurrentStatus();
-                        } catch (RemoteException e) {
-                            e.printStackTrace();
-                        }
-                        break;
-                }
-            }
-            super.dispatchMessage(msg);
-        }
-    };
-
-    private void returnCurrentStatus() throws RemoteException {
-        PlayStatusMessage statusMessage = new PlayStatusMessage();
-        statusMessage.setAction(2);
-        PlayStatus status = new PlayStatus();
-        status.setCurrentPosition(cinemaControl.getCurrentMoviePosition());
-        status.setMovieLength(cinemaControl.getMovieDuration());
-        status.setMovieUrls(cinemaControl.getPlayList());
-        status.setPath(cinemaControl.getCurrentPath());
-        status.setState(cinemaControl.getCurrentStatus());
-        statusMessage.setStatus(status);
-        String s = gson.toJson(statusMessage);
-        sender.sendUDPmsg(s);
-    }
-
-    private void playMultiPath(String[] movie_urls, int position) {
-        stopMediaPlayer();
-        Toast.makeText(context.getApplicationContext(),
-                "即将播放新的列表电影", Toast.LENGTH_SHORT).show();
-        List<String> result = new ArrayList<>();
-        for (String movie_url : movie_urls) {
-            result.add("/mnt/samba/" + movie_url);
-        }
-        try {
-            cinemaControl.setPlayList(null);
-            cinemaControl.setPlayList(result);
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        }
-        playPath(result, position);
-    }
-
-
-    private String getPlayUrl(String url) {
-        String result;
-        if (BuildConfig.MACHINE_TYPE.equals("himedia")) {
-            String replace = url.replace(ip, "");
-            if (!TextUtils.isEmpty(folder) && (replace.startsWith(folder)
-                    || replace.startsWith("//" + folder)
-                    || replace.startsWith("/" + folder))) {
-                replace = replace.replace(folder, "");
-            }
-            result = (CinemaConfig.BASIC_ROOT + replace);
-        } else {
-            result = ("/mnt/samba/" + url);
-        }
-        return result;
-    }
-
     private String currentPath = "";
-    private void playPath(String videoPath) {
-        try {
-            cinemaControl.setPlayList(null);
-        } catch (RemoteException e) {
-            e.printStackTrace();
-        }
-        if (!TextUtils.isEmpty(videoPath)) {
-            if (SambaFileCharge.fileExist(videoPath)) {
-                currentPath = videoPath;
-                BaseData bd = new BaseData();
-                bd.setPath(videoPath);
-                stopMediaPlayer();
-                Toast.makeText(context.getApplicationContext(),
-                        "即将播放新的电影", Toast.LENGTH_SHORT).show();
-
-                final String path = bd.getPath();
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        askPresenter.playMovie(context, path);
-                    }
-                }, 5000);
-                String movieFolderPath = FolderUtils.getMovieFolderPath(videoPath, sambaMsg.getIp(), null);
-                int playCount = MovieMessageUtils.getPlayCount(movieFolderPath);
-                playCount = playCount + 1;
-                MovieMessageUtils.writePlayCount(movieFolderPath, playCount);//update files
-                dbManager.updateMovieCount(videoPath, playCount);
-            } else {
-                T.show(context, "没有电影可以播放,请检查网络或者服务器情况");
-                askPresenter.load(context);
-                updateMsg();
-            }
-        } else {
-            T.show(context, "没有电影可以播放");
-        }
-    }
-
-    private void stopMediaPlayer() {
-        systemUtils.stopMediaPlayer(context.getApplicationContext());
-    }
-
     private Runnable updateRunnable = new Runnable() {
         @Override
         public void run() {
@@ -253,10 +86,6 @@ public class AskService extends Service implements IAskView {
     @Override
     public void onDestroy() {
         askPresenter.umountSamba();
-        if (mBound) {
-            unbindService(mServiceConnection);
-            mBound = false;
-        }
         super.onDestroy();
     }
@@ -274,35 +103,4 @@ public class AskService extends Service implements IAskView {
     public void showMsg(String msg) {
         Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
     }
-        //由AIDL文件生成的Java类
-    private ICinemaControl cinemaControl = null;
-
-    //标志当前与服务端连接状况的布尔值，false为未连接，true为连接中
-    private boolean mBound = false;
-
-
-    private ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            cinemaControl = ICinemaControl.Stub.asInterface(service);
-            mBound = true;
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mBound = false;
-        }
-    };
-
-    /**
-     * 尝试与服务端建立连接
-     */
-    private void attemptToBindService() {
-        Intent intent = new Intent();
-        intent.setAction("com.gimicinema.cinemacontrol");
-        intent.setPackage("com.xgimi.gimicinema");
-        bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
-    }
-
-    public static final String ACTION = "cn.etzmico.broadcastreceiverregister.SENDBROADCAST";
 }
--- a/gimiCinema/src/main/res/layout/a_main.xml
View file @b4a982c
+++ b/gimiCinema/src/main/res/layout/a_main.xml
View file @b4a982c
@@ -89,6 +89,7 @@
                     <TextView android:layout_width="150dp"
                               android:layout_height="wrap_content"
                               android:gravity="center"
+                              android:visibility="invisible"
                               android:textSize="18sp"
                               android:textColor="@color/white"
                               android:text="@string/qr_promote"/>