Commit cd6e5f16 authored by mengcuiguang's avatar mengcuiguang

福袋网络切换优化

parent 8d654376
...@@ -205,7 +205,7 @@ dependencies { ...@@ -205,7 +205,7 @@ dependencies {
implementation 'com.umeng.umsdk:asms:1.1.3' // asms包依赖(必选) implementation 'com.umeng.umsdk:asms:1.1.3' // asms包依赖(必选)
implementation 'com.umeng.umsdk:crash:0.0.4' // native crash包依赖(必选) implementation 'com.umeng.umsdk:crash:0.0.4' // native crash包依赖(必选)
// 一览视频 // 一览视频
implementation("com.yilan.sdk:ui:3.3.1.2") { implementation("com.yilan.sdk:ui:3.3.2.2") {
exclude group: 'com.yilan.sdk', module: 'yb_extra' exclude group: 'com.yilan.sdk', module: 'yb_extra'
exclude group: 'com.yilan.sdk', module: 'gdt' exclude group: 'com.yilan.sdk', module: 'gdt'
exclude group: 'com.yilan.sdk', module: 'ks' exclude group: 'com.yilan.sdk', module: 'ks'
......
...@@ -41,7 +41,8 @@ object YlhPreLoadExpressManager { ...@@ -41,7 +41,8 @@ object YlhPreLoadExpressManager {
} }
private fun loadAd() { private fun loadAd() {
nativeExpressAD?.setAdSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT) // nativeExpressAD?.setAdSize(ADSize.FULL_WIDTH, ADSize.AUTO_HEIGHT)
nativeExpressAD?.setAdSize(300, 300)
// 如果您在平台上新建平台模板2.0广告位时,选择了支持视频,那么可以进行个性化设置(可选) // 如果您在平台上新建平台模板2.0广告位时,选择了支持视频,那么可以进行个性化设置(可选)
val builder = VideoOption2.Builder() val builder = VideoOption2.Builder()
......
...@@ -22,13 +22,12 @@ public class TtCsjAdManager { ...@@ -22,13 +22,12 @@ public class TtCsjAdManager {
/*banner*/ /*banner*/
public static String TT_AD_BANNER_MY = "945968536";// 个人中心 public static String TT_AD_BANNER_MY = "945968536";// 个人中心
public static String TT_AD_BANNER_JULEYUN = "";// 聚乐云
/*开屏*/ /*开屏*/
public static String TT_AD_SPLASH_POSTID = "887454728";// 开屏 public static String TT_AD_SPLASH_POSTID = "887454728";// 开屏
/*激励视频*/ /*激励视频*/
public static String TT_AD_VEDIO_MAIN_DEV = "945968497";// 开发使用 public static String TT_AD_VEDIO_MAIN_DEV = "945974847";// 开发使用
public static String TT_AD_VEDIO_DRINK = "945968497";//喝水打卡 public static String TT_AD_VEDIO_DRINK = "945968497";//喝水打卡
public static String TT_AD_VEDIO_WALK = "945968497";//走路打卡 public static String TT_AD_VEDIO_WALK = "945968497";//走路打卡
public static String TT_AD_VEDIO_MAIN = "945968497";// 我的界面视频 public static String TT_AD_VEDIO_MAIN = "945968497";// 我的界面视频
...@@ -40,9 +39,6 @@ public class TtCsjAdManager { ...@@ -40,9 +39,6 @@ public class TtCsjAdManager {
public static String TT_AD_VEDIO_OFFINELINE = "945968497";// 离线弹框 public static String TT_AD_VEDIO_OFFINELINE = "945968497";// 离线弹框
public static String TT_AD_VEDIO_DRAWCASH = "945968497";// 提现 public static String TT_AD_VEDIO_DRAWCASH = "945968497";// 提现
public static String TT_AD_VEDIO_MOST = "945968497";// 超级翻倍/高额任务 public static String TT_AD_VEDIO_MOST = "945968497";// 超级翻倍/高额任务
public static String TT_AD_VEDIO_GAME = "";// 猎豹
public static String TT_AD_VEDIO_JULEYUN = "";// 聚乐云
public static String TT_AD_VEDIO_BIANXIANMAO = "";// 变现猫
public static String TT_AD_VEDIO_BLESSINGBAG = "945968497";// 福袋 public static String TT_AD_VEDIO_BLESSINGBAG = "945968497";// 福袋
public static String TT_AD_VEDIO_HOMEVEDIO = "945968497";// 首页视频翻倍 public static String TT_AD_VEDIO_HOMEVEDIO = "945968497";// 首页视频翻倍
public static String TT_AD_VEDIO_SMALLHOMEVEDIO = "945968497";// 短视频翻倍 public static String TT_AD_VEDIO_SMALLHOMEVEDIO = "945968497";// 短视频翻倍
...@@ -56,12 +52,6 @@ public class TtCsjAdManager { ...@@ -56,12 +52,6 @@ public class TtCsjAdManager {
public static String TT_AD_NATIVEEXPRESS_WATER = "945968542";//喝水 public static String TT_AD_NATIVEEXPRESS_WATER = "945968542";//喝水
public static String TT_AD_NATIVEEXPRESS_MORNINGCLOCK = "945968542";//早上打卡 public static String TT_AD_NATIVEEXPRESS_MORNINGCLOCK = "945968542";//早上打卡
public static String TT_AD_NATIVEEXPRESS_EAT = "945968542";//餐补 public static String TT_AD_NATIVEEXPRESS_EAT = "945968542";//餐补
public static String TT_AD_NATIVEEXPRESS_ID_LIEBAO_LISTEXIT = "";//猎豹列表和退出
/*全屏广告*/
public static String TT_AD_ALLVEDIO_ID_LIEBAO = "";//猎豹全屏带跳过按钮
/*插屏广告*/
public static String TT_AD_INSERT_LOADING_ID_LIEBAO = "";//猎豹游戏加载时
public static String TT_AD_INSERT_LOADING_ID_JULEYUN = "";//聚乐云
private static boolean sInit; private static boolean sInit;
......
...@@ -31,20 +31,14 @@ object YlhAdManager { ...@@ -31,20 +31,14 @@ object YlhAdManager {
var YLH_AD_VEDIO_OFFINELINE = "4061975164654076" // 离线弹框 var YLH_AD_VEDIO_OFFINELINE = "4061975164654076" // 离线弹框
var YLH_AD_VEDIO_DRAWCASH = "4061975164654076" // 提现 var YLH_AD_VEDIO_DRAWCASH = "4061975164654076" // 提现
var YLH_AD_VEDIO_MOST = "4061975164654076" // 超级翻倍/高额任务 var YLH_AD_VEDIO_MOST = "4061975164654076" // 超级翻倍/高额任务
var YLH_AD_VEDIO_GAME = "" // 猎豹
var YLH_AD_VEDIO_BLESSINGBAG = "4061975164654076" // 福袋 var YLH_AD_VEDIO_BLESSINGBAG = "4061975164654076" // 福袋
var YLH_AD_VEDIO_HOMEVEDIO = "4061975164654076" // 首页视频翻倍 var YLH_AD_VEDIO_HOMEVEDIO = "4061975164654076" // 首页视频翻倍
var YLH_AD_VEDIO_SMALLHOMEVEDIO = "4061975164654076" // 短视频翻倍 var YLH_AD_VEDIO_SMALLHOMEVEDIO = "4061975164654076" // 短视频翻倍
var YLH_AD_VEDIO_KYLVEDIO = "4061975164654076" // 来电秀视频 var YLH_AD_VEDIO_KYLVEDIO = "4061975164654076" // 来电秀视频
/*信息流*/ /*信息流*/
var YLH_AD_NATIVEEXPRESS_JULEYUN = "" //聚乐云
var YLH_AD_NATIVEEXPRESS_AWARD = "4021677125089838" //奖励弹窗 var YLH_AD_NATIVEEXPRESS_AWARD = "4021677125089838" //奖励弹窗
/* 插屏 */
var YLH_AD_INTERSTITIALAD_LIEBAO = "" //猎豹
var YLH_AD_INTERSTITIALAD_JULEYUN = "" //聚乐云
/** /**
* 广告初始化 * 广告初始化
*/ */
...@@ -73,7 +67,6 @@ object YlhAdManager { ...@@ -73,7 +67,6 @@ object YlhAdManager {
YLH_AD_VEDIO_OFFINELINE = idBean.ylhv2 // 离线弹框 YLH_AD_VEDIO_OFFINELINE = idBean.ylhv2 // 离线弹框
YLH_AD_VEDIO_DRAWCASH = idBean.ylhv2 // 提现 YLH_AD_VEDIO_DRAWCASH = idBean.ylhv2 // 提现
YLH_AD_VEDIO_MOST = idBean.ylhv2 // 超级翻倍/高额任务 YLH_AD_VEDIO_MOST = idBean.ylhv2 // 超级翻倍/高额任务
YLH_AD_VEDIO_GAME = idBean.ylhv2 // 猎豹
YLH_AD_VEDIO_BLESSINGBAG = idBean.ylhv2 // 福袋 YLH_AD_VEDIO_BLESSINGBAG = idBean.ylhv2 // 福袋
YLH_AD_VEDIO_HOMEVEDIO = idBean.ylhv2 // 首页视频翻倍 YLH_AD_VEDIO_HOMEVEDIO = idBean.ylhv2 // 首页视频翻倍
YLH_AD_VEDIO_SMALLHOMEVEDIO = idBean.ylhv2 // 短视频翻倍 YLH_AD_VEDIO_SMALLHOMEVEDIO = idBean.ylhv2 // 短视频翻倍
......
...@@ -78,6 +78,7 @@ class HomePresenter : BasePresenter<HomeView>() { ...@@ -78,6 +78,7 @@ class HomePresenter : BasePresenter<HomeView>() {
if (isLinkView) return if (isLinkView) return
view.hideLoading() view.hideLoading()
view.showToast(e.message) view.showToast(e.message)
view.getHallBaseMsgFail()
} }
override fun onNext(baseResponse: BaseResponse<UserTaskMsgBean>) { override fun onNext(baseResponse: BaseResponse<UserTaskMsgBean>) {
......
...@@ -20,6 +20,7 @@ class HorizChannelPresenter : BasePresenter<HorizChannelView>() { ...@@ -20,6 +20,7 @@ class HorizChannelPresenter : BasePresenter<HorizChannelView>() {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
if (isLinkView) return if (isLinkView) return
view.getHomeVedioMsgFail()
} }
override fun onNext(baseResponse: BaseResponse<MainVideoMsgBean>) { override fun onNext(baseResponse: BaseResponse<MainVideoMsgBean>) {
......
...@@ -7,4 +7,5 @@ import com.wenshu.youyou.mvp.model.UserTaskMsgBean ...@@ -7,4 +7,5 @@ import com.wenshu.youyou.mvp.model.UserTaskMsgBean
interface HomeView : BaseView { interface HomeView : BaseView {
fun getHallBaseMsgSuc(data: UserTaskMsgBean) fun getHallBaseMsgSuc(data: UserTaskMsgBean)
fun getHomeVedioMsgSuc(data: MainVideoMsgBean) fun getHomeVedioMsgSuc(data: MainVideoMsgBean)
fun getHallBaseMsgFail()
} }
...@@ -6,4 +6,6 @@ interface HorizChannelView : BaseView { ...@@ -6,4 +6,6 @@ interface HorizChannelView : BaseView {
fun getHomeVedioMsgSuc(data: MainVideoMsgBean) fun getHomeVedioMsgSuc(data: MainVideoMsgBean)
fun getHomeVedioMsgFail()
} }
\ No newline at end of file
...@@ -165,6 +165,11 @@ class HorizonChannelFragment : BaseFragment(), HorizChannelView, View.OnClickLis ...@@ -165,6 +165,11 @@ class HorizonChannelFragment : BaseFragment(), HorizChannelView, View.OnClickLis
} }
} }
override fun getHomeVedioMsgFail() {
tv_fragment_main_redbox.text = "--:--"
rl_fragment_main_redbox.isClickable = false
}
override fun getHomeVedioMsgSuc(data: MainVideoMsgBean) { override fun getHomeVedioMsgSuc(data: MainVideoMsgBean) {
if (activity == null || requireActivity().isFinishing) { if (activity == null || requireActivity().isFinishing) {
return return
...@@ -387,6 +392,7 @@ class HorizonChannelFragment : BaseFragment(), HorizChannelView, View.OnClickLis ...@@ -387,6 +392,7 @@ class HorizonChannelFragment : BaseFragment(), HorizChannelView, View.OnClickLis
private fun destoryTimerRedbox() { private fun destoryTimerRedbox() {
mRedBoxTimer?.stop() mRedBoxTimer?.stop()
mRedBoxTimer?.setOnCountDownTimerListener(null)
mRedBoxTimer = null mRedBoxTimer = null
} }
} }
\ No newline at end of file
...@@ -207,6 +207,11 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener { ...@@ -207,6 +207,11 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
homePresenter.detachView() homePresenter.detachView()
} }
override fun getHallBaseMsgFail() {
tv_fragment_main_redbox.text = "--:--"
rl_fragment_main_redbox.isClickable = false
}
override fun getHallBaseMsgSuc(data: UserTaskMsgBean) { override fun getHallBaseMsgSuc(data: UserTaskMsgBean) {
TrackManager.getInstance().updataCodeIdForPkgChannel() TrackManager.getInstance().updataCodeIdForPkgChannel()
...@@ -732,6 +737,7 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener { ...@@ -732,6 +737,7 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
private fun destroyTimerRedbox() { private fun destroyTimerRedbox() {
mRedBoxTimer?.stop() mRedBoxTimer?.stop()
mRedBoxTimer?.setOnCountDownTimerListener(null)
mRedBoxTimer = null mRedBoxTimer = null
} }
} }
\ No newline at end of file
...@@ -31,8 +31,8 @@ import java.util.HashMap ...@@ -31,8 +31,8 @@ import java.util.HashMap
class WzFragment(private var isResume: Boolean = false) : BaseFragment(), BaseView { class WzFragment(private var isResume: Boolean = false) : BaseFragment(), BaseView {
private val WZ_URL = "http://api.wenlv-kd.com/h5/init.html" private val WZ_URL = "http://api.wenlv-kd.com/h5/init.html"
private val APP_KEY = "taojinkongjian" private val APP_KEY = "haozhuanqian"
private val APP_ID = "177" private val APP_ID = "195"
private val userManager by lazy { UserManager.getInstance() } private val userManager by lazy { UserManager.getInstance() }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:gravity="center" android:gravity="center"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp" android:paddingEnd="2dp"
android:text="可拆开" android:text="--:--"
android:textColor="@color/color_F28335" android:textColor="@color/color_F28335"
android:textSize="8sp" /> android:textSize="8sp" />
</FrameLayout> </FrameLayout>
\ No newline at end of file
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