李攀 / fangTang · Commits

Commit cfa4f2e2e9933c2a9c304da6029c0980f3675f9a

Authored by 李攀
1 parent 0612c990
build: skipped

fix promote msg z4x error

Inline Side-by-side
Showing 3 changed files with 8 additions and 18 deletions
@@ -9,8 +9,6 @@ import android.view.View; @@ -9,8 +9,6 @@ import android.view.View;
9 import android.view.WindowManager; 9 import android.view.WindowManager;
10 import com.xgimi.gimicinema.R; 10 import com.xgimi.gimicinema.R;
11 import com.xgimi.gimicinema.view.AutoScrollTextView; 11 import com.xgimi.gimicinema.view.AutoScrollTextView;
12 -import com.xgimi.gimicinema.view.AutoScrollableTextView;  
13 -import com.xgimi.gimicinema.view.Marquee;  
14 12
15 /** 13 /**
16 * 自定义时长的Toast 14 * 自定义时长的Toast
@@ -33,13 +31,8 @@ public class CToast { @@ -33,13 +31,8 @@ public class CToast {
33 CToast result = getDToast(context); 31 CToast result = getDToast(context);
34 LayoutInflater inflater = LayoutInflater.from(context); 32 LayoutInflater inflater = LayoutInflater.from(context);
35 View layout = inflater.inflate(R.layout.t_toast, null); 33 View layout = inflater.inflate(R.layout.t_toast, null);
36 - AutoScrollableTextView textTv = (AutoScrollableTextView) layout.findViewById(R.id.text_tv);  
37 - Marquee textTv1 = (Marquee) layout.findViewById(R.id.text_tv1);  
38 AutoScrollTextView textTv2 = (AutoScrollTextView) layout.findViewById(R.id.text_tv2); 34 AutoScrollTextView textTv2 = (AutoScrollTextView) layout.findViewById(R.id.text_tv2);
39 - textTv.setText(text);  
40 - textTv.setVisibility(View.GONE);  
41 textTv2.setText(text); 35 textTv2.setText(text);
42 - textTv1.setVisibility(View.GONE);  
43 // if (/*text.length() < 78*/true) { 36 // if (/*text.length() < 78*/true) {
44 // textTv.setVisibility(View.GONE); 37 // textTv.setVisibility(View.GONE);
45 // textTv1.setVisibility(View.VISIBLE); 38 // textTv1.setVisibility(View.VISIBLE);
@@ -572,9 +572,7 @@ public class SmartControlService extends BaseService implements EventListener<St @@ -572,9 +572,7 @@ public class SmartControlService extends BaseService implements EventListener<St
572 Log.d("room-info", "update order info"); 572 Log.d("room-info", "update order info");
573 RoomStatusInfo.DataEntity data = orderInfo.getData(); 573 RoomStatusInfo.DataEntity data = orderInfo.getData();
574 int offset = data.getNow_time() - data.getBegin_time(); 574 int offset = data.getNow_time() - data.getBegin_time();
575 - if (offset > 3) {  
576 - CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间", 100 * 1000).show();  
577 - } 575 +
578 int durationMinutes = data.getEnd_time() - data.getNow_time(); 576 int durationMinutes = data.getEnd_time() - data.getNow_time();
579 Log.d("CountService", "durationMinutes:" + durationMinutes); 577 Log.d("CountService", "durationMinutes:" + durationMinutes);
580 if (durationMinutes <= 1) { 578 if (durationMinutes <= 1) {
@@ -588,7 +586,6 @@ public class SmartControlService extends BaseService implements EventListener<St @@ -588,7 +586,6 @@ public class SmartControlService extends BaseService implements EventListener<St
588 if (lastCompleteRoomStatusInfo.getData().getOrder_sn().equals(roomStatusInfo.getData().getOrder_sn())) { 586 if (lastCompleteRoomStatusInfo.getData().getOrder_sn().equals(roomStatusInfo.getData().getOrder_sn())) {
589 if (openDoorServerTime > roomStatusInfo.getData().getBegin_time() && openDoorServerTime < roomStatusInfo.getData().getEnd_time()) { 587 if (openDoorServerTime > roomStatusInfo.getData().getBegin_time() && openDoorServerTime < roomStatusInfo.getData().getEnd_time()) {
590 playEndAds(); 588 playEndAds();
591 -  
592 } 589 }
593 return; 590 return;
594 } 591 }
@@ -600,18 +597,16 @@ public class SmartControlService extends BaseService implements EventListener<St @@ -600,18 +597,16 @@ public class SmartControlService extends BaseService implements EventListener<St
600 if (localMovieMessages == null) { 597 if (localMovieMessages == null) {
601 show("电影信息出错,找不到相关电影"); 598 show("电影信息出错,找不到相关电影");
602 if (offset > 3) { 599 if (offset > 3) {
603 - CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影输电网信息,请联系客服", 90 * 1000).show(); 600 + CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间,没有找到电影信息,请联系客服", 90 * 1000).show();
604 } else { 601 } else {
605 - CToast.makeText(this, "没有找到电影输电网信息,请联系客服", 90 * 1000).show(); 602 + CToast.makeText(this, "没有找到电影信息,请联系客服", 90 * 1000).show();
606 } 603 }
607 } 604 }
608 } 605 }
609 -// if (localMovieMessages == null) {  
610 -// show("没有获取到相应订单信息,即将为您播放银河护卫队");  
611 -// localMovieMessages = new NewDBManager(this).queryPlayMovie("f1ebaee0a7fe50c7c5ce786b2eb9e753");  
612 -// }  
613 -//  
614 if (localMovieMessages != null) { 606 if (localMovieMessages != null) {
  607 + if (offset > 3) {
  608 + CToast.makeText(this, "您已迟到" + offset + "分钟,请注意把握时间", 100 * 1000).show();
  609 + }
615 OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null); 610 OpenMMUtils.openMMWithAds(this, localMovieMessages.getPlayPath(), null);
616 } else { 611 } else {
617 show("没有找到电影"); 612 show("没有找到电影");
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 android:id="@+id/text_tv" 32 android:id="@+id/text_tv"
33 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
34 android:textSize="28sp" 34 android:textSize="28sp"
  35 + android:visibility="gone"
35 android:hint="@string/app_name" 36 android:hint="@string/app_name"
36 android:textColor="@color/white"/> 37 android:textColor="@color/white"/>
37 <com.xgimi.gimicinema.view.Marquee 38 <com.xgimi.gimicinema.view.Marquee
@@ -41,6 +42,7 @@ @@ -41,6 +42,7 @@
41 android:id="@+id/text_tv1" 42 android:id="@+id/text_tv1"
42 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
43 android:textSize="28sp" 44 android:textSize="28sp"
  45 + android:visibility="gone"
44 android:hint="@string/app_name" 46 android:hint="@string/app_name"
45 android:textColor="@color/white"/> 47 android:textColor="@color/white"/>
46 48
Please register or login to post a comment