Commit 81c9697a authored by jyx's avatar jyx

我的页面添加信息流

parent 5ab3729f
......@@ -12,8 +12,8 @@ android {
applicationId "com.duben.xixiplaylet"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 2
versionName "1.0.1"
versionCode 10
versionName "1.0.9"
flavorDimensions "default"
// dex突破65535的限制
......@@ -66,6 +66,7 @@ android {
buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_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", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
......@@ -89,6 +90,7 @@ android {
buildConfigField "String", "GROMORE_VIDEO_CODE", GROMORE_VIDEO_CODE
buildConfigField "String", "GROMORE_DRAW_CODE", GROMORE_DRAW_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", "RELEASE_TALKING_DATA_KEY", RELEASE_TALKING_DATA_KEY
buildConfigField "String", "WEIXIN_APP_PAY_ID", WEIXIN_APP_PAY_ID
......
......@@ -138,7 +138,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
if (isFinishing) return
// false-登录 true-绑定手机号
showToast("登录成功")
showToast("绑定成功")
hideLoading()
......@@ -158,13 +158,8 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
}
private fun initView() {
if (TextUtils.equals(enterType, "vip")) {
tv_title.text = "绑定手机号"
tvLoginNext.text = "立即绑定"
} else {
tv_title.text = "手机号登录"
tvLoginNext.text = "立即登录"
}
tv_title.text = "绑定手机号"
tvLoginNext.text = "立即绑定"
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
......
......@@ -6,6 +6,7 @@ import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.View
import android.widget.FrameLayout
import com.daimajia.androidanimations.library.Techniques
import com.daimajia.androidanimations.library.YoYo
import com.duben.xixiplaylet.R
......@@ -30,6 +31,9 @@ import com.duben.xixiplaylet.utils.TimeRender
import com.duben.xixiplaylet.utils.rxutil.CommonRxTask
import com.duben.xixiplaylet.utils.rxutil.RxjavaUtil
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.xixiplaylet.ad.express.ExpressAdCallback
import com.duben.xixiplaylet.ad.express.MyExpressManager
import com.duben.xixiplaylet.utils.UIUtils
import kotlinx.android.synthetic.main.fragment_main_my.*
/**
......@@ -156,7 +160,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
iv_my_bind.visibility = View.GONE
} else {
// 未登录
tv_my_account.text = "登录/注册"
tv_my_account.text = "绑定手机号"
iv_my_bind.visibility = View.VISIBLE
}
......@@ -380,4 +384,34 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
}
//----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 @@
android:layout_marginRight="40dp"
android:background="@drawable/shape_red"
android:gravity="center"
android:text="立即登录"
android:text="绑定手机号"
android:textColor="@color/white"
android:textSize="20sp" />
......
......@@ -32,7 +32,7 @@
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="20dp"
android:src="@mipmap/ic_my_avat" />
android:src="@mipmap/ic_launcher_main" />
<TextView
android:id="@+id/tv_my_account"
......@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:text="登录/注册"
android:text="绑定手机号"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold" />
......@@ -306,6 +306,13 @@
</LinearLayout>
</FrameLayout>
<com.duben.xixiplaylet.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>
</ScrollView>
......
......@@ -51,6 +51,7 @@ GROMORE_APP_ID="5423461"
GROMORE_SPLASH_CODE="102418768"
GROMORE_VIDEO_CODE="102418861"
GROMORE_EXPRESS_CODE="102419307"
GROMORE_MYEXPRESS_CODE="102418862"
GROMORE_MAIN_EXPRESS_CODE="102413160"
GROMORE_DRAW_CODE="102418862"
GROMORE_BANNER_CODE="102418767"
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