Commit 2de7bfccd19277dd6baed3e20c2542b5f7587e87

Authored by Penley
1 parent 3ac4e4fd

lastest veresion code

@@ -45,6 +45,7 @@ import android.widget.ImageView; @@ -45,6 +45,7 @@ import android.widget.ImageView;
45 import android.widget.RelativeLayout; 45 import android.widget.RelativeLayout;
46 import android.widget.ScrollView; 46 import android.widget.ScrollView;
47 import android.widget.Toast; 47 import android.widget.Toast;
  48 +
48 import com.adroplat.fist_switch.jni.Device; 49 import com.adroplat.fist_switch.jni.Device;
49 import com.adroplat.fist_switch.jni.FistJni; 50 import com.adroplat.fist_switch.jni.FistJni;
50 import com.adroplat.fist_switch.jni.SubDevice; 51 import com.adroplat.fist_switch.jni.SubDevice;
@@ -108,6 +109,7 @@ import com.xgimi.gimicinema.view.MovieItem; @@ -108,6 +109,7 @@ import com.xgimi.gimicinema.view.MovieItem;
108 import com.xgimi.gimicinema.view.OrderRecyclerView; 109 import com.xgimi.gimicinema.view.OrderRecyclerView;
109 import com.xgimi.smartscreen.SmartScreenBean; 110 import com.xgimi.smartscreen.SmartScreenBean;
110 import com.xgimi.smartscreen.service.ConfigService; 111 import com.xgimi.smartscreen.service.ConfigService;
  112 +
111 import org.greenrobot.eventbus.EventBus; 113 import org.greenrobot.eventbus.EventBus;
112 import org.greenrobot.eventbus.Subscribe; 114 import org.greenrobot.eventbus.Subscribe;
113 import org.greenrobot.eventbus.ThreadMode; 115 import org.greenrobot.eventbus.ThreadMode;
@@ -238,13 +240,13 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -238,13 +240,13 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
238 240
239 presenter.load(this); 241 presenter.load(this);
240 242
241 - if (!new SystemUtils().isServiceRunning(getApplicationContext(), "com.qnbar.smc.service.SocketService1")) {  
242 - System.out.println("com.qnbar.smc.service.SocketService1 is not running then will start again");  
243 - Intent intent = new Intent(this, SocketService1.class);  
244 - startService(intent);  
245 - } else {  
246 - System.out.println("com.qnbar.smc.service.SocketService1");  
247 - } 243 +// if (!new SystemUtils().isServiceRunning(getApplicationContext(), "com.qnbar.smc.service.SocketService1")) {
  244 + System.out.println("com.qnbar.smc.service.SocketService1 is not running then will start again");
  245 + Intent intent = new Intent(this, SocketService1.class);
  246 + startService(intent);
  247 +// } else {
  248 +// System.out.println("com.qnbar.smc.service.SocketService1");
  249 +// }
248 // initGetOrderInfo = true; 250 // initGetOrderInfo = true;
249 // presenter.getOrderInfo(); 251 // presenter.getOrderInfo();
250 // new Handler().postDelayed(new Runnable() { 252 // new Handler().postDelayed(new Runnable() {
@@ -478,12 +480,12 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -478,12 +480,12 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
478 show("你已有订单存在,正在为你播放"); 480 show("你已有订单存在,正在为你播放");
479 initGetOrderInfo = false; 481 initGetOrderInfo = false;
480 } 482 }
481 - if (roomStatusInfo != null) {  
482 - if (info.getData().getOrder_sn().equals(roomStatusInfo.getData().getOrder_sn())) {  
483 - Log.d("room-info", "order has request return");  
484 - return;  
485 - }  
486 - } 483 +// if (roomStatusInfo != null) {
  484 +// if (info.getData().getOrder_sn().equals(roomStatusInfo.getData().getOrder_sn())) {
  485 +// Log.d("room-info", "order has request return");
  486 +// return;
  487 +// }
  488 +// }
487 Log.d("room-info", "update order info"); 489 Log.d("room-info", "update order info");
488 roomStatusInfo = info; 490 roomStatusInfo = info;
489 RoomStatusInfo.DataEntity data = info.getData(); 491 RoomStatusInfo.DataEntity data = info.getData();
@@ -510,8 +512,11 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -510,8 +512,11 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
510 show("没有获取到相应订单信息,即将为您播放银河护卫队"); 512 show("没有获取到相应订单信息,即将为您播放银河护卫队");
511 localMovieMessages = new NewDBManager(this).queryPlayMovie("C1584FFF17811A7FAE58BC564AE79488"); 513 localMovieMessages = new NewDBManager(this).queryPlayMovie("C1584FFF17811A7FAE58BC564AE79488");
512 } 514 }
  515 +
513 if (localMovieMessages != null) { 516 if (localMovieMessages != null) {
514 OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null); 517 OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null);
  518 + } else {
  519 + show("没有找到电影");
515 } 520 }
516 } 521 }
517 522
Please register or login to post a comment