diff --git a/app/src/main/java/com/ik/mboxlauncher/ui/Launcher.java b/app/src/main/java/com/ik/mboxlauncher/ui/Launcher.java index 82b244e..f110947 100644 --- a/app/src/main/java/com/ik/mboxlauncher/ui/Launcher.java +++ b/app/src/main/java/com/ik/mboxlauncher/ui/Launcher.java @@ -5,21 +5,17 @@ import android.app.Fragment; import android.content.ComponentName; import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.PixelFormat; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.util.ArrayMap; import android.util.DisplayMetrics; import android.util.Log; import android.view.Display; -import android.view.Gravity; import android.view.InputDevice; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.view.animation.Animation; import android.view.animation.TranslateAnimation; import android.widget.GridView; @@ -27,19 +23,15 @@ import android.widget.Toast; import androidx.media3.common.Player; import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.android.MXQConfig; import com.android.SharePreUtils; -import com.android.api.encrytion.UtilEncrypt; -import com.android.database.lib.AdsInfoBean; import com.android.database.lib.AppBean; import com.android.database.lib.ShortAppBean; import com.android.device.MediaStateChangeObserver; import com.android.device.MediaStateChangeReceiver; import com.android.eventbaus.MessageEvent; -import com.android.monitor.DataBeeObserver; import com.android.nebulasdk.ADManager; import com.android.nebulasdk.AppManager; import com.android.nebulasdk.bean.FavNaviBean; @@ -61,9 +53,9 @@ import com.ik.mboxlauncher.ui.fragment.AppsFragment; import com.ik.mboxlauncher.ui.fragment.MusicFragment; import com.ik.mboxlauncher.ui.fragment.RecommendFragment; import com.ik.mboxlauncher.ui.fragment.VideoFragment; +import com.ik.mboxlauncher.view.CustomRecyclerView; import com.ik.mboxlauncher.view.HomeMultiView; import com.ik.mboxlauncher.view.MultiView; -import com.ik.mboxlauncher.view.CustomRecyclerView; import com.ik.mboxlauncher.view.SplashView; import com.ik.mboxlauncher.view.TimeTextView; import com.ik.mboxlauncher.view.TvRecyclerView; @@ -297,8 +289,6 @@ public class Launcher extends FragmentActivity implements SplashView.SplashAdLi // } // }); - ADSWindowManager.init(this); - bindAdsWindowMultiView(); //内存不足时释放单列所有Fragment 打开设置按Home出现单个Fragment异常 if(FragmentManager.getInstance()!=null){ FragmentManager.getInstance().destory(); @@ -584,7 +574,6 @@ private void loadShortAppList(){ @Override public boolean onTouchEvent(MotionEvent event) { -// ADSWindowManager.getInstance().resetVideo(); LogUtils.loge("onTouchEvent:======="); return super.onTouchEvent(event); } @@ -600,7 +589,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { float x = event.getX(); float y = event.getY(); Log.d("Mouse", "Mouse moved to: (" + x + ", " + y + ")"); - ADSWindowManager.getInstance().resetVideo(); return true; default: @@ -614,7 +602,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { LogUtils.loge("===================onKeyDown:"+keyCode); - ADSWindowManager.getInstance().resetVideo(); switch (keyCode){ @@ -664,8 +651,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { // public void onResumeFragment(MessageEvent event) { // LogUtils.loge("onResumeFragment: refresh ui"); // if(MessageEvent.ACTION_UPADATE_DATA_SOURCE.equals(event.action)) { -// bindAdsWindowMultiView(); -// ADSWindowManager.getInstance().startVideo(); // setImageViewData(); // }else if(MessageEvent.ACTION_UPADATE_MEDIA_STATUS.equals(event.action)){ // displayStatus(); @@ -761,7 +746,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { private View.OnClickListener onClickListener = new View.OnClickListener() { @Override public void onClick(View v) { -// ADSWindowManager.getInstance().stopVideo(); MultiView multiView = (MultiView) v; if(!multiView.onAdViewClick()){ @@ -976,29 +960,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { } }; - - /*** - * 创建有资源可播放的广告窗口 - * @return - */ - private void bindAdsWindowMultiView(){ - List adsInfoBeanList= ADManager.getInstance().getADInfoListByadType(ADManager.ADTYPE_VIDEO); - List multiViewArrayList = new ArrayList<>(); - List adsDatas=new ArrayList<>(); - for (int i=0;i100||(mAdsInfoBean.getId()>14&&mAdsInfoBean.getId()<100)){ //过滤出开屏广告 - continue; - } - - adsDatas.add(mAdsInfoBean); - LogUtils.loge("AD-Index:"+i+"|"+mAdsInfoBean.getId()); - multiViewArrayList.add(multiViewArray[mAdsInfoBean.getId()]); - } - - ADSWindowManager.getInstance().bindSourceData(multiViewArrayList,adsDatas); - } /** * 批量设置 HomeMultiView 的焦点动画开关 * @param disable true-禁用焦点动画，false-启用焦点动画 @@ -1035,7 +996,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { super.onPause(); LogUtils.loge("onPause==>"); handler.removeCallbacks(runnable); - ADSWindowManager.getInstance().stopVideo(); } @@ -1051,10 +1011,6 @@ public boolean onGenericMotionEvent(MotionEvent event) { public void run() { LogUtils.loge("UI runnable....."); LogUtils.loge("代码更新了"); - bindAdsWindowMultiView(); - if(isSplashEnd) { - ADSWindowManager.getInstance().startVideo(); - } if(isNetworkAvailable()){ ADManager.getInstance().clearTaskInteruptQueueAndRestart(); ADManager.getInstance().clearApkFileByPowerDown(); @@ -1082,6 +1038,5 @@ public boolean onGenericMotionEvent(MotionEvent event) { @Override public void onEnd() { isSplashEnd =true; -// ADSWindowManager.getInstance().startVideo(); } } diff --git a/app/src/main/java/com/ik/mboxlauncher/view/SplashView.java b/app/src/main/java/com/ik/mboxlauncher/view/SplashView.java index 4c0e4c1..0c284c3 100644 --- a/app/src/main/java/com/ik/mboxlauncher/view/SplashView.java +++ b/app/src/main/java/com/ik/mboxlauncher/view/SplashView.java @@ -176,7 +176,11 @@ public class SplashView { mHandler.sendEmptyMessage(2); return ; } - + if(ADManager.ADTYPE_VIDEO.equals(adsInfoBeanInfo.getAdType())){ + LogUtils.loge("splash task is closd "); + mHandler.sendEmptyMessage(2); + return ; + } mHandler.sendEmptyMessageDelayed(0,300);