Commit 1028e151 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 2659aab4
...@@ -112,12 +112,8 @@ android { ...@@ -112,12 +112,8 @@ android {
productFlavors { productFlavors {
facai {} facai {}
vivo {} xixi_jtc {}
baidu {} baidu {}
oppo {}
huawei {}
xiaomi {}
store360 {}
} }
productFlavors.all { productFlavors.all {
......
...@@ -9,6 +9,8 @@ import android.view.View ...@@ -9,6 +9,8 @@ import android.view.View
import android.widget.FrameLayout 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.library.utils.nodoubleclick.AntiShake
import com.duben.xixiplaylet.MintsApplication
import com.duben.xixiplaylet.R import com.duben.xixiplaylet.R
import com.duben.xixiplaylet.ad.AdManager import com.duben.xixiplaylet.ad.AdManager
import com.duben.xixiplaylet.ad.AdStatusListener import com.duben.xixiplaylet.ad.AdStatusListener
...@@ -28,12 +30,12 @@ import com.duben.xixiplaylet.ui.fragment.base.LazyLoadBaseFragment ...@@ -28,12 +30,12 @@ import com.duben.xixiplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.xixiplaylet.ui.widgets.DialogListener import com.duben.xixiplaylet.ui.widgets.DialogListener
import com.duben.xixiplaylet.ui.widgets.NineContinueDialog import com.duben.xixiplaylet.ui.widgets.NineContinueDialog
import com.duben.xixiplaylet.utils.AppPreferencesManager import com.duben.xixiplaylet.utils.AppPreferencesManager
import com.duben.xixiplaylet.utils.MateUtils.getAppMetaData
import com.duben.xixiplaylet.utils.SpanUtils import com.duben.xixiplaylet.utils.SpanUtils
import com.duben.xixiplaylet.utils.TimeRender import com.duben.xixiplaylet.utils.TimeRender
import com.duben.xixiplaylet.utils.UIUtils import com.duben.xixiplaylet.utils.UIUtils
import com.duben.xixiplaylet.utils.rxutil.CommonRxTask import com.duben.xixiplaylet.utils.rxutil.CommonRxTask
import com.duben.xixiplaylet.utils.rxutil.RxjavaUtil import com.duben.xixiplaylet.utils.rxutil.RxjavaUtil
import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
/** /**
...@@ -89,13 +91,13 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -89,13 +91,13 @@ 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){ if (userManager.vipFlag) {
MyExpressManager.instance.preLoadAd() MyExpressManager.instance.preLoadAd()
showAd() showAd()
} }
if(isTurnLuckyPage){ if (isTurnLuckyPage) {
isTurnLuckyPage=false isTurnLuckyPage = false
clickTurn() clickTurn()
} }
...@@ -105,6 +107,15 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -105,6 +107,15 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
} else { } else {
myPresenter.userLogin() myPresenter.userLogin()
} }
showJtcLayout()
}
}
private fun showJtcLayout() {
val channel = getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
if (TextUtils.equals(channel, "xixi_jtc")) {
} }
} }
...@@ -137,7 +148,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -137,7 +148,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
R.id.ll_my_payrecord -> { R.id.ll_my_payrecord -> {
readyGo(OrderRecordActivity::class.java) readyGo(OrderRecordActivity::class.java)
} }
R.id.btn_action,R.id.rl_lucky -> { R.id.btn_action, R.id.rl_lucky -> {
clickTurn() clickTurn()
} }
} }
...@@ -167,13 +178,16 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -167,13 +178,16 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
// 2-是否有手机号 // 2-是否有手机号
if (!TextUtils.isEmpty(userManager.mobile)) { if (!TextUtils.isEmpty(userManager.mobile)) {
tv_my_account.text = "手机号:" + consumer.mobile.substring(0,3)+"****"+consumer.mobile.substring(consumer.mobile.length-4) tv_my_account.text =
"手机号:" + consumer.mobile.substring(0, 3) + "****" + consumer.mobile.substring(
consumer.mobile.length - 4
)
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
} }
tv_my_id.text = "用户ID:"+consumer.idcode tv_my_id.text = "用户ID:" + consumer.idcode
// 3-vip // 3-vip
if (consumer.expireTime > 0) { if (consumer.expireTime > 0) {
...@@ -212,7 +226,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -212,7 +226,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
myPresenter.showTurn() myPresenter.showTurn()
if (nineShowBean != null) { if (nineShowBean != null) {
if (nineShowBean!!.need - nineShowBean!!.complete-1>0) { if (nineShowBean!!.need - nineShowBean!!.complete - 1 > 0) {
showContinueDialog() showContinueDialog()
} }
} }
...@@ -366,7 +380,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -366,7 +380,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
val luckyFirst = val luckyFirst =
AppPreferencesManager.get().getBoolean(Constant.LUCKY_MY_FIRST, false) AppPreferencesManager.get().getBoolean(Constant.LUCKY_MY_FIRST, false)
if (!luckyFirst) { if (!luckyFirst) {
isTurnLuckyPage=true isTurnLuckyPage = true
AppPreferencesManager.get().put(Constant.LUCKY_MY_FIRST, true) AppPreferencesManager.get().put(Constant.LUCKY_MY_FIRST, true)
val bundle = Bundle() val bundle = Bundle()
bundle.putInt(NineKnowActivity.COMPLETE, nineShowBean!!.complete) bundle.putInt(NineKnowActivity.COMPLETE, nineShowBean!!.complete)
......
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