Skip to content

X
xxsq
Commit 9d85929d authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改新需求，添加激励视频

parent f935ab00
Hide whitespace changes
Inline Side-by-side
Showing with 563 additions and 72 deletions
app/src/main/AndroidManifest.xml
View file @ 9d85929d
......@@ -41,7 +41,7 @@
<uses-permission android:name="com.zxhl.shop.openadsdk.permission.TT_PANGOLIN" />
<uses-sdk tools:overrideLibrary="com.bun.miitmdid" />
<meta-data android:name="android.max_aspect" android:value="2.1" />
<application
android:name=".Appli"
......@@ -104,18 +104,18 @@
android:name="org.apache.http.legacy"
android:required="false" />
<meta-data
android:name="design_width_in_dp"
android:value="420"/>
<meta-data
android:name="design_height_in_dp"
android:value="740"/>
<!-- <meta-data-->
<!-- android:name="design_width_in_dp"-->
<!-- android:value="360"/>-->
<!-- android:value="420"/>-->
<!-- <meta-data-->
<!-- android:name="design_height_in_dp"-->
<!-- android:value="640"/>-->
<!-- android:value="740"/>-->
<meta-data
android:name="design_width_in_dp"
android:value="360"/>
<meta-data
android:name="design_height_in_dp"
android:value="640"/>
</application>
</manifest>
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
View file @ 9d85929d
......@@ -282,6 +282,8 @@ public class NetConfig {
public static final String XX_GOODS_ITEM_DETAIL = "app/v1/game/xiaoxiang/itemDetail";//图文详情
public static final String XX_HOME_BANNER = "app/v1/game/xiaoxiang/banner";//Banner
public static final String XX_GOODS_FETCHALL_CARD = "app/v1/game/xiaoxiang/fetchAllCard";//话费券列表
public static final String XX_GOODS_VIDEO_AD_INFO = "app/v1/game/xiaoxiang/videoAdInfo";//获取激励视频奖励信息
public static final String XX_GOODS_VIDEO_REWARD = "app/v1/game/xiaoxiang/videoAward";//激励视频播放以后调用保存话费券
}
public static class FlashSale {
......
cms/src/main/java/com/zxhl/cms/net/SettingPreference.java
View file @ 9d85929d
......@@ -1741,6 +1741,7 @@ public class SettingPreference {
editor.putInt("PAY_TIPS_DIALOG", num);
editor.commit();
}
public static String getShowUseDiscount() {
SharedPreferences settings = AppContext.get().getSharedPreferences(USER_SETTING, 0);
return settings.getString("SHOW_USE_DISCOUNT_DIALOG", "0");
......@@ -1764,4 +1765,16 @@ public class SettingPreference {
editor.putString("SHOW_COUPS_DIALOG", isshow);
editor.commit();
}
public static String getAdSwitch() {
SharedPreferences settings = AppContext.get().getSharedPreferences(USER_SETTING, 0);
return settings.getString("AD_SWITCH", "1");
}
public static void setAdSwitch(String ifopen) {
SharedPreferences settings = AppContext.get().getSharedPreferences(USER_SETTING, 0);
SharedPreferences.Editor editor = settings.edit();
editor.putString("AD_SWITCH", ifopen);
editor.commit();
}
}
cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt
View file @ 9d85929d
......@@ -14,6 +14,7 @@ import com.zxhl.cms.net.model.qy.TbGoodsEntity
import com.zxhl.cms.net.model.qy.SkillEntity
import com.zxhl.cms.net.model.uc.UserInfo
import com.zxhl.cms.net.model.uc.VersionEntity
import com.zxhl.cms.net.model.video.VideoInfoEntity
import io.reactivex.Observable
import okhttp3.ResponseBody
import retrofit2.http.*
......@@ -409,4 +410,10 @@ interface IHomeApi {
//获取用户话费券列表
@GET(NetConfig.QY.XX_GOODS_FETCHALL_CARD)
fun getFetchallCard(): Observable<Response<List<CouponsEntity>>>
@GET(NetConfig.QY.XX_GOODS_VIDEO_AD_INFO)
fun getVideoInfo(): Observable<Response<VideoInfoEntity>>
@POST(NetConfig.QY.XX_GOODS_VIDEO_REWARD)
fun getVideoReward(): Observable<Response<VideoInfoEntity>>
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/box/AppInEntity.kt
View file @ 9d85929d
......@@ -25,6 +25,7 @@ class AppInEntity {
var mobileOpList: List<MobileOpEntity>? = null
var switch: ServiceConfig? = null
var rechargeAlert: String = ""
var online_service:String?=""
}
class MobileOpEntity {
......
cms/src/main/java/com/zxhl/cms/net/model/qy/JgqQyEntity.kt
View file @ 9d85929d
......@@ -11,5 +11,6 @@ class JgqQyEntity {
var icon: String? = ""
var maxDiscount: String? = ""
var rechargeType: String? = ""
var openType: String? = ""
var remark: String? = ""
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/video/VideoInfoEntity.kt 0 → 100644
View file @ 9d85929d
package com.zxhl.cms.net.model.video
class VideoInfoEntity {
var awardCount: Int = 0
var leftCount: Int = 0
var content: String? = ""
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/FreeCouponActivity.kt 0 → 100644
View file @ 9d85929d
package com.zxbw.modulemain.activity
import android.view.View
import com.zxbw.modulemain.R
import com.zxhl.cms.common.base.BaseActivity
class FreeCouponActivity:BaseActivity() {
override fun onClick(v: View?) {
}
override fun layoutID(): Int {
return R.layout.activity_layout_splash_backound
}
override fun init() {
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/PaySuccessActivity.kt
View file @ 9d85929d
package com.zxbw.modulemain.activity
import android.app.Activity
import android.util.Log
import android.view.View
import com.zx.ad.AdManager
import com.zx.ad.callback.RewardVideoAdListener
import com.zxbw.modulemain.R
import com.zxbw.modulemain.view.DialogUtils
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers
import com.zxhl.cms.net.callback.BaseObserver
import com.zxhl.cms.net.model.box.NoticeEntity
import com.zxhl.cms.net.model.video.VideoInfoEntity
import com.zxhl.cms.utils.JumpUtils
import kotlinx.android.synthetic.main.layout_pay_suc.*
......@@ -23,16 +33,96 @@ class PaySuccessActivity : BaseActivity() {
}
override fun init() {
type = intent?.data?.getQueryParameter("pay_type") ?: ""
if (type.equals("2")) {
id_tv_desc_tips.text = "支付成功\n话费充值将在72小时内到账！"
} else {
id_tv_desc_tips.text = "恭喜您\n本次交易成功！"
}
id_img_back2?.setOnClickListener {
finish()
}
id_tv_btn_order?.setOnClickListener {
JumpUtils.MyOrderJump("")
finish()
}
getVideoInfo()
}
fun getVideoInfo() {
ApiClient.homeApi.getVideoInfo()
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<VideoInfoEntity>() {
override fun onSuccess(result: VideoInfoEntity?) {
if (result != null) {
if (result.leftCount > 0) {
DialogUtils.showViewInfo(
mActivity as Activity,
result.content,
View.OnClickListener {
lookVideo()
})
}
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
fun getReward() {
ApiClient.homeApi.getVideoReward()
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<VideoInfoEntity>() {
override fun onSuccess(result: VideoInfoEntity?) {
if (result != null) {
DialogUtils.showGetReward(
mActivity as Activity,
result?.leftCount,
result.content,
View.OnClickListener {
JumpUtils.PhoneVoucherJump()
},
View.OnClickListener {
lookVideo()
})
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
fun lookVideo() {
AdManager.loadRewardAd(this, object : RewardVideoAdListener {
override fun onRewardVideoAdClose() {
Log.e("MXL", "onRewardVideoAdClose")
getReward()
}
override fun onRewardVideoAdReward() {
}
override fun onRewardVideoAdShow() {
Log.e("MXL", "onRewardVideoAdShow")
}
override fun onRewardVideoAdError(errorMsg: String?) {
Log.e("MXL", "errorMsg:" + errorMsg)
}
})
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt
View file @ 9d85929d
......@@ -65,6 +65,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
private var selectPrice: String? = ""
var goodsID: String? = ""
var couponId: String? = ""
var mobietype: String? = ""
private var position: Int? = -1
override fun onClick(v: View?) {
when (v) {
......@@ -94,14 +95,15 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
override fun layoutID(): Int {
return R.layout.activity_layout_recharge
}
fun showIntriAd(){
fun showIntriAd() {
AdManager.loadInterAd(this!!, object : InterertionAdListener {
override fun onAdShow() {
}
override fun onAdError(errorMsg: String?) {
Log.e("MXL","onAdError"+errorMsg)
Log.e("MXL", "onAdError" + errorMsg)
}
override fun onAdClose() {
......@@ -110,28 +112,15 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
})
}
fun showRewardViewAd(){
AdManager.loadRewardAd(this@RechargeActivity, object : RewardVideoAdListener {
override fun onRewardVideoAdClose() {
}
override fun onRewardVideoAdReward() {
}
override fun onRewardVideoAdShow() {
}
override fun onRewardVideoAdError(errorMsg: String?) {
fun showRewardViewAd() {
}
})
}
override fun init() {
showIntriAd()
// showRewardViewAd()
if (SettingPreference.getAdSwitch().equals("1")) {
showIntriAd()
}
id_img_back?.setOnClickListener {
finish()
}
......@@ -141,6 +130,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
this,
OnRecycleItemClickListener<MobileOpEntity> { view, position, data ->
mobileOp = data.value
mobietype = data.name
})
id_rl_yunyingshang?.layoutManager = GridLayoutManager(this, 3)
......@@ -161,15 +151,19 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
mPresenter?.getFetchCard()
// mPresenter?.getPayList("mobileFee")
id_edit_user_phone?.setText(user.nickname.toString())
id_tv_test?.setOnClickListener {
finish()
JumpUtils.PaySuceessJump("2")
}
id_edit_user_phone?.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
if(s!!.length>=11){
if (s!!.length >= 11) {
getMobileop(s.toString())
}else{
} else {
mobileOp = ""
mOperatorAdapter?.setPosition(-1)
}
......@@ -216,6 +210,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
) {
mobileOp = "SHKC_MC"
mobietype = "中国移动"
mOperatorAdapter?.setPosition(0)
Log.e("MXL", "移动号")
} else if (mobile.trim().substring(0, 3).equals("130")
......@@ -231,6 +226,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
) {
mOperatorAdapter?.setPosition(1)
mobileOp = "SHKC_CU_MC"
mobietype = "中国联通"
Log.e("MXL", "联通号")
} else if (mobile.trim().substring(0, 3).equals("133")
|| mobile.trim().substring(0, 3).equals("149")
......@@ -242,6 +238,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
) {
mobileOp = "SHKC_CT_MC"
mOperatorAdapter?.setPosition(2)
mobietype = "中国电信"
Log.e("MXL", "电信号")
} else {
mobileOp = ""
......@@ -352,11 +349,10 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
showToast("请选择运营商")
return
}
DialogUtils.showRechargeTips(this, phoneNumber) {
DialogUtils.showRechargeTips(this, phoneNumber, mobietype) {
isClickPayBtn = true
mLoading?.setLoading("请稍后...")
mLoading?.show()
Log.e("MXL", "s" + pay_type)
if (pay_type == 2) {
mPresenter?.requestWechatPayOrder(
"xxsqshop://recharge",
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/SettingActivity.kt
View file @ 9d85929d
......@@ -22,10 +22,12 @@ class SettingActivity : BaseActivity() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun layoutID(): Int {
return R.layout.activity_layout_setting
}
var adSwitch: Boolean? = false
override fun init() {
id_img_back?.setOnClickListener {
finish()
......@@ -34,9 +36,23 @@ class SettingActivity : BaseActivity() {
if (user == null) {
return
}
if (SettingPreference.getAdSwitch().equals("0")) {
id_img_ad?.setImageResource(R.drawable.icon_guan)
}else{
id_img_ad?.setImageResource(R.drawable.icon_kai)
}
id_img_ad?.setOnClickListener {
if (SettingPreference.getAdSwitch().equals("0")) {
SettingPreference.setAdSwitch("1")
id_img_ad?.setImageResource(R.drawable.icon_kai)
} else {
SettingPreference.setAdSwitch("0")
id_img_ad?.setImageResource(R.drawable.icon_guan)
}
}
id_tv_user_number?.text = user.nickname
id_tv_number?.text=user.phone
id_tv_id?.text=user.uid
id_tv_number?.text = user.phone
id_tv_id?.text = user.uid
id_tv_version_code?.text = "V${Constant.Param.vn}"
if (!TextUtils.isEmpty(user.headImage)) {
Glide.with(this).load(user.headImage)
......
moduleMain/src/main/java/com/zxbw/modulemain/adapter/HomeQyBannerAdapter.kt
View file @ 9d85929d
......@@ -12,9 +12,17 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager.widget.PagerAdapter
import com.bumptech.glide.Glide
import com.zx.ad.AdManager
import com.zx.ad.callback.RewardVideoAdListener
import com.zxbw.modulemain.R
import com.zxbw.modulemain.view.DialogUtils
import com.zxhl.cms.common.Constant
import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers
import com.zxhl.cms.net.callback.BaseObserver
import com.zxhl.cms.net.model.qy.JgqQyEntity
import com.zxhl.cms.net.model.video.VideoInfoEntity
import com.zxhl.cms.utils.EventUtils
import com.zxhl.cms.utils.JumpUtils
import com.zxhl.cms.utils.OnRecycleItemClickListener
import com.zxhl.cms.utils.Utils
......@@ -48,6 +56,7 @@ class HomeQyBannerAdapter : PagerAdapter {
var mJgqQyAdapter = JgqQyAdapter(mActivity,
OnRecycleItemClickListener<JgqQyEntity> { view, position, data ->
EventUtils.onEvent("gird_click",""+data.sort)
if (TextUtils.equals(data.rechargeType, "51")) {
JumpUtils.CardVoucherJump(data.brand)
} else if (TextUtils.equals(data.rechargeType, "1")) {
......@@ -64,7 +73,12 @@ class HomeQyBannerAdapter : PagerAdapter {
JumpUtils.RechargeJump()
}
} else {
JumpUtils.RightsDetailJump(data.brand, data.icon)
if (TextUtils.equals(data.openType, "2")) {
getVideoInfo()
}else{
JumpUtils.RightsDetailJump(data.brand, data.icon)
}
}
})
val manager = GridLayoutManager(mActivity, 5)
......@@ -92,5 +106,79 @@ class HomeQyBannerAdapter : PagerAdapter {
override fun getCount(): Int {
return mViewList.size
}
fun getVideoInfo() {
ApiClient.homeApi.getVideoInfo()
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<VideoInfoEntity>() {
override fun onSuccess(result: VideoInfoEntity?) {
if (result != null) {
if (result.leftCount > 0) {
DialogUtils.showViewInfo(
mActivity as Activity,
result.content,
View.OnClickListener {
lookVideo()
})
}else{
}
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
fun lookVideo() {
AdManager.loadRewardAd(mActivity!!, object : RewardVideoAdListener {
override fun onRewardVideoAdClose() {
Log.e("MXL", "onRewardVideoAdClose")
getReward()
}
override fun onRewardVideoAdReward() {
}
override fun onRewardVideoAdShow() {
Log.e("MXL", "onRewardVideoAdShow")
}
override fun onRewardVideoAdError(errorMsg: String?) {
Log.e("MXL", "errorMsg:" + errorMsg)
}
})
}
fun getReward() {
ApiClient.homeApi.getVideoReward()
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<VideoInfoEntity>() {
override fun onSuccess(result: VideoInfoEntity?) {
if (result != null) {
DialogUtils.showGetReward(
mActivity as Activity,
result?.leftCount,
result.content,
View.OnClickListener {
JumpUtils.PhoneVoucherJump()
},
View.OnClickListener {
lookVideo()
})
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/view/DialogUtils.kt
View file @ 9d85929d
......@@ -13,6 +13,7 @@ import android.text.TextUtils
import android.view.Gravity
import android.view.View
import android.view.animation.AccelerateInterpolator
import android.view.animation.AnimationUtils
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
......@@ -388,6 +389,7 @@ object DialogUtils {
fun showRechargeTips(
context: Activity?,
phone: String,
mobilename:String?,
makeSureListener: View.OnClickListener
) {
if (context == null) return
......@@ -402,7 +404,7 @@ object DialogUtils {
)
val text =
"<b><myfont size=80>携号转网</myfont></b>" + "号码请勿提交充值，提交" + "<b><myfont size=80>不能售后</myfont></b>" + "<br>" + "话费充值成功售后期" + "<b><myfont size=80>7天</myfont></b>" + "，请及时查看账单，超时" + "<b><myfont size=80>不能售后</myfont></b></br>"
mDialogView.findViewById<TextView>(R.id.id_tv_phone).text = "本次充值号码为：${phone}"
mDialogView.findViewById<TextView>(R.id.id_tv_phone).text = "本次充值号码为：(${mobilename}) ${phone}"
var result = SettingPreference.getConfig()
if (!TextUtils.isEmpty(result.rechargeAlert)) {
mDialogView.findViewById<TextView>(R.id.id_tv_dialog_content_trip).text =
......@@ -722,4 +724,74 @@ object DialogUtils {
mDialog.setCancelable(false)
mDialog.show()
}
fun showViewInfo(context: Activity?, string: String?, listener: View.OnClickListener) {
if (context == null) return
val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_video_info,
context,
mDialog,
0,
Gravity.CENTER
)
val tv_get_reward = mDialogView.findViewById<TextView>(R.id.id_tv_get_reward)
mDialogView.findViewById<TextView>(R.id.id_tv_content).text = string
mDialogView.findViewById<TextView>(R.id.id_tv_get_reward).setOnClickListener {
mDialog?.dismiss()
listener.onClick(it)
}
tv_get_reward?.animation =
AnimationUtils.loadAnimation(context, R.anim.button_scale_anim)
mDialogView.findViewById<ImageView>(R.id.id_img_close_dialog).setOnClickListener {
mDialog.dismiss()
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
}
fun showGetReward(
context: Activity?,
count: Int?,
string: String?,
listener: View.OnClickListener,
listener2: View.OnClickListener
) {
if (context == null) return
val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_get_reward,
context,
mDialog,
0,
Gravity.CENTER
)
val id_tv_left = mDialogView.findViewById<TextView>(R.id.id_tv_left)
val id_tv_right = mDialogView.findViewById<TextView>(R.id.id_tv_right)
id_tv_right?.animation =
AnimationUtils.loadAnimation(context, R.anim.button_scale_anim)
mDialogView.findViewById<TextView>(R.id.id_tv_content).text = string
id_tv_left.setOnClickListener {
listener.onClick(it)
}
id_tv_right.setOnClickListener {
mDialog.dismiss()
listener2.onClick(it)
}
mDialogView.findViewById<ImageView>(R.id.id_img_close_dialog).setOnClickListener {
mDialog.dismiss()
}
if (count!! > 0) {
id_tv_right.visibility = View.VISIBLE
} else {
id_tv_right.visibility = View.GONE
}
mDialog.setCanceledOnTouchOutside(true)
mDialog.setCancelable(true)
mDialog.show()
}
}
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_ccccc_r15.xml 0 → 100644
View file @ 9d85929d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/color_bbbbbb" />
<corners android:radius="15dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_free_coupon.xml 0 → 100644
View file @ 9d85929d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</LinearLayout>
moduleMain/src/main/res/layout/activity_layout_recharge.xml
View file @ 9d85929d
......@@ -370,6 +370,13 @@
android:textColor="#F8E8CC"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_test"
android:layout_width="100dp"
android:layout_height="100dp"
android:gravity="center"
android:visibility="gone"
android:text="测试"/>
</LinearLayout>
<RelativeLayout
......
moduleMain/src/main/res/layout/activity_layout_setting.xml
View file @ 9d85929d
......@@ -79,32 +79,34 @@
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:text="手机号码" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="手机号码"
android:textColor="@color/color_333333"
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/color_999999"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:id="@+id/id_tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/color_999999"
android:textSize="14sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EBEBEB" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
......@@ -115,9 +117,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="用户ID"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:text="用户ID" />
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_id"
......@@ -125,14 +127,16 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text=""
android:textColor="@color/color_999999"
android:textSize="14sp"
android:text="" />
android:textSize="14sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EBEBEB" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
......@@ -143,9 +147,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="版本"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:text="版本" />
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_version_code"
......@@ -153,25 +157,53 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="v1.0"
android:textColor="@color/color_999999"
android:textSize="14sp"
android:text="v1.0" />
android:textSize="14sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EBEBEB" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="个性化广告"
android:textColor="@color/color_333333"
android:textSize="16sp" />
<ImageView
android:id="@+id/id_img_ad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_kai" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_tuichui_denglu"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_alignParentBottom="true"
android:gravity="center"
android:background="@color/white">
android:background="@color/white"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退出登录"
android:textSize="16sp"
android:textColor="@color/color_333333"/>
android:textColor="@color/color_333333"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
moduleMain/src/main/res/layout/dialog_layout_get_reward.xml 0 → 100644
View file @ 9d85929d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/shape_ffffff_r10"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/id_tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:gravity="center"
android:textColor="@color/color_333333"
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_right"
android:layout_width="250dp"
android:layout_height="40dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shape_f25e47_r15"
android:gravity="center"
android:text="立即领取"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
android:visibility="gone"
android:gravity="center">
<TextView
android:id="@+id/id_tv_left"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shape_ccccc_r15"
android:gravity="center"
android:text="查看话费券"
android:textColor="@color/color_333333"
android:visibility="gone"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/id_img_close_dialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:src="@drawable/icon_close_youhuiquan" />
</LinearLayout>
moduleMain/src/main/res/layout/dialog_layout_video_info.xml 0 → 100644
View file @ 9d85929d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/shape_ffffff_r10"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/id_tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:gravity="center"
android:textColor="@color/color_333333"
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_get_reward"
android:layout_width="250dp"
android:layout_height="40dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shape_f25e47_r15"
android:gravity="center"
android:text="立即领取"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/id_img_close_dialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:src="@drawable/icon_close_youhuiquan" />
</LinearLayout>
moduleZxAd/src/main/java/com/zx/ad/platform/csj/CSJAdManager.kt
View file @ 9d85929d
......@@ -237,8 +237,8 @@ object CSJAdManager {
fun loadRewardVideoAd(context: Context, entity: NewsEntity, loadCallBack: AdLoadCallBack) {
mTTAdNative = TTAdManagerHolder.get().createAdNative(context)
var adSlot = AdSlot.Builder()
// .setCodeId(entity.codeId)
.setCodeId("950070471")
.setCodeId(entity.codeId)
// .setCodeId("950127903")
.setExpressViewAcceptedSize(500f, 500f)
.setOrientation(TTAdConstant.VERTICAL) //必填参数，期望视频的播放方向：TTAdConstant.HORIZONTAL 或 TTAdConstant.VERTICAL
.setAdLoadType(TTAdLoadType.UNKNOWN)//推荐使用，用于标注此次的广告请求用途为预加载（当做缓存）还是实时加载，方便后续为开发者优化相关策略
......@@ -247,6 +247,7 @@ object CSJAdManager {
mTTAdNative?.loadRewardVideoAd(adSlot, object : TTAdNative.RewardVideoAdListener {
override fun onError(p0: Int, p1: String?) {
AdEventUtils.onEventPullFail(entity)
Log.e("MXL","loadRewardVideoAdError:"+p1)
loadCallBack.OnAdLoadFail("CSJ RewardVideoAd error p0:${p0} p1:${p1}")
}
......@@ -306,6 +307,7 @@ object CSJAdManager {
override fun onVideoError() {
AdEventUtils.onEventShowFail(entity)
LogUtils.d("onVideoError")
Log.e("MXL","onVideoError")
listener.onRewardVideoAdError("Csj RewardVideoAd PlayError")
}
......
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