删除无用代码

app/proguard-rules.pro

@@ -387,113 +387,11 @@
 
 
 
-    # ===================== 一览视频 START ================
-    -keep class com.yilan.sdk.**{
-        *;
-    }
-    -dontwarn javax.annotation.**
-    -dontwarn sun.misc.Unsafe
-    -dontwarn org.conscrypt.*
-    -dontwarn okio.**
-    ###阿里云混淆
-    -keep class com.alibaba.sdk.android.**{*;}
-    -keep class com.ut.**{*;}
-    -keep class com.ta.**{*;}
-
-    ###其他混淆
-    -keep class android.support.v4.**{
-        public *;
-    }
-    -keep class android.support.v7.**{
-        public *;
-    }
-
-    -keep class org.chromium.** {*;}
-    -keep class org.chromium.** { *; }
-    -keep class aegon.chrome.** { *; }
-    -keep class com.kwai.**{ *; }
-    -dontwarn com.kwai.**
-    -dontwarn com.kwad.**
-    -dontwarn com.ksad.**
-    -dontwarn aegon.chrome.**
-
-    -keepclassmembers class * extends android.app.Activity { public void *(android.view.View);
-    }
-    -keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-    }
-    -keep class com.baidu.mobads.*.** { *; }
-
-    #ijkplayer
-    -keep class tv.danmaku.ijk.media.player.** {*;}
-    -keep class tv.danmaku.ijk.media.player.IjkMediaPlayer{*;}
-    -keep class tv.danmaku.ijk.media.player.ffmpeg.FFmpegApi{*;}
-
-
-
-    # ======================= 一览视频 END ================
-
-
-
-
-
-    # ===================== 推啊AD START ================
-    -dontwarn com.lechuan.midunovel.**
-    -keep class com.lechuan.midunovel.** { *; }
-    # ======================= 推啊AD END ================
-
-
-
-    # ===================== 掌阅书城 START ================
-    -keep class com.zhangyue.**{*;}
-    -keep class com.ireader.ireadersdk.IreaderApi {*;}
-    -dontwarn com.alibaba.fastjson.**
-    -keep class com.alibaba.fastjson.** { *; }
-    -keep public class * extends androidx.fragment.app.Fragment
-    -keep class androidx.core.app.NotificationCompat**{
-        public *;
-    }
-    -dontwarn androidx.**
-    -keep class androidx.** { *;}
-    -keep public class * extends androidx.**
-    -keep public class * extends androidx.fragment.app.FragmentContainer
-
-    -keep class com.squareup.okhttp.** { *;}
-    -keep class okhttp3.** { *; }
-    -keep interface okhttp3.** { *; }
-    -keep class okio.**{ *; }
-    -keep interface okio.**{ *; }
-    -dontwarn com.squareup.okhttp.**
-    -dontwarn okio.**
-    -dontwarn okhttp3.**
-    
-    -keep class com.qq.e.** {
-        public protected *;
-    }
-    # ======================= 掌阅书城 END ================
 
 
 
 
 
-    # ===================== 变现猫 START ================
-    -keep class com.ss.android.* {*;}
-    -keep class com.pgl.* {*;}
-
-    -keep class com.qq.e.** {
-     public protected *;
-    }
-
-    -keep class com.wgs.sdk.**{ *;}
-    -keep class com.dhcw.sdk.**{*;}
-
-    -keep class android.support.v4.app.NotificationCompat**{
-     public *;
-    }
-    # ======================= 变现猫 END ================
-
-
 
 
 
@@ -505,57 +403,6 @@
 
 
 
-    # ===================== 瑞狮新闻 START ================
-    -keep class com.tencent.** {*;}
-    -keep class com.qq.e.** {public protected *;}
-    -keep class com.xr.xrsdk.** { *;}
-    # ======================= 瑞狮新闻 END ================
-
-
-
-
-    # ===================== 聚乐云 START ================
-    -keep class com.lzy.okgo.** {*;}
-    -keep class com.fly.scenemodule.** {*;}
-
-    #GSON
-    -keep class com.google.gson.** {*;}
-    -keep class com.google.**{*;}
-    -keep class sun.misc.Unsafe { *; }
-    -keep class com.google.gson.stream.** { *; }
-    -keep class com.google.gson.examples.android.model.** { *; }
-
-    #agentweb
-    -keep class com.just.agentweb.** {
-        *;
-    }
-    -dontwarn com.just.agentweb.**
-
-    #http3
-    #-------------- okhttp3 start-------------
-    # OkHttp3
-
-    -keepattributes Signature
-    -keepattributes *Annotation*
-    -keep class com.squareup.okhttp.* { *; }
-    -keep interface com.squareup.okhttp.** { *; }
-    -dontwarn com.squareup.okhttp.**
-
-    # okhttp 3
-    -keepattributes Signature
-    -keepattributes *Annotation*
-    -keep class okhttp3.** { *; }
-    -keep interface okhttp3.** { *; }
-    -dontwarn okhttp3.**
-
-    # Okio
-    -dontwarn com.squareup.**
-    -dontwarn okio.**
-    -keep class  okio.* { *; }
-    -keep public class org.codehaus.* { *; }
-    -keep public class java.nio.* { *; }
-
-    # ======================= 聚乐云 END ================
 
 
 
@@ -575,72 +422,6 @@
 
 
 
-    # ===================== 微转分享 START ================
-    -keep class com.xiangzi.*{*;}
-    -dontwarn com.xiangzi.**
-    # x5浏览器混淆需要加
-    -dontwarn com.tencent.smtt.export.external.**
-    -keep class com.tencent.smtt.export.external.**{*;}
-    -keep class com.tencent.tbs.video.interfaces.IUserStateChangedListener {*;}
-    -keep class com.tencent.smtt.sdk.CacheManager {*;}
-    -keep class com.tencent.smtt.sdk.CookieManager {*;}
-    -keep class com.tencent.smtt.sdk.WebHistoryItem {*;}
-    -keep class com.tencent.smtt.sdk.WebViewDatabase {*;}
-    -keep class com.tencent.smtt.sdk.WebBackForwardList {*;}
-    -keep public class com.tencent.smtt.sdk.WebView {*;}
-    -keep public class com.tencent.smtt.sdk.WebView$HitTestResult{*;}
-    -keep public class com.tencent.smtt.sdk.WebView$WebViewTransport {*;}
-    -keep public class com.tencent.smtt.sdk.WebView$PictureListener {*;}
-    -keepattributes InnerClasses
-    -keep public enum com.tencent.smtt.sdk.WebSettings$** {*;}
-    -keep public enum com.tencent.smtt.sdk.QbSdk$** {*;}
-    -keep public class com.tencent.smtt.sdk.WebSettings {*;}
-    -keep public class com.tencent.smtt.sdk.ValueCallback{*;}
-    -keep public class com.tencent.smtt.sdk.WebViewClient {*;}
-    -keep public class com.tencent.smtt.sdk.DownloadListener {*;}
-    -keep public class com.tencent.smtt.sdk.WebChromeClient {*;}
-    -keep public class com.tencent.smtt.sdk.WebChromeClient$FileChooserParams {*;}
-    -keep class com.tencent.smtt.sdk.SystemWebChromeClient{*;}
-    # 1. extension interfaces should be apparent
-    -keep public class com.tencent.smtt.export.external.extension.interfaces.* {*;}
-    # 2. interfaces should be apparent
-    -keep public class com.tencent.smtt.export.external.interfaces.* {*;}
-    -keep public class com.tencent.smtt.sdk.WebViewCallbackClient {*;}
-    -keep public class com.tencent.smtt.sdk.WebStorage$QuotaUpdater {*;}
-    -keep public class com.tencent.smtt.sdk.WebIconDatabase {*;}
-    -keep public class com.tencent.smtt.sdk.WebStorage {*;}
-    -keep public class com.tencent.smtt.sdk.DownloadListener {*;}
-    -keep public class com.tencent.smtt.sdk.QbSdk {*;}
-    -keep public class com.tencent.smtt.sdk.QbSdk$PreInitCallback {*;}
-    -keep public class com.tencent.smtt.sdk.CookieSyncManager {*;}
-    -keep public class com.tencent.smtt.sdk.Tbs* {*;}
-    -keep public class com.tencent.smtt.utils.LogFileUtils {*;}
-    -keep public class com.tencent.smtt.utils.TbsLog {*;}
-    -keep public class com.tencent.smtt.utils.TbsLogClient {*;}
-    -keep public class com.tencent.smtt.sdk.CookieSyncManager {*;}
-    # Added for game demos
-    -keep public class com.tencent.smtt.sdk.TBSGamePlayer {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGamePlayerClient* {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGamePlayerClientExtension {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGamePlayerService* {*;}
-    -keep public class com.tencent.smtt.utils.Apn {*;}
-    -keep class com.tencent.smtt.** {*;}
-    # end
-    -keep public class com.tencent.smtt.export.external.extension.proxy.ProxyWebViewClientExtension {*;}
-    -keep class MTT.ThirdAppInfoNew {*;}
-    -keep class com.tencent.mtt.MttTraceEvent {*;}
-    # Game related
-    -keep public class com.tencent.smtt.gamesdk.* {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGameBooter {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGameBaseActivity {*;}
-    -keep public class com.tencent.smtt.sdk.TBSGameBaseActivityProxy {*;}
-    -keep public class com.tencent.smtt.gamesdk.internal.TBSGameServiceClient {*;}
-    # webView处理，项目中没有使用到webView忽略即可,webview与JS交互内部类不能混淆
-    -keepclassmembers class com.show.you.WebVerfiedActivity$MyHandler {*;}
-    -keepattributes *JavascriptInterface*
-
-    -keep public class com.mints.goodnews.ui.fragment.WzFragment.JsObject.**
-    # ======================= 微转分享 END ================
 
 
     # ===================== OAID START ================

app/src/main/java/com/mints/goodnews/MintsApplication.java

@@ -17,7 +17,6 @@ import com.mints.goodnews.manager.LiebaoManager;
 import com.mints.goodnews.manager.MhManager;
 import com.mints.goodnews.manager.MiitHelper;
 import com.mints.goodnews.manager.OwManager;
-import com.mints.goodnews.manager.RsNewsManager;
 import com.mints.goodnews.manager.TtCsjAdManager;
 import com.mints.goodnews.manager.TzManager;
 import com.mints.goodnews.manager.WnManager;
@@ -142,9 +141,6 @@ public class MintsApplication extends MultiDexApplication {
         // 猎豹游戏初始化
         LiebaoManager.getInstance().initCmGameSdk();
 
-        // 瑞狮新闻
-        RsNewsManager.INSTANCE.initX5Environment(this);
-
         // 喜马拉雅
         initXmly();
 

app/src/main/java/com/mints/goodnews/manager/RsNewsManager.kt

-package com.mints.goodnews.manager
-
-import android.app.Application
-import com.tencent.smtt.sdk.QbSdk
-import com.xr.xrsdk.XRNewsManager
-
-/**
- * 描述：瑞狮新闻
- * 作者：孟崔广
- */
-object RsNewsManager {
-
-    private const val APP_ID = "7ef25833adcd4c08ac5d91e9d5543871"
-    private const val WX_APP_ID = "85b57367477947e5b33ca10f785d752d"
-
-    /**
-     * 初始化
-     */
-    fun init(application: Application) {
-        XRNewsManager.getInstance().init(application, APP_ID, UserManager.getInstance().userID,WX_APP_ID)
-    }
-
-    fun initX5Environment(application: Application){
-        QbSdk.initX5Environment(application, null)
-        XRNewsManager.getInstance().init(application, APP_ID, UserManager.getInstance().userID,WX_APP_ID)
-    }
-}

app/src/main/java/com/mints/goodnews/mvp/presenters/HorizChannelPresenter.kt

@@ -10,9 +10,9 @@ import com.mints.library.net.neterror.Throwable
 class HorizChannelPresenter : BasePresenter<HorizChannelView>() {
 
 
-    fun getSmallHomeVedioBaseMsg() {
+    fun getHomeVedioMsg() {
         AppHttpManager.getInstance(loanApplication)
-                .call(loanService.smallHomeVedioBaseMsg,
+                .call(loanService.getHomeVedioMsg(),
                         object : BaseSubscriber<BaseResponse<MainVideoMsgBean>>() {
                             override fun onCompleted() {
                                 if (isLinkView) return
@@ -28,7 +28,7 @@ class HorizChannelPresenter : BasePresenter<HorizChannelView>() {
                                 val code = baseResponse.getStatus()
                                 val message = baseResponse.getMessage()
                                 when (code) {
-                                    200 -> view.getHomeVedioMsgSuc(baseResponse.data)
+                                    200 -> view.getHomeVedioMsgSuc(baseResponse.getData())
                                     else -> view.showToast(message)
                                 }
                             }

app/src/main/java/com/mints/goodnews/ui/activitys/AccountMergeActivity.kt

@@ -6,7 +6,6 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import com.mints.goodnews.R
 import com.mints.goodnews.common.Constant
-import com.mints.goodnews.manager.RsNewsManager
 import com.mints.goodnews.mvp.model.AccountMsgBean
 import com.mints.goodnews.mvp.presenters.AccountMergePresenter
 import com.mints.goodnews.mvp.views.AccountMergeView
@@ -144,10 +143,6 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
     override fun toKeepAccountSuc() {
         showToast("账号合并成功！")
 
-//        SceneManager.signIn(this)
-        RsNewsManager.init(baseApplication)
-
-
         readyGoThenKill(MainActivity::class.java)
     }
 

app/src/main/java/com/mints/goodnews/ui/activitys/MobileLoginActivity.kt

@@ -99,8 +99,6 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
         // 每日任务是否刷新任务数
         TrackManager.getInstance().innerApp()
 
-//        SceneManager.signIn(this)
-        RsNewsManager.init(baseApplication)
 
         // false-登录  true-绑定手机号
         showToast("登录成功")

app/src/main/java/com/mints/goodnews/ui/activitys/SplashActivity.kt

@@ -8,7 +8,6 @@ import com.mints.goodnews.R
 import com.mints.goodnews.common.Constant
 import com.mints.goodnews.common.DeviceInfo
 import com.mints.goodnews.ui.activitys.base.BaseActivity
-import com.yilan.sdk.ui.little.YLLittleVideoFragment
 import kotlinx.android.synthetic.main.activity_splash.*
 import net.grandcentrix.tray.AppPreferences
 
@@ -63,9 +62,6 @@ class SplashActivity : BaseActivity() {
         if (!deviceInfo.signInfo) {
             finish()
         } else {
-            // 预加载好兔视频
-            YLLittleVideoFragment.preloadVideo()
-
             setAnimation()
         }
     }

app/src/main/java/com/mints/goodnews/ui/activitys/SplashYlhActivity.kt

@@ -21,7 +21,6 @@ import com.mints.library.utils.CommonUtils
 import com.qq.e.ads.splash.SplashAD
 import com.qq.e.ads.splash.SplashADListener
 import com.qq.e.comm.util.AdError
-import com.yilan.sdk.ui.little.YLLittleVideoFragment
 import net.grandcentrix.tray.AppPreferences
 
 /**
@@ -101,7 +100,6 @@ class SplashYlhActivity : BaseActivity(), SplashADListener {
         if (!deviceInfo.signInfo) {
             baseApplication.exitApp()
         } else {
-            YLLittleVideoFragment.preloadVideo()
             try {
                 container = findViewById<View>(R.id.splash_container) as ViewGroup
                 fetchSplashAD(this, container, skipView, YlhAdManager.YLH_AD_SPLASH_POSTID, this, 0)

app/src/main/java/com/mints/goodnews/ui/activitys/WrapperActivity.kt

@@ -47,14 +47,6 @@ class WrapperActivity : BaseActivity(), View.OnClickListener {
     private fun initPage() {
         var currentFragment: Fragment? = null
         when (wrapperType) {
-            Constant.WRAPPER_TYPE_NEWS -> {
-                tv_title.text = "新闻"
-                currentFragment = RsNewsFragment()
-            }
-//            Constant.WRAPPER_TYPE_BOOK -> {
-//                tv_title.text = "书城"
-//                currentFragment = MyZhangyueFragment()
-//            }
             Constant.WRAPPER_TYPE_FRIENDS -> {
                 tv_title.text = "瓜分百万现金福利"
                 currentFragment = FriendsFragment(true)

app/src/main/java/com/mints/goodnews/ui/activitys/WxLoginActivity.kt

@@ -14,7 +14,6 @@ import com.mints.goodnews.R
 import com.mints.goodnews.common.Constant
 import com.mints.goodnews.login.LoginApi
 import com.mints.goodnews.login.OnLoginListener
-import com.mints.goodnews.manager.RsNewsManager
 import com.mints.goodnews.manager.TrackManager
 import com.mints.goodnews.manager.YwhzManager
 import com.mints.goodnews.mvp.model.WXInfo
@@ -124,8 +123,6 @@ class WxLoginActivity : BaseActivity()
         // 每日任务是否刷新任务数
         TrackManager.getInstance().innerApp()
 
-//        SceneManager.signIn(this)
-        RsNewsManager.init(baseApplication)
 
         showToast("登录成功")
         progressDialog?.dismiss()

app/src/main/java/com/mints/goodnews/ui/fragment/MyFragment.kt

@@ -290,8 +290,6 @@ class MyFragment : BaseFragment(),
 
     override fun userLoginSuc() {
 //        SceneManager.signIn(requireActivity())
-        RsNewsManager.init(baseApplication)
-
         myPresenter.getAutoUserHallBaseMsg()
         myPresenter.getHallBaseMsg()
     }

app/src/main/java/com/mints/goodnews/ui/fragment/RsNewsFragment.kt

-package com.mints.goodnews.ui.fragment
-
-import android.os.Bundle
-import com.mints.goodnews.R
-import com.mints.goodnews.common.Constant
-import com.mints.goodnews.mvp.presenters.RsNewsPresenter
-import com.mints.goodnews.mvp.views.RsNewsView
-import com.mints.goodnews.ui.activitys.AwardActivity
-import com.mints.goodnews.ui.fragment.base.LazyLoadBaseFragment
-import com.xr.xrsdk.FinishReadNewsCallBack
-import com.xr.xrsdk.XRNewsManager
-
-/**
- * 描述：瑞狮新闻
- * 作者：孟崔广
- * 时间：2020/12/9 10:55
- */
-class RsNewsFragment : LazyLoadBaseFragment(), RsNewsView, FinishReadNewsCallBack {
-
-    private val rsNewsPresenter by lazy { RsNewsPresenter() }
-
-    override fun getContentViewLayoutID() = R.layout.fragment_main_rsnews
-
-    override fun initViewsAndEvents() {}
-
-    override fun onFragmentFirstVisible() {
-        rsNewsPresenter.attachView(this)
-        XRNewsManager.getInstance().addNewsFragment(supportFragmentManager, R.id.flMainRsNews, Constant.FRAGMENT_TAG_RSNEWS, this)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        rsNewsPresenter.detachView()
-    }
-
-    override fun readSecondsSuc(coin: Int, video: Int, supr: Int) {
-        if (activity != null && !activity!!.isFinishing && coin > 0 && supr > 0) {
-            val bundle = Bundle()
-            bundle.putString(Constant.MAIN_CARRIER_TYPE, Constant.CARRIER_RUISHINEWS)
-            bundle.putInt(Constant.MAIN_CUR_COIN, coin)
-            bundle.putString(Constant.MAIN_EXTRA_ID, video.toString())
-            readyGo(AwardActivity::class.java, bundle)
-        }
-    }
-
-    override fun finishRead(id: String, seconds: Int) {
-        rsNewsPresenter.addNewsSeconds(seconds)
-    }
-}
\ No newline at end of file

app/src/main/java/com/mints/goodnews/utils/SimUtils.java

@@ -10,7 +10,8 @@ import android.telephony.TelephonyManager;
 
 import androidx.annotation.RequiresApi;
 
-import com.yilan.sdk.common.util.PermissionUtil;
+
+import com.tz.sdk.core.utils.PermissionUtil;
 
 import java.lang.reflect.Method;
 

app/src/main/res/layout/activity_feekback.xml

@@ -98,7 +98,7 @@
                 android:id="@+id/etFeedbackContent"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/transparent"
+                android:background="@color/color_0000"
                 android:gravity="top"
                 android:hint="请留下您的批评、表扬或者建议，我们会虚心听取， 认真改正。(请保持在5-150字内)"
                 android:textSize="13sp" />

app/src/main/res/layout/activity_food_subsidy.xml

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:padding="15dp"
-                android:src="@drawable/yl_mp_ic_back_left" />
+                android:src="@mipmap/ic_arrow_back" />
 
             <ImageView
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_morning_clock.xml

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:padding="15dp"
-                android:src="@drawable/yl_mp_ic_back_left" />
+                android:src="@mipmap/ic_arrow_back" />
 
             <ImageView
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_walk.xml

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:padding="15dp"
-                android:src="@drawable/yl_mp_ic_back_left" />
+                android:src="@mipmap/ic_arrow_back" />
 
             <ImageView
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_water.xml

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:padding="15dp"
-                android:src="@drawable/yl_mp_ic_back_left" />
+                android:src="@mipmap/ic_arrow_back" />
 
             <ImageView
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_xmly_play.xml

@@ -78,7 +78,7 @@
             android:layout_height="wrap_content"
             android:layout_alignStart="@+id/seek_bar"
             android:layout_alignParentBottom="true"
-            android:background="@color/transparent"
+            android:background="@color/color_0000"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:scaleType="fitCenter"
@@ -90,7 +90,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/pre_sound"
             android:layout_toRightOf="@+id/pre_sound"
-            android:background="@color/transparent"
+            android:background="@color/color_0000"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:scaleType="fitCenter"
@@ -102,7 +102,7 @@
             android:layout_height="match_parent"
             android:layout_alignTop="@+id/pre_sound"
             android:layout_toEndOf="@+id/play_or_pause"
-            android:background="@color/transparent"
+            android:background="@color/color_0000"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:scaleType="fitCenter"

app/src/main/res/layout/dialog_share.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="30dp"
-    android:background="@color/transparent">
+    android:background="@color/color_0000">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"