Skip to content

M
magicbox
Commit 9ecfede9 authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：调整新人魔盒
[实现方案] ：
parent 8f9f7ef7
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 80 deletions
app/src/main/java/com/zhangxin/magicbox/activity/MainActivity.java
View file @ 9ecfede9
......@@ -233,12 +233,14 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
} else {
DiscountDialog.INSTANCE.showDiscountDialog(mActivity);
}
}else {
exitActivity();
}
}
@Override
public void onFailure(Throwable e, String code, String errorMsg) {
exitActivity();
}
});
}
......
cms/src/main/java/com/zxhl/cms/googlepay/GooglePayHelper.kt
View file @ 9ecfede9
......@@ -583,6 +583,7 @@ class GooglePayHelper {
EventUtils.onEvent("GooglePayGetOrderIdE", "获取订单号_成功")
var sku = goodsId.replace("-", "_")
Log.e(TAG,"SKU${sku}")
purchase("xymh_$sku", result.outTradeNo ?: "")
} else {
......
cms/src/main/java/com/zxhl/cms/pay/PayAdapter.kt
View file @ 9ecfede9
......@@ -88,7 +88,7 @@ class PayAdapter : BaseRecyclerAdapter<MemberEntity.ProductDetail, PayAdapter.Me
// holder.mTitle.text = data.name
holder.mPrice.text = data.title
holder.mPriceMoney.text =
AppContext.get().resources.getString(R.string.box_detail_open_box_money_unit) + data.title
AppContext.get().resources.getString(R.string.box_detail_open_box_money_unit) + data.name
// if (pos == 2) {
// holder.mTips.visibility = View.VISIBLE
// } else {
......
cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt
View file @ 9ecfede9
......@@ -17,13 +17,13 @@ import java.util.*
class WeChatUtils {
private var callBack: WeChatLoginSuccessCallBall
private var callBack: WeChatLoginSuccessCallBall?
private var isLogin: Boolean? = false
private var mContext: Context? = null
private var lottery: String? = ""
constructor(context: Context, mCallBack: WeChatLoginSuccessCallBall) : super() {
constructor(context: Context, mCallBack: WeChatLoginSuccessCallBall?) : super() {
mContext = context
this.callBack = mCallBack
......@@ -130,21 +130,21 @@ class WeChatUtils {
fun bindWx(accesstoken: String, opid: String, str: String) {
//执行微信绑定
//成功后调
ApiClient.homeApi.bindWx(opid, accesstoken)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<WxBindEntity>() {
override fun onSuccess(result: WxBindEntity?) {
SettingPreference.saveToken(result?.token)
Log.e("MXL", "微信登录成功")
// getShareCon tent(mContext)
callBack.loginSuccess(lottery)
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
callBack.loginSuccess(lottery)
}
})
// ApiClient.homeApi.bindWx(opid, accesstoken)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<WxBindEntity>() {
// override fun onSuccess(result: WxBindEntity?) {
// SettingPreference.saveToken(result?.token)
// Log.e("MXL", "微信登录成功")
// // getShareCon tent(mContext)
// callBack.loginSuccess(lottery)
// }
//
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// callBack.loginSuccess(lottery)
// }
//
// })
}
......@@ -176,24 +176,24 @@ class WeChatUtils {
}
fun bindFaceBookLogin(userId: String?, userName: String?, picture: String?) {
ApiClient.homeApi.authFaceBookLogin(userId, userName, picture)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<WxBindEntity>() {
override fun onSuccess(result: WxBindEntity?) {
SettingPreference.saveToken(result?.token)
UserDataUtils.updateUserInfo(null)
Constant.Switch.isLogin = true
Log.e("MXL", "FaceBook登录成功")
// getShareCon tent(mContext)
// callBack.loginSuccess(lottery)
callBack.loginSuccess("")
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// callBack.loginSuccess(lottery)
}
})
// ApiClient.homeApi.authFaceBookLogin(userId, userName, picture)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<WxBindEntity>() {
// override fun onSuccess(result: WxBindEntity?) {
// SettingPreference.saveToken(result?.token)
// UserDataUtils.updateUserInfo(null)
// Constant.Switch.isLogin = true
// Log.e("MXL", "FaceBook登录成功")
// // getShareCon tent(mContext)
// // callBack.loginSuccess(lottery)
// callBack.loginSuccess("")
// }
//
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// // callBack.loginSuccess(lottery)
// }
//
// })
}
fun GoogleLogin() {
......@@ -241,24 +241,24 @@ class WeChatUtils {
}
fun bindGoogle(userId: String?, userName: String?, picture: String?) {
ApiClient.homeApi.authGoogleLogin(userId, userName, picture)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<WxBindEntity>() {
override fun onSuccess(result: WxBindEntity?) {
SettingPreference.saveToken(result?.token)
UserDataUtils.updateUserInfo(null)
Constant.Switch.isLogin = true
Log.e("MXL", "谷歌登录成功")
// getShareCon tent(mContext)
// callBack.loginSuccess(lottery)
callBack.loginSuccess("")
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// callBack.loginSuccess(lottery)
}
})
// ApiClient.homeApi.authGoogleLogin(userId, userName, picture)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<WxBindEntity>() {
// override fun onSuccess(result: WxBindEntity?) {
// SettingPreference.saveToken(result?.token)
// UserDataUtils.updateUserInfo(null)
// Constant.Switch.isLogin = true
// Log.e("MXL", "谷歌登录成功")
// // getShareCon tent(mContext)
// // callBack.loginSuccess(lottery)
// callBack.loginSuccess("")
// }
//
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// // callBack.loginSuccess(lottery)
// }
//
// })
}
}
\ No newline at end of file
cms/src/main/res/values/strings.xml
View file @ 9ecfede9
......@@ -14,7 +14,7 @@
<string name="wait_ing">loading</string>
<string name="wait_ing2">Loading</string>
<string name="get_sms_code_success">验证码已发送</string>
<string name="nav_back_again_finish">再按一次退出程序</string>
<string name="nav_back_again_finish">Press back again to exit</string>
<string name="album_not_available">请检查系统相册是否可用</string>
......
moduleMain/src/main/java/com/zxhl/main/page/activity/ThirdpartyLoginActivity.kt
View file @ 9ecfede9
......@@ -8,6 +8,7 @@ import com.facebook.login.LoginConfiguration
import com.facebook.login.LoginManager
import com.facebook.login.LoginResult
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.Constant
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.utils.*
import com.zxhl.cms.widget.LoadingDialog
......@@ -59,6 +60,7 @@ class ThirdpartyLoginActivity : BaseActivity(), WeChatLoginSuccessCallBall {
googleLogin?.googleLogin(object : GoogleLoginUtil.LoginCallBack {
override fun onLoginSuccess() {
runOnUiThread {
Constant.NewUserBox.isRefreshHomeList = true
mLoading?.setResult(true, "login success", 0)
finish()
}
......@@ -80,6 +82,7 @@ class ThirdpartyLoginActivity : BaseActivity(), WeChatLoginSuccessCallBall {
mLoading?.show()
faceBookLogin?.faceBookLogin(object : FaceBookLoginUtil.LoginCallBack {
override fun onLoginSuccess() {
Constant.NewUserBox.isRefreshHomeList = true
runOnUiThread {
mLoading?.setResult(true, "login success", 0)
finish()
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
View file @ 9ecfede9
......@@ -75,12 +75,12 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
holder.id_tv_new_people_price?.visibility = View.GONE
if (bean.activitiesType == 1) {
holder.id_img_new_people?.visibility = View.VISIBLE
holder.id_img_new_people?.setImageResource(R.drawable.biaoqian_xianshi)
holder.id_img_new_people?.text="Limited-time offer"
holder.item_tv_price?.text = bean.onePriceStr
holder.id_tv_one_lottery?.text = "Open"
} else if (bean.activitiesType == 2) {
holder.id_img_new_people?.visibility = View.VISIBLE
holder.id_img_new_people?.setImageResource(R.drawable.biaoqian_baozhang)
holder.id_img_new_people?.text="Buy one get one free"
holder.item_tv_price?.text = bean.activitiesPrice
// holder.id_tv_one_lottery?.text = "买一送一"
} else {
......@@ -92,12 +92,12 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
holder.id_tv_one_lottery?.text = "Open"
holder.item_tv_price?.text = bean.onePriceStr
holder.id_img_new_people?.visibility = View.VISIBLE
holder.id_img_new_people?.setImageResource(R.drawable.biaoqianxinren)
holder.id_img_new_people?.text="Limited-offer for new users"
holder.id_rl_new_people?.visibility = View.VISIBLE
holder.id_tv_new_people_price?.visibility = View.VISIBLE
holder.id_tv_new_people_price?.text = "${bean.newUserPrice}"
holder.id_tv_new_people_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG)
holder.id_new_user_box_tips?.text = "New user $${bean.discount} discount"
holder.id_tv_new_people_price?.paint?.flags = Paint.STRIKE_THRU_TEXT_FLAG
holder.id_new_user_box_tips?.text = " New user ${bean.discount} lucky coin discount"
}
holder.item_img_goos?.setLoadImageUrl(bean.mainImage, false)
// holder.item_img_1?.setLoadImageUrl(bean.imageList2?.get(0), false)
......@@ -173,7 +173,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
var id_tv_new_people_price: TextView?
var id_new_user_box_tips: TextView?
var id_rl_new_people: RelativeLayout?
var id_img_new_people: ImageView?
var id_img_new_people: TextView?
constructor(
itemView: View
......@@ -190,7 +190,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
item_img_goos = itemView.findViewById<RecycleImageView>(R.id.id_img_goods)
item_rl_goods = itemView.findViewById<RecyclerView>(R.id.id_rl_goods)
item_ll = itemView.findViewById<RelativeLayout>(R.id.id_ll_item)
id_img_new_people = itemView.findViewById<ImageView>(R.id.id_img_new_people)
id_img_new_people = itemView.findViewById<TextView>(R.id.id_img_new_people)
}
}
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/PickUpAdapter.kt
View file @ 9ecfede9
......@@ -105,11 +105,12 @@ class PickUpAdapter : BaseRecyclerAdapter<DepotEntity, RecyclerView.ViewHolder>
mContext?.startActivity(intent)
}
if (bean.boxId.equals("-2")) {
holder.item_img_xinren?.visibility = View.VISIBLE
} else {
holder.item_img_xinren?.visibility = View.GONE
}
// if (bean.boxId.equals("-2")) {
// holder.item_img_xinren?.visibility = View.VISIBLE
// } else {
// holder.item_img_xinren?.visibility = View.GONE
// }
if (isAllSelect) {
holder.item_img_choose?.isChecked = true
}
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/AllFragment.kt
View file @ 9ecfede9
......@@ -83,6 +83,14 @@ class AllFragment : BaseFragment, HomeContract.View,
})
}
override fun onResume() {
super.onResume()
if (Constant.NewUserBox.isRefreshHomeList) {
mPresenter?.getHomeBoxList(title, true)
Constant.NewUserBox.isRefreshHomeList = false
}
}
override fun lazyLoad() {
super.lazyLoad()
Log.d("lazyLoad", "isInitial:" + isInitial + " isVisible:" + isVisible)
......@@ -156,6 +164,18 @@ class AllFragment : BaseFragment, HomeContract.View,
fun oneLottery(data: HomeBoxListEntity?) {
ownCoin = SettingPreference.getUserCoinNum().toDoubleOrNull()
if (ownCoin?.compareTo(data?.onePrice!!)!! >= 0) {
BoxResultDialog.setDialogDismissCallback(object : BoxResultDialog.DialogDismissCallback {
override fun onDismiss() {
}
override fun onLotterySuccess() {
if (data?.boxId?:"" == Constant.NewUserBox.newUserBoxId&&!Constant.NewUserBox.newUserBoxId.isNullOrEmpty()){
mPresenter?.getHomeBoxList(title, true)
Constant.NewUserBox.isRefreshHomeList = false
}
}
})
BoxResultDialog.showOneLotteryResult(
mActivity,
data?.boxId ?: "",
......
moduleMain/src/main/java/com/zxhl/main/page/fragment/HomeFragment.kt
View file @ 9ecfede9
......@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CircleCrop
import com.bumptech.glide.request.RequestOptions
import com.zxhl.cms.common.Constant
import com.zxhl.cms.common.FragmentAdapter
import com.zxhl.cms.common.NetConfig
import com.zxhl.cms.common.base.BaseFragment
......@@ -20,6 +21,7 @@ import com.zxhl.cms.utils.AdCallback
import com.zxhl.cms.utils.JumpUtils
import com.zxhl.cms.utils.UpdateCallback
import com.zxhl.cms.utils.UserDataUtils.updateUserInfo
import com.zxhl.cms.utils.WeChatUtils
import com.zxhl.main.R
import com.zxhl.main.page.contract.NewPeopleContract
import com.zxhl.main.page.presenter.NewPeoplePresenter
......@@ -73,6 +75,7 @@ class HomeFragment : BaseFragment(), NewPeopleContract.View, UpdateCallback {
}
}
private var wechatutil: WeChatUtils? = null
override fun init(view: View?) {
//showGuide()
......@@ -109,7 +112,7 @@ class HomeFragment : BaseFragment(), NewPeopleContract.View, UpdateCallback {
id_img_open_box?.animation =
AnimationUtils.loadAnimation(context, R.anim.scale_anim)
WeChatUtils(mActivity, null).isWechatLogin(null)
// UpdateUserInfo()
}
......@@ -242,9 +245,16 @@ class HomeFragment : BaseFragment(), NewPeopleContract.View, UpdateCallback {
if (isPause && isVisible) {
updateUserInfo(AdCallback { code, result ->
// UpdateUserInfo()
CheckUpate(false)
})
}else if (Constant.NewUserBox.isRefreshHomeList){
updateUserInfo(AdCallback { code, result ->
// UpdateUserInfo()
CheckUpate(false)
})
}
isPause = false
}
override fun CheckUpate(boolean: Boolean) {
......
moduleMain/src/main/java/com/zxhl/main/page/view/BoxResultDialog.kt
View file @ 9ecfede9
......@@ -91,7 +91,7 @@ object BoxResultDialog : LotteryContract.View {
if (!isFast()) {
return
}
if (boxId == "" || onePrice == 0.0) {
if (boxId == "") {
return
}
EventUtils.onEvent("OneLotteryClick")
......
moduleMain/src/main/java/com/zxhl/main/page/view/FreeGoodsDialog.kt
View file @ 9ecfede9
......@@ -2,6 +2,7 @@ package com.zxhl.main.page.view
import android.animation.ValueAnimator
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.util.Log
......@@ -64,11 +65,23 @@ object FreeGoodsDialog {
tv_yi_fa?.animation =
AnimationUtils.loadAnimation(context, R.anim.button_scale_anim)
dialog_lottie_view?.setOnClickListener {
JumpUtils.lotteryBoxJump("-2", Constant.Key.ONE_LOTTERY, "0")
// JumpUtils.lotteryBoxJump("-2", Constant.Key.ONE_LOTTERY, "0")
mDialog?.dismiss()
if (Constant.Switch.isLogin) {
BoxResultDialog.showOneLotteryResult(
context as Activity,
"-2",
0.0,
0.0,
0
)
} else {
JumpUtils.ThirdPardLoginJump()
}
}
mDialog?.setOnDismissListener {
Log.d("MXL","我被关闭了")
Log.d("MXL", "我被关闭了")
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
......
moduleMain/src/main/java/com/zxhl/main/page/view/RecycleDialog.kt
View file @ 9ecfede9
......@@ -89,7 +89,7 @@ object RecycleDialog : RecoverPopupContract.View {
mDialogView?.findViewById<ImageView>(R.id.id_img_dialog_close).setOnClickListener {
mDialog?.dismiss()
}
val df = DecimalFormat("#.00")
val df = DecimalFormat("#0.00")
if (type.equals(Constant.Key.ONE_LOTTERY)) {
tv_recycle_price?.text = "${df.format(recoverPrice.toDoubleOrNull())}"
......
moduleMain/src/main/res/layout/activity_layout_order_detail.xml
View file @ 9ecfede9
......@@ -69,7 +69,7 @@
android:layout_marginLeft="15dp"
android:drawableLeft="@drawable/icon_add"
android:drawablePadding="5dp"
android:text="请填写收货人信息"
android:text="Please input your delivery address"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......
moduleMain/src/main/res/layout/dialog_layout_box_result.xml
View file @ 9ecfede9
......@@ -237,7 +237,7 @@
android:layout_marginLeft="7dp"
android:layout_marginTop="10dp"
android:layout_marginRight="7dp"
android:layout_marginBottom="30dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
......
moduleMain/src/main/res/layout/fragment_layout_other.xml
View file @ 9ecfede9
......@@ -71,7 +71,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:layout_marginBottom="200dp"
android:text="到我的底线咯，往上翻"
android:text="@string/box_detail_open_box_bottom_desc"
android:textColor="@color/color_999999"
android:textSize="13sp" />
......
moduleMain/src/main/res/layout/item_layout_new_box.xml
View file @ 9ecfede9
......@@ -141,7 +141,6 @@
android:layout_height="wrap_content"
android:textColor="@color/color_999999"
android:textSize="14sp"
android:drawableLeft="@drawable/icon_jinbi"
android:drawablePadding="5dp"/>
<TextView
......@@ -210,11 +209,17 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<ImageView
<TextView
android:id="@+id/id_img_new_people"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="29dp"
android:layout_marginLeft="2dp"
android:src="@drawable/biaoqianxinren"
android:text="Limited-time offer"
android:textColor="@color/white"
android:paddingTop="2dp"
android:textStyle="bold"
android:gravity="center_horizontal"
android:background="@drawable/icon_box_item_label"
android:visibility="visible" />
</RelativeLayout>
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