Commit c2c199f6 authored by jyx's avatar jyx

我的页面添加信息流

parent 81eecdef
...@@ -12,8 +12,8 @@ android { ...@@ -12,8 +12,8 @@ android {
applicationId "com.duben.miaoquplaylet" applicationId "com.duben.miaoquplaylet"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 2 versionCode 10
versionName "1.0.1" versionName "1.0.9"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
...@@ -66,6 +66,7 @@ android { ...@@ -66,6 +66,7 @@ android {
buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE
buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
buildConfigField "String", "GROMORE_MYEXPRESS_CODE", GROMORE_MYEXPRESS_CODE
buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
...@@ -89,6 +90,7 @@ android { ...@@ -89,6 +90,7 @@ android {
buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_CODE
buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE buildConfigField "String", "GROMORE_EXPRESS_CODE", GROMORE_EXPRESS_CODE
buildConfigField "String", "GROMORE_MYEXPRESS_CODE", GROMORE_MYEXPRESS_CODE
buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE buildConfigField "String", "GROMORE_BANNER_CODE", GROMORE_BANNER_CODE
buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY buildConfigField "String", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
......
...@@ -138,7 +138,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -138,7 +138,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
if (isFinishing) return if (isFinishing) return
// false-登录 true-绑定手机号 // false-登录 true-绑定手机号
showToast("登录成功") showToast("绑定成功")
hideLoading() hideLoading()
...@@ -158,13 +158,8 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -158,13 +158,8 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
} }
private fun initView() { private fun initView() {
if (TextUtils.equals(enterType, "vip")) {
tv_title.text = "绑定手机号" tv_title.text = "绑定手机号"
tvLoginNext.text = "立即绑定" tvLoginNext.text = "立即绑定"
} else {
tv_title.text = "手机号登录"
tvLoginNext.text = "立即登录"
}
iv_left_icon.visibility = View.VISIBLE iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_back) iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
......
...@@ -6,6 +6,7 @@ import android.os.Handler ...@@ -6,6 +6,7 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
import android.widget.FrameLayout
import com.daimajia.androidanimations.library.Techniques import com.daimajia.androidanimations.library.Techniques
import com.daimajia.androidanimations.library.YoYo import com.daimajia.androidanimations.library.YoYo
import com.duben.miaoquplaylet.R import com.duben.miaoquplaylet.R
...@@ -30,6 +31,9 @@ import com.duben.miaoquplaylet.utils.TimeRender ...@@ -30,6 +31,9 @@ import com.duben.miaoquplaylet.utils.TimeRender
import com.duben.miaoquplaylet.utils.rxutil.CommonRxTask import com.duben.miaoquplaylet.utils.rxutil.CommonRxTask
import com.duben.miaoquplaylet.utils.rxutil.RxjavaUtil import com.duben.miaoquplaylet.utils.rxutil.RxjavaUtil
import com.duben.library.utils.nodoubleclick.AntiShake import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.miaoquplaylet.ad.express.ExpressAdCallback
import com.duben.miaoquplaylet.ad.express.MyExpressManager
import com.duben.miaoquplaylet.utils.UIUtils
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
/** /**
...@@ -84,6 +88,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -84,6 +88,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_THREE) { if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_THREE) {
if (AntiShake.check(ll_my_record?.id)) return if (AntiShake.check(ll_my_record?.id)) return
if(userManager.vipFlag){
MyExpressManager.instance.preLoadAd()
showAd()
}
if (!TextUtils.isEmpty(userManager?.userID)) { if (!TextUtils.isEmpty(userManager?.userID)) {
myPresenter.showTurn() myPresenter.showTurn()
myPresenter.getMyInfo() myPresenter.getMyInfo()
...@@ -156,7 +165,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -156,7 +165,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
iv_my_bind.visibility = View.GONE iv_my_bind.visibility = View.GONE
} else { } else {
// 未登录 // 未登录
tv_my_account.text = "登录/注册" tv_my_account.text = "绑定手机号"
iv_my_bind.visibility = View.VISIBLE iv_my_bind.visibility = View.VISIBLE
} }
...@@ -380,4 +389,33 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -380,4 +389,33 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
} }
//----9宫格逻辑--结束--// //----9宫格逻辑--结束--//
private fun showAd() {
MyExpressManager.instance.getAdView(object : ExpressAdCallback {
override fun loadSuccess(adView: FrameLayout?) {
adView?.let {
UIUtils.removeFromParent(it)
fl_ad.removeAllViews()
fl_ad.addView(it)
}
MyExpressManager.instance.preLoadAd()
}
override fun renderSuccess(adView: FrameLayout?): Boolean {
adView?.let {
UIUtils.removeFromParent(it)
fl_ad.removeAllViews()
fl_ad.addView(it)
}
MyExpressManager.instance.preLoadAd()
return false
}
override fun loadFail() {
}
})
}
} }
\ No newline at end of file
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
android:layout_marginRight="40dp" android:layout_marginRight="40dp"
android:background="@drawable/shape_red" android:background="@drawable/shape_red"
android:gravity="center" android:gravity="center"
android:text="立即登录" android:text="绑定手机号"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" /> android:textSize="20sp" />
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="登录/注册" android:text="绑定手机号"
android:textColor="#000000" android:textColor="#000000"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:visibility="gone"
android:background="@mipmap/bg_my_vip" android:background="@mipmap/bg_my_vip"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp"> android:paddingLeft="24dp"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_my_vip" android:id="@+id/tv_my_vip"
...@@ -108,11 +108,11 @@ ...@@ -108,11 +108,11 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_lucky" android:id="@+id/rl_lucky"
android:visibility="gone"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="300dp" android:layout_height="300dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_gravity="center_horizontal"> android:visibility="gone">
<com.duben.miaoquplaylet.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView <com.duben.miaoquplaylet.ui.widgets.luckymonkeypanel.LuckyMonkeyPanelView
android:id="@+id/lucky_panel" android:id="@+id/lucky_panel"
...@@ -141,10 +141,10 @@ ...@@ -141,10 +141,10 @@
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="14dp" android:layout_marginStart="14dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/shape_bg_mobile" android:background="@drawable/shape_bg_mobile"
...@@ -212,14 +212,14 @@ ...@@ -212,14 +212,14 @@
android:background="@color/my_color_gray" /> android:background="@color/my_color_gray" />
<LinearLayout <LinearLayout
android:visibility="gone"
android:id="@+id/ll_my_payrecord" android:id="@+id/ll_my_payrecord"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="15dp"> android:paddingEnd="15dp"
android:visibility="gone">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
...@@ -276,14 +276,14 @@ ...@@ -276,14 +276,14 @@
android:background="@color/my_color_gray" /> android:background="@color/my_color_gray" />
<LinearLayout <LinearLayout
android:visibility="gone"
android:id="@+id/ll_contactus" android:id="@+id/ll_contactus"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="15dp"> android:paddingEnd="15dp"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_contact" android:id="@+id/tv_contact"
...@@ -306,6 +306,13 @@ ...@@ -306,6 +306,13 @@
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<com.duben.miaoquplaylet.ui.widgets.RoundRectLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_write" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
......
...@@ -50,5 +50,6 @@ GROMORE_APP_ID="5418501" ...@@ -50,5 +50,6 @@ GROMORE_APP_ID="5418501"
GROMORE_SPLASH_CODE="102412552" GROMORE_SPLASH_CODE="102412552"
GROMORE_VIDEO_CODE="102412179" GROMORE_VIDEO_CODE="102412179"
GROMORE_EXPRESS_CODE="102412550" GROMORE_EXPRESS_CODE="102412550"
GROMORE_MYEXPRESS_CODE="102424560"
GROMORE_DRAW_CODE="102412837" GROMORE_DRAW_CODE="102412837"
GROMORE_BANNER_CODE="102412551" GROMORE_BANNER_CODE="102412551"
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