李攀 / fangTang · Commits

Commit 4b342aa3499697ef0c6c1a63d1029efa9df5ed7f

Authored by Penley
1 parent 25fc9938
build: skipped

支持包名修改

Inline Side-by-side
Showing 5 changed files with 4 additions and 53 deletions
@@ -55,7 +55,6 @@ import com.gimi.common.cinema.model.LocalMovieMessage; @@ -55,7 +55,6 @@ import com.gimi.common.cinema.model.LocalMovieMessage;
55 import com.gimi.common.cinema.utils.AuthUtils; 55 import com.gimi.common.cinema.utils.AuthUtils;
56 import com.gimi.common.cinema.utils.LeeImageLoader; 56 import com.gimi.common.cinema.utils.LeeImageLoader;
57 import com.gimi.common.cinema.utils.M1905Utils; 57 import com.gimi.common.cinema.utils.M1905Utils;
58 -import com.gimi.common.cinema.utils.SambaFileCharge;  
59 import com.gimi.common.cinema.utils.ScreenUtils; 58 import com.gimi.common.cinema.utils.ScreenUtils;
60 import com.gimi.common.cinema.utils.SystemUtils; 59 import com.gimi.common.cinema.utils.SystemUtils;
61 import com.qnbar.smc.model.Light; 60 import com.qnbar.smc.model.Light;
@@ -99,8 +98,6 @@ import java.util.Locale; @@ -99,8 +98,6 @@ import java.util.Locale;
99 public class MainActivity extends BaseActivity implements IMainView, EventListener<String> { 98 public class MainActivity extends BaseActivity implements IMainView, EventListener<String> {
100 99
101 private static final String TAG = "MainActivity"; 100 private static final String TAG = "MainActivity";
102 - private static final long NO_KEY_EVENT_MSEC = 30 * 1000;  
103 -  
104 private Context context; 101 private Context context;
105 102
106 private ImageView controlQrCodeIv; 103 private ImageView controlQrCodeIv;
@@ -354,10 +351,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -354,10 +351,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
354 } 351 }
355 } 352 }
356 needStartScreenSaver = true; 353 needStartScreenSaver = true;
357 - if (handler != null) {  
358 - handler.removeCallbacks(startAdsRunnable);  
359 - handler.postDelayed(startAdsRunnable, 30 * 1000);  
360 - }  
361 if (HAS_SYSTEM_FEATURE_BLUETOOTH_LE) { 354 if (HAS_SYSTEM_FEATURE_BLUETOOTH_LE) {
362 IntentFilter intentFilter = new IntentFilter(); 355 IntentFilter intentFilter = new IntentFilter();
363 intentFilter.addAction(BLEBroadcastReceiver.ACTION_BLE_ERROR); 356 intentFilter.addAction(BLEBroadcastReceiver.ACTION_BLE_ERROR);
@@ -402,11 +395,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -402,11 +395,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
402 395
403 @Override 396 @Override
404 public boolean onGenericMotionEvent(MotionEvent event) { 397 public boolean onGenericMotionEvent(MotionEvent event) {
405 - lastKeyDownTime = System.currentTimeMillis();  
406 - if (handler != null) {  
407 - handler.removeCallbacks(startAdsRunnable);  
408 - handler.postDelayed(startAdsRunnable, NO_KEY_EVENT_MSEC);  
409 - }  
410 return super.onGenericMotionEvent(event); 398 return super.onGenericMotionEvent(event);
411 } 399 }
412 400
@@ -614,35 +602,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen @@ -614,35 +602,6 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
614 presenter.jumpToSearch(); 602 presenter.jumpToSearch();
615 } 603 }
616 604
617 - private Runnable startAdsRunnable = new Runnable() {  
618 - @Override  
619 - public void run() {  
620 - if (!Constant.gimiAuth) {  
621 - return;  
622 - }  
623 - if (true) {  
624 - return;  
625 - }  
626 - if (AuthUtils.isFinish(context)) {  
627 - return;  
628 - }  
629 - handler.postDelayed(this, NO_KEY_EVENT_MSEC);  
630 - if ((System.currentTimeMillis() - lastKeyDownTime) > NO_KEY_EVENT_MSEC) {  
631 - if (needStartScreenSaver) {  
632 - if (SambaFileCharge.fileExist(videoAds) && Constant.messageRun) {  
633 - needStartScreenSaver = false;  
634 - Intent intent = new Intent(context, SimpleAdsPlayer2.class);  
635 - intent.putExtra("ads_path", videoAds);  
636 - startActivity(intent);  
637 - presenter.getVideoAdsPath(context);  
638 - } else {  
639 - presenter.getVideoAdsPath(context);  
640 - }  
641 - }  
642 - }  
643 - }  
644 - };  
645 -  
646 @Override 605 @Override
647 protected void onDestroy() { 606 protected void onDestroy() {
648 super.onDestroy(); 607 super.onDestroy();
@@ -43,13 +43,11 @@ @@ -43,13 +43,11 @@
43 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
44 android:orientation="horizontal"> 44 android:orientation="horizontal">
45 45
46 - <com.xgimi.gimicinema.view.roundedimageview.RoundedImageView 46 + <ImageView
47 android:id="@+id/moviePoster_iv" 47 android:id="@+id/moviePoster_iv"
48 android:layout_width="200dp" 48 android:layout_width="200dp"
49 android:layout_height="270dp" 49 android:layout_height="270dp"
50 android:scaleType="fitXY" 50 android:scaleType="fitXY"
51 - xmlns:makeramen="http://schemas.android.com/apk/res/com.xgimi.gimicinema"  
52 - makeramen:riv_corner_radius="5dp"  
53 android:focusable="false" 51 android:focusable="false"
54 android:focusableInTouchMode="false" 52 android:focusableInTouchMode="false"
55 tools:background="@drawable/ic_movie_default" 53 tools:background="@drawable/ic_movie_default"
@@ -13,9 +13,7 @@ @@ -13,9 +13,7 @@
13 makeramen:riv_corner_radius_top_right="10dip" 13 makeramen:riv_corner_radius_top_right="10dip"
14 makeramen:riv_border_width="1dip" 14 makeramen:riv_border_width="1dip"
15 makeramen:riv_border_color="#ffffff"--> 15 makeramen:riv_border_color="#ffffff"-->
16 - <com.xgimi.gimicinema.view.roundedimageview.RoundedImageView  
17 - xmlns:makeramen="http://schemas.android.com/apk/res/com.xgimi.gimicinema"  
18 - makeramen:riv_corner_radius="5dip" 16 + <ImageView
19 android:layout_width="248dp" 17 android:layout_width="248dp"
20 android:layout_height="380dp" 18 android:layout_height="380dp"
21 android:focusable="false" 19 android:focusable="false"
@@ -13,9 +13,7 @@ @@ -13,9 +13,7 @@
13 makeramen:riv_corner_radius_top_right="10dip" 13 makeramen:riv_corner_radius_top_right="10dip"
14 makeramen:riv_border_width="1dip" 14 makeramen:riv_border_width="1dip"
15 makeramen:riv_border_color="#ffffff"--> 15 makeramen:riv_border_color="#ffffff"-->
16 - <com.xgimi.gimicinema.view.roundedimageview.RoundedImageView  
17 - xmlns:makeramen="http://schemas.android.com/apk/res/com.xgimi.gimicinema"  
18 - makeramen:riv_corner_radius="5dip" 16 + <ImageView
19 android:layout_width="@dimen/detail_item_width" 17 android:layout_width="@dimen/detail_item_width"
20 android:layout_height="@dimen/detail_item_height" 18 android:layout_height="@dimen/detail_item_height"
21 android:focusable="false" 19 android:focusable="false"
@@ -13,13 +13,11 @@ @@ -13,13 +13,11 @@
13 makeramen:riv_corner_radius_top_right="10dp" 13 makeramen:riv_corner_radius_top_right="10dp"
14 makeramen:riv_border_width="1dp" 14 makeramen:riv_border_width="1dp"
15 makeramen:riv_border_color="#ffffff"--> 15 makeramen:riv_border_color="#ffffff"-->
16 - <com.xgimi.gimicinema.view.roundedimageview.RoundedImageView 16 + <ImageView
17 android:id="@+id/imageView" 17 android:id="@+id/imageView"
18 android:layout_width="@dimen/i_recommend_search_w" 18 android:layout_width="@dimen/i_recommend_search_w"
19 android:layout_height="@dimen/i_recommend_search_h" 19 android:layout_height="@dimen/i_recommend_search_h"
20 android:scaleType="fitXY" 20 android:scaleType="fitXY"
21 - xmlns:makeramen="http://schemas.android.com/apk/res/com.xgimi.gimicinema"  
22 - makeramen:riv_corner_radius="5dp"  
23 android:focusable="false" 21 android:focusable="false"
24 android:adjustViewBounds="true" 22 android:adjustViewBounds="true"
25 android:focusableInTouchMode="false" 23 android:focusableInTouchMode="false"
Please register or login to post a comment