Skip to content

A
android_vedio
Commit 8ccecec4 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码优化

parent 88b289b6
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 32 deletions
video/app/src/main/java/com/mints/wisdomclean/ad/splash/SplashManager.kt
View file @ 8ccecec4
......@@ -111,18 +111,6 @@ object SplashManager {
override fun onAdShow() {
isShowAd = true
LogUtil.d(TAG, "gromore应用内开屏广告--> 6、onAdShow ")
// if (mTTSplashAd != null) {
// val vo = HashMap<String, Any>()
// mTTSplashAd?.let {
// vo["adcode"] = it.showEcpm.adNetworkRitId
// vo["ecpm"] = it.showEcpm.preEcpm
// vo["adSource"] = it.showEcpm.adNetworkPlatformName
// vo["adType"] = Constant.GRO_MORE_ADTYPE0
// vo["adid"] = getInMoneySplashId()
// vo["isAddCoin"] = false
// TrackManager.getInstance().cmtGroMoreInfo(vo)
// }
// }
}
override fun onAdShowFail(adError: AdError) {
......
video/app/src/main/java/com/mints/wisdomclean/ad/video/InMoneyVideo.java
View file @ 8ccecec4
......@@ -238,9 +238,7 @@ public class InMoneyVideo {
vo.put("ecpm", nowEcpm);
vo.put("adSource", nowAdSource);
vo.put("carrierType", carrierType);
vo.put("adType", Constant.GRO_MORE_ADTYPE2);
vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
vo.put("isAddCoin", true);
TrackManager.getInstance().cmtGroMoreInfo(vo);
TrackManager.getInstance().reporGromeEcpm(vo);
}
......
video/app/src/main/java/com/mints/wisdomclean/ad/video/InMoneyVideoNoPre.java
View file @ 8ccecec4
......@@ -168,9 +168,7 @@ public class InMoneyVideoNoPre {
vo.put("ecpm", nowEcpm);
vo.put("adSource", nowAdSource);
vo.put("carrierType", carrierType);
vo.put("adType", Constant.GRO_MORE_ADTYPE2);
vo.put("adid", BuildConfig.GROMORE_VIDEO_CODE);
vo.put("isAddCoin", true);
TrackManager.getInstance().cmtGroMoreInfo(vo);
TrackManager.getInstance().reporGromeEcpm(vo);
}
......
video/app/src/main/java/com/mints/wisdomclean/common/Constant.kt
View file @ 8ccecec4
......@@ -2,10 +2,9 @@ package com.mints.wisdomclean.common
object Constant {
const val GRO_MORE_ADTYPE2 = "2"
const val AD_SOURCE_GROMORE = "GROMORE"
const val PAGE_SIZE = 12
const val LOCAL_VEDIO = "LOCAL_VEDIO"
const val VEDIO_BEAN = "VEDIO_BEAN"
/**
* 首次弹出权限声明
......
video/app/src/main/java/com/mints/wisdomclean/manager/LocalVedioManager.kt
View file @ 8ccecec4
......@@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.text.TextUtils
import com.bytedance.sdk.dp.utils.JSON
import com.mints.library.utils.json.JsonUtil
import com.mints.wisdomclean.common.Constant
import com.mints.wisdomclean.mvp.model.VedioBean
......@@ -23,7 +24,7 @@ object LocalVedioManager {
*/
fun commitVedio(data: VedioBean) {
cacheVedio(data)
TrackManager.getInstance().commitVedio()
TrackManager.getInstance().commitVedio(data)
}
/**
......@@ -80,7 +81,8 @@ object LocalVedioManager {
*/
fun startVedioDetailActivityForType(activity: Activity, data: VedioBean?) {
val bundle = Bundle()
if (data?.createType==1) {
bundle.putString(Constant.VEDIO_BEAN, JsonUtil.toJson(data))
if (data?.createType == 1) {
//自有短剧
readyGo(activity, VideoActivity::class.java, bundle)
} else {
......
video/app/src/main/java/com/mints/wisdomclean/manager/TrackManager.java
View file @ 8ccecec4
......@@ -4,6 +4,7 @@ package com.mints.wisdomclean.manager;
import android.text.TextUtils;
import com.mints.wisdomclean.MintsApplication;
import com.mints.wisdomclean.mvp.model.VedioBean;
import com.mints.wisdomclean.mvp.presenters.TrackPresenter;
import java.util.HashMap;
......@@ -56,9 +57,11 @@ public class TrackManager {
}
public void commitVedio() {
public void commitVedio(VedioBean data) {
if (trackPresenter != null) {
HashMap<String, Object> vo = new HashMap<>();
vo.put("vedioIndex",data.getSeeIndex());
vo.put("vedioId",data.getVedioId());
trackPresenter.commitVedio(vo);
}
}
......
video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/TrackPresenter.java
View file @ 8ccecec4
......@@ -98,8 +98,8 @@ public class TrackPresenter extends BaseTrackPresenter {
public void commitVedio(HashMap<String, Object> vo) {
AppHttpManager.getInstance(loanApplication)
.call(loanService.reporGromeEcpm(vo),
new BaseSubscriber<BaseResponse<JsonObject>>() {
.call(loanService.reportIndex(vo),
new BaseSubscriber<BaseResponse<Object>>() {
@Override
public void onCompleted() {
}
......@@ -110,7 +110,7 @@ public class TrackPresenter extends BaseTrackPresenter {
}
@Override
public void onNext(BaseResponse<JsonObject> baseResponse) {
public void onNext(BaseResponse<Object> baseResponse) {
}
});
}
......
video/app/src/main/java/com/mints/wisdomclean/net/LoanService.java
View file @ 8ccecec4
......@@ -200,6 +200,12 @@ public interface LoanService {
@POST("api/vedio/orders")
Observable<BaseResponse<BannerList>> orders();
/**
* 提交视频信息
*/
@POST("api/vedio/reportIndex")
Observable<BaseResponse<Object>> reportIndex(@Body Map<String, Object> vo);
/**
* 默认http工厂
*/
......
video/app/src/main/java/com/mints/wisdomclean/ui/activitys/SettingsActivity.kt
View file @ 8ccecec4
......@@ -37,11 +37,11 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
override fun onResume() {
super.onResume()
if (userManager.vipFlag) {
item_back.visibility = View.VISIBLE
} else {
item_back.visibility = View.GONE
}
// if (userManager.vipFlag) {
// item_back.visibility = View.VISIBLE
// } else {
// item_back.visibility = View.GONE
// }
if (userManager.userIsLogin()) {
btn_switch.visibility = View.VISIBLE
......@@ -190,8 +190,6 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
}
private fun cancelAccount() {
val address = "dev_apple@tech-mints.cn"
DialogUtils.showDialog(
this,
SpanUtils()
......
video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MyFragment.kt
View file @ 8ccecec4
......@@ -12,6 +12,7 @@ import com.mints.wisdomclean.mvp.presenters.MyPresenter
import com.mints.wisdomclean.mvp.views.MyView
import com.mints.wisdomclean.ui.activitys.*
import com.mints.wisdomclean.ui.fragment.base.BaseFragment
import com.mints.wisdomclean.utils.SpanUtils
import com.mints.wisdomclean.utils.TimeRender
import com.mints.wisdomclean.video.DPHolderManager
import kotlinx.android.synthetic.main.fragment_main_my.*
......@@ -31,6 +32,15 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
override fun initViewsAndEvents() {
myPresenter.attachView(this)
tv_contact.text = SpanUtils()
.append("如有问题，请直接联系")
.append("在线客服\n")
.setForegroundColor(resources.getColor(R.color.main_mints))
.append("处理速度更快，")
.append("无需联系支付宝")
.setForegroundColor(resources.getColor(R.color.main_mints))
.create()
initListener()
DPHolderManager.initDpSdk(requireContext())
......@@ -84,9 +94,11 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
}
R.id.ll_my_feed -> {
// (requireActivity() as MainActivity).backPhoneDialog()
readyGo(FeedbackActivity::class.java)
}
R.id.ll_contactus -> {
(requireActivity() as MainActivity).backPhoneDialog()
}
R.id.ll_my_payrecord -> {
readyGo(OrderRecordActivity::class.java)
}
......@@ -139,6 +151,7 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
ll_my_feed.setOnClickListener(this)
ll_my_payrecord.setOnClickListener(this)
ll_my_setting.setOnClickListener(this)
ll_contactus.setOnClickListener(this)
}
}
\ No newline at end of file
video/app/src/main/java/com/mints/wisdomclean/video/VideoActivity.kt
View file @ 8ccecec4
......@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.OrientationHelper
import androidx.recyclerview.widget.RecyclerView
import cn.jzvd.Jzvd
import com.mints.wisdomclean.R
import com.mints.wisdomclean.manager.LocalVedioManager
import com.mints.wisdomclean.ui.activitys.base.BaseActivity
import com.mints.wisdomclean.ui.widgets.DialogListener
import com.mints.wisdomclean.ui.widgets.VideoEpisodeDialog
......@@ -69,6 +70,7 @@ class VideoActivity : BaseActivity(), View.OnClickListener {
override fun onInitComplete() {
mCurrentPosition = 0
// LocalVedioManager.commitVedio()
//初始化 自动播放
autoPlayVideo()
}
......
video/app/src/main/res/layout/fragment_main_my.xml
View file @ 8ccecec4
......@@ -210,6 +210,32 @@
android:layout_height="1dp"
android:background="@color/my_color_gray" />
<LinearLayout
android:id="@+id/ll_contactus"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp">
<TextView
android:id="@+id/tv_contact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="如有问题，请直接联系在线客服\n"
android:textColor="@color/black" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:padding="6dp"
android:src="@mipmap/ic_arrow_more" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_my_setting"
android:layout_width="match_parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment