Merge remote-tracking branch 'origin/master'

moduleMain/src/main/java/com/zxbw/modulemain/activity/BuyMemberActivity.kt

@@ -4,6 +4,7 @@ import android.view.View
 import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_layout_buy_vip.*
 
 class BuyMemberActivity : BaseActivity() {
@@ -24,5 +25,8 @@ class BuyMemberActivity : BaseActivity() {
         id_img_close?.setOnClickListener {
             finish()
         }
+        id_rl_buy_vip?.setOnClickListener {
+            JumpUtils.MemberOrderJump()
+        }
     }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt

@@ -13,6 +13,7 @@ import com.zxbw.modulemain.contract.FlashSaleContract
 import com.zxbw.modulemain.presenter.FlashSalePresenter
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.qy.SkillEntity
 import com.zxhl.cms.net.model.qy.SkillGoodsEntity
 import com.zxhl.cms.net.model.qy.ToSkillInfoEntity
@@ -70,9 +71,9 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
         mTimeAdapter?.clear()
         mTimeAdapter?.appendToList(result)
         mTimeAdapter?.notifyDataSetChanged()
-        if(!result.isNullOrEmpty()){
-            for(i in result.indices){
-                if(TextUtils.equals(result[i].status,"1")){
+        if (!result.isNullOrEmpty()) {
+            for (i in result.indices) {
+                if (TextUtils.equals(result[i].status, "1")) {
                     mTimeAdapter?.setPosition(i)
                     durationId = result?.get(i)?.id
                     getGoodsList()
@@ -81,7 +82,6 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
         }
 
 
-
     }
 
     override fun setSkillListResult(result: List<SkillGoodsEntity>?) {
@@ -93,11 +93,18 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
     override fun toskill(boolean: Boolean, result: ToSkillInfoEntity?) {
         mPresenter?.getSkillGoodsList(durationId)
         // JumpUtils.ToPaySkillJump()
-        val intent = Intent(this, ToPaySkillGoodsActivity::class.java)
-        intent.putExtra("skillgoods", skillGoodsEntity)
-        startActivity(intent)
-        if (boolean) {
 
+        if (boolean) {
+            val user = SettingPreference.getUserInfoData()
+            if (user.member) {
+                val intent = Intent(this, ToPaySkillGoodsActivity::class.java)
+                intent.putExtra("skillgoods", skillGoodsEntity)
+                startActivity(intent)
+            } else {
+                val intent = Intent(this, SkillPayActivity::class.java)
+                intent.putExtra("skillgoods", skillGoodsEntity)
+                startActivity(intent)
+            }
         }
     }
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt

@@ -46,11 +46,11 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
         holder.id_tv_sale_price?.text="${bean.skillPrice}"
         holder.id_tv_yuanjia?.text="${bean.card?.originPrice}"
         holder.id_tv_yuanjia?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线
-        holder.id_ll_item?.setOnClickListener {
-            val intent = Intent(mContext, SkillPayActivity::class.java)
-            intent.putExtra("skillgoods", bean)
-            mContext?.startActivity(intent)
-        }
+//        holder.id_ll_item?.setOnClickListener {
+//            val intent = Intent(mContext, SkillPayActivity::class.java)
+//            intent.putExtra("skillgoods", bean)
+//            mContext?.startActivity(intent)
+//        }
         holder.id_tv_qianggou?.setOnClickListener {
             listener.onItemClick(it,position,bean)
         }

moduleMain/src/main/java/com/zxbw/modulemain/fragment/UserCenterFragment.kt

@@ -30,6 +30,9 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
         id_ll_member?.setOnClickListener {
             //JumpUtils.CardVoucherJump("猫眼")
         }
+        id_tv_kaitong?.setOnClickListener {
+            JumpUtils.MemberOrderJump()
+        }
         id_img_setting?.setOnClickListener {
             JumpUtils.SettingJump()
         }

moduleMain/src/main/res/layout/activity_layout_buy_vip.xml

@@ -78,6 +78,7 @@
     </RelativeLayout>
 
     <RelativeLayout
+        android:id="@+id/id_rl_buy_vip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"