更新通知栏广告为新插屏半屏

app/src/main/java/com/mints/fiveworld/ad/wifi/WifiAdManager.kt

@@ -5,10 +5,9 @@ import android.os.Bundle
 import com.mints.fiveworld.ad.full.OutSceneFull
 import com.mints.fiveworld.ad.full.InSceneFull
 import com.mints.fiveworld.ad.full.Notice_OutSceneFull
-import com.mints.fiveworld.ad.inscreen.InSceneInterstitial
 import com.mints.fiveworld.ad.half.NewInSceneFull
 import com.mints.fiveworld.ad.half.NewOutSceneFull
-import com.mints.fiveworld.ad.inscreen.Notice_OutSceneInterstitial
+import com.mints.fiveworld.ad.half.Notice_NewOutSceneFull
 import com.mints.fiveworld.common.Constant
 import com.mints.fiveworld.common.random.HitChanceKeeper
 import com.mints.fiveworld.manager.ad.CsjGroMoreManager
@@ -110,7 +109,7 @@ class WifiAdManager private constructor() {
     fun getInCurrentAdStatus(): Boolean {
         when (inCurrentAdType) {
             Constant.GROMORE_INSERTSCREEN_AD -> {
-                return InSceneInterstitial.getInstance().loadStatus == 2
+                return NewInSceneFull.getInstance().loadStatus == 2
             }
             Constant.GROMORE_FULL_AD -> {
                 return InSceneFull.getInstance().loadStatus == 2
@@ -198,7 +197,7 @@ class WifiAdManager private constructor() {
     fun getOutCurrentAdStatus(): Boolean {
         when (outCurrentAdType) {
             Constant.GROMORE_INSERTSCREEN_AD -> {
-                return Notice_OutSceneInterstitial.getInstance().loadStatus == 2
+                return Notice_NewOutSceneFull.getInstance().loadStatus == 2
             }
             Constant.GROMORE_FULL_AD -> {
                 return Notice_OutSceneFull.getInstance().loadStatus == 2
@@ -266,7 +265,7 @@ class WifiAdManager private constructor() {
 
         when (noticeOutCurrentAdType) {
             Constant.GROMORE_INSERTSCREEN_AD -> {
-                Notice_OutSceneInterstitial.getInstance().preloadInsertScreenAd(activity, carrier)
+                Notice_NewOutSceneFull.getInstance().preloadFullAd(activity, carrier)
             }
             Constant.GROMORE_FULL_AD -> {
                 Notice_OutSceneFull.getInstance().preloadFullAd(activity, carrier)
@@ -285,8 +284,8 @@ class WifiAdManager private constructor() {
     ) {
         when (noticeOutCurrentAdType) {
             Constant.GROMORE_INSERTSCREEN_AD -> {
-                Notice_OutSceneInterstitial.getInstance()
-                    .showInteractionAd(_activity, wifiAdStatusListener, carrier)
+                Notice_NewOutSceneFull.getInstance()
+                    .showFullAd(_activity, wifiAdStatusListener, carrier)
             }
             Constant.GROMORE_FULL_AD -> {
                 Notice_OutSceneFull.getInstance()

app/src/main/java/com/mints/fiveworld/ui/widgets/CycleProgress.java

@@ -104,7 +104,7 @@ public class CycleProgress extends View {
         pathMeasure.getSegment(0, pathMeasure.getLength() * mAnimatorValue, dstPath, true);
         //渐变
         Shader mShader = new LinearGradient(mStrokeWidth / 2, mStrokeWidth / 2, mProgressWidth, mHeight - mStrokeWidth / 2,
-                Color.parseColor("#DEAEC5"), Color.parseColor("#FB918A"), Shader.TileMode.REPEAT);
+                Color.parseColor("#38A8F5"), Color.parseColor("#468df8"), Shader.TileMode.REPEAT);
         //遮罩
         mProgressPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
         mProgressPaint.setShader(mShader);