1.1.1发版

highgold/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.mints.highgold"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 11
-        versionName "1.1.0"
+        versionCode 12
+        versionName "1.1.1"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -256,23 +256,23 @@ dependencies {
 //    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
 //    implementation 'com.baidu.mobstat:mtj-sdk-circle:latest.integration'
     // 一览视频
-    implementation "com.yilan.sdk:ui:1.9.0.2"//修改为具体的sdk版本
-    implementation "com.yilan.sdk:ad:1.9.0.2"//修改为具体的sdk版本,支持广点通、百度广告
-//    implementation ("com.yilan.sdk:ui:2.0.0.0"){
-//        exclude group: 'com.yilan.sdk', module: 'toutiao'
-//        exclude group: 'com.yilan.sdk', module: 'gdt'
-//    }
-//    implementation "com.yilan.sdk:ad:2.0.0.0"//修改为具体的sdk版本,支持广点通、百度广告
+//    implementation "com.yilan.sdk:ui:1.9.0.2"//修改为具体的sdk版本
+//    implementation "com.yilan.sdk:ad:1.9.0.2"//修改为具体的sdk版本,支持广点通、百度广告
+    implementation("com.yilan.sdk:ui:2.0.0.0") {
+        exclude group: 'com.yilan.sdk', module: 'toutiao'
+        exclude group: 'com.yilan.sdk', module: 'gdt'
+    }
+    implementation "com.yilan.sdk:ad:2.0.0.0"//修改为具体的sdk版本,支持广点通、百度广告
     implementation('com.aliyun.ams:alicloud-android-httpdns:1.2.3@aar') {
         transitive true
     }
     //支持ijkplayer进行播放，建议添加
     implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
-    implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
+//    implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
     // Mintegral 广告
     implementation 'com.mintegral.msdk:videojs:10.2.41'
     implementation 'com.mintegral.msdk:mtgjscommon:10.2.41'

highgold/app/src/main/AndroidManifest.xml

@@ -40,7 +40,7 @@
         android:theme="@style/CustomAppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
-
+        <activity android:name=".ui.activitys.ReadActivity"></activity>
 
         <uses-library
             android:name="org.apache.http.legacy"
@@ -111,13 +111,14 @@
         <activity android:name=".ui.activitys.AccountActivity" />
         <activity android:name=".ui.activitys.FriendsActivity" />
         <activity android:name=".ui.activitys.DrinkTeaActivity" />
-        <activity android:name=".ui.activitys.CsVedioActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"/>
+        <activity
+            android:name=".ui.activitys.CsVedioActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity android:name=".ui.activitys.Aboutas2Activity" />
         <activity
             android:name=".ui.activitys.TryVedioActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|screenSize|keyboardHidden" />
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
         <activity android:name=".ui.activitys.TryTaskDetailActivity" />
         <activity android:name=".ui.activitys.TryTaskActivity" />
         <activity android:name=".ui.activitys.DrawcashActivity" />
@@ -207,20 +208,18 @@
                 <action android:name="com.talkingdata.sdk.TDAntiCheatingService" />
             </intent-filter>
         </service> <!-- 定位需要的服务 -->
-        <service android:name="com.amap.api.location.APSService" />
-        <!-- 自有下载 -->
+        <service android:name="com.amap.api.location.APSService" /> <!-- 自有下载 -->
         <provider
-            tools:replace="android:authorities"
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths"
-                tools:replace="android:resource"/>
-        </provider>
-        <!-- 穿山甲广告 -->
+                tools:replace="android:resource" />
+        </provider> <!-- 穿山甲广告 -->
         <provider
             android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
             android:authorities="${applicationId}.TTFileProvider"
@@ -255,13 +254,11 @@
         <activity
             android:name="com.qq.e.ads.LandscapeADActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape" />
-        <!-- 一览 今⽇日头条sdk需添加 -->
+            android:screenOrientation="landscape" /> <!-- 一览 今⽇日头条sdk需添加 -->
         <provider
             android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
             android:authorities="${applicationId}.TTMultiProvider"
-            android:exported="false" />
-        <!-- Mintegral广告 -->
+            android:exported="false" /> <!-- Mintegral广告 -->
         <activity
             android:name="com.mintegral.msdk.activity.MTGCommonActivity"
             android:configChanges="keyboard|orientation"

highgold/app/src/main/java/com/mints/highgold/ad/ChuangshenVedioAdManager.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import com.mints.highgold.common.Constant
 import com.mints.highgold.ui.activitys.CsVedioActivity
+import com.toukeads.ads.Ad
 
 /**
  * 创神视频
@@ -58,4 +59,9 @@ class ChuangshenVedioAdManager private constructor(activity: Activity) {
         intent.putExtras(bundle)
         activity?.startActivity(intent)
     }
+
+    fun destory() {
+        //退出释放资源
+        Ad.getInstance().onDestroy()
+    }
 }
\ No newline at end of file

highgold/app/src/main/java/com/mints/highgold/ad/VedioAdingManager.java

@@ -277,8 +277,11 @@ public class VedioAdingManager {
             shanhuVedioAdManager = null;
         }
 
+        if (chuangshenVedioAdManager != null) {
+            chuangshenVedioAdManager.destory();
             chuangshenVedioAdManager = null;
         }
+    }
 
     public void setVedioAdingListener(VedioAdingListener vedioAdingListener) {
         this.vedioAdingListener = vedioAdingListener;

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/ReadPresenter.kt

+package com.mints.highgold.mvp.presenters
+
+import android.text.TextUtils
+import com.mints.highgold.common.Constant
+import com.mints.highgold.manager.AppHttpManager
+import com.mints.highgold.mvp.model.BaseResponse
+import com.mints.highgold.mvp.views.CsVedioView
+import com.mints.highgold.mvp.views.ReadView
+import com.mints.library.net.neterror.BaseSubscriber
+import com.mints.library.net.neterror.Throwable
+import rx.Observable
+
+class ReadPresenter : BasePresenter<ReadView>() {
+
+    /**
+     * 提交任务
+     */
+    fun reportAddCoinMsg(tryCarrier: String, vo: HashMap<String, Any>) {
+        val observable: Observable<BaseResponse<Any>>
+        observable = if (TextUtils.equals(tryCarrier, Constant.CARRIER_DAILY_DOWNLOAD) || TextUtils.equals(tryCarrier, Constant.CARRIER_DAILY_VIDEO)) {
+            // 每日任务
+            loanService.reportTaskMsgV1(vo)
+        } else {
+            // 挑战
+            loanService.reportAddCoinMsg(vo)
+        }
+        AppHttpManager.getInstance(loanApplication)
+                .call(observable,
+                        object : BaseSubscriber<BaseResponse<Any?>?>() {
+                            override fun onCompleted() {
+                                if (isLinkView) return
+                            }
+
+                            override fun onError(e: Throwable) {
+                                if (isLinkView) return
+                            }
+
+                            fun onNext(baseResponse: BaseResponse<Any?>) {
+                                if (isLinkView) return
+                            }
+                        })
+    }
+
+}
\ No newline at end of file

highgold/app/src/main/java/com/mints/highgold/mvp/views/ReadView.kt

+package com.mints.highgold.mvp.views
+
+interface ReadView : BaseView {
+}
\ No newline at end of file

highgold/app/src/main/java/com/mints/highgold/ui/activitys/CsVedioActivity.kt

@@ -70,9 +70,6 @@ class CsVedioActivity : BaseActivity()
     override fun onDestroy() {
         super.onDestroy()
 
-        //退出释放资源
-        Ad.getInstance().onDestroy()
-
         csVedioPresenter?.detachView()
     }
 

highgold/app/src/main/java/com/mints/highgold/ui/activitys/ReadActivity.kt

+package com.mints.highgold.ui.activitys
+
+import android.view.View
+import com.mints.highgold.R
+import com.mints.highgold.mvp.presenters.ReadPresenter
+import com.mints.highgold.mvp.views.ReadView
+import com.mints.highgold.ui.activitys.base.BaseActivity
+import kotlinx.android.synthetic.main.header_activity.*
+
+/**
+ * 描述：阅读赚钱
+ * 作者：孟崔广
+ * 时间：2020/5/28 14:37
+ * 邮箱：mengcga@163.com
+ */
+class ReadActivity : BaseActivity()
+        , View.OnClickListener, ReadView {
+
+    private val TAG = ReadActivity::class.java.simpleName
+
+    private lateinit var readPresenter: ReadPresenter
+
+    override fun getContentViewLayoutID() = R.layout.activity_read
+
+    override fun isApplyKitKatTranslucency() = false
+
+    override fun initViewsAndEvents() {
+        tv_activity_title.text = "阅读赚钱"
+
+        initListener();
+
+        readPresenter = ReadPresenter()
+        readPresenter?.attachView(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        readPresenter?.detachView()
+    }
+
+    private fun initListener() {
+        tv_activity_back.setOnClickListener(this)
+
+    }
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.tv_activity_back ->{
+                finish()
+            }
+        }
+    }
+
+}

highgold/app/src/main/res/layout/activity_read.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    tools:context=".ui.activitys.ReadActivity">
+
+    <include layout="@layout/header_activity" />
+</LinearLayout>
\ No newline at end of file