1

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -3,6 +3,7 @@ package com.zxhl.cms.common;
 import com.zxhl.cms.AppContext;
 import com.zxhl.cms.R;
 
+import static com.zxhl.cms.common.NetConfig.Environment.DEV;
 import static com.zxhl.cms.common.NetConfig.Environment.PRODUCT;
 
 /**

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

@@ -292,11 +292,16 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
     }
 
     override fun setPayList(result: MemberEntity) {
+        for(i in result?.goodsList!!){
+            if(i.originalPrice.equals("50")){
+
+            }
+        }
         mAdapter?.clear()
         mAdapter?.appendToList(result?.goodsList)
         mAdapter?.notifyDataSetChanged()
         if (!result.goodsList.isNullOrEmpty()) {
-            if (result.goodsList!!.size >= 3) {
+            if (result.goodsList!!.size >= 0) {
                 useCoupn(0, 0)
             }
         }

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

@@ -78,6 +78,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
             }
 
             override fun onError(errorMsg: String?) {
+                Log.e("MXL","MSG:"+errorMsg)
                 jumpMainPage()
             }
         })

moduleMain/src/main/java/com/zxbw/modulemain/view/DialogUtils.kt

 package com.zxbw.modulemain.view
 
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
 import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
 import android.view.Gravity
 import android.view.View
-import android.widget.*
+import android.view.animation.AccelerateInterpolator
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -18,8 +25,10 @@ import com.zxbw.modulemain.box.adapter.SelectBoxAdapter
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.qy.CouponsEntity
-import com.zxhl.cms.utils.*
-import java.util.*
+import com.zxhl.cms.utils.AdCallback
+import com.zxhl.cms.utils.EventUtils
+import com.zxhl.cms.utils.PhoneUtils
+import com.zxhl.cms.utils.Utils
 
 
 object DialogUtils {
@@ -544,6 +553,7 @@ object DialogUtils {
         mDialog.setCancelable(false)
         mDialog.show()
     }
+
     //话费券提示
     fun showifshowCoup(
         context: Activity,
@@ -560,20 +570,20 @@ object DialogUtils {
                 0,
                 Gravity.CENTER
             )
-        var fiveNums:Int=0
-        var tenNUms:Int=0
-        for(i in result!!){
-            if(i.amount.equals("5.0")){
+        var fiveNums: Int = 0
+        var tenNUms: Int = 0
+        for (i in result!!) {
+            if (i.amount.equals("5.0")) {
                 fiveNums++
             }
-            if(i.amount.equals("10.0")){
+            if (i.amount.equals("10.0")) {
                 tenNUms++
             }
         }
         val tenTvnums = mDialogView.findViewById<TextView>(R.id.id_tv_ten_nums)
         val fiveTvnums = mDialogView.findViewById<TextView>(R.id.id_five_ten_nums)
-        tenTvnums.text="x${tenNUms}"
-        fiveTvnums.text="x${fiveNums}"
+        tenTvnums.text = "x${tenNUms}"
+        fiveTvnums.text = "x${fiveNums}"
         mDialogView.findViewById<ImageView>(R.id.id_img_close_dialog).setOnClickListener {
             mDialog.dismiss()
         }
@@ -587,4 +597,76 @@ object DialogUtils {
         mDialog.show()
         SettingPreference.setShowCoups("1")
     }
+
+    //提现弹窗
+    fun showWithDraw(
+        context: Activity,
+        listener: View.OnClickListener
+    ) {
+        if (context.isDestroyed) return
+        val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_layout_with_draw,
+                context,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+
+        val id_img_one_front = mDialogView.findViewById<ImageView>(R.id.id_img_one_front)
+        val id_img_one_no_have = mDialogView.findViewById<ImageView>(R.id.id_img_one_no_have)
+        val id_ll_one_back = mDialogView.findViewById<LinearLayout>(R.id.id_ll_one_back)
+        val id_img_two_front = mDialogView.findViewById<ImageView>(R.id.id_img_two_front)
+        val id_img_two_no_have = mDialogView.findViewById<ImageView>(R.id.id_img_two_no_have)
+        val id_ll_two_back = mDialogView.findViewById<LinearLayout>(R.id.id_ll_two_back)
+        val id_img_three_front = mDialogView.findViewById<ImageView>(R.id.id_img_three_front)
+        val id_img_three_no_have = mDialogView.findViewById<ImageView>(R.id.id_img_three_no_have)
+        val id_ll_three_back = mDialogView.findViewById<LinearLayout>(R.id.id_ll_three_back)
+        val id_img_four_front = mDialogView.findViewById<ImageView>(R.id.id_img_four_front)
+        val id_img_four_no_have = mDialogView.findViewById<ImageView>(R.id.id_img_four_no_have)
+        val id_ll_four_back = mDialogView.findViewById<LinearLayout>(R.id.id_ll_four_back)
+        mDialogView.findViewById<ImageView>(R.id.id_img_close_dialog).setOnClickListener {
+            mDialog.dismiss()
+        }
+        id_img_one_front?.setOnClickListener {
+            flipAnimation(id_img_one_front, id_ll_one_back)
+        }
+        id_img_two_front?.setOnClickListener {
+            flipAnimation(id_img_two_front, id_ll_two_back)
+        }
+        id_img_three_front?.setOnClickListener {
+            flipAnimation(id_img_three_front, id_ll_three_back)
+        }
+        id_img_four_front?.setOnClickListener {
+            flipAnimation(id_img_four_front, id_ll_four_back)
+        }
+        mDialog.setCanceledOnTouchOutside(false)
+        mDialog.setCancelable(false)
+        mDialog.show()
+    }
+
+    fun flipAnimation(imageView: ImageView, layout: LinearLayout) {
+//        if (imageView.getVisibility() == View.GONE) {
+//            visibletext = textview2;
+//            invisibletext = textview1;
+//        } else {
+//            invisibletext = textview2;
+//            visibletext = textview1;
+//        }
+        var visToInvis = ObjectAnimator.ofFloat(imageView, "rotationY", 0f, 90f)
+        visToInvis.setDuration(500)
+        visToInvis.interpolator = AccelerateInterpolator()
+        var invisToVis = ObjectAnimator.ofFloat(layout, "rotationY", -90f, 0f)
+        invisToVis.setDuration(500)
+        invisToVis.interpolator = AccelerateInterpolator()
+        visToInvis?.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator?) {
+                imageView.setVisibility(View.GONE)
+                invisToVis.start()
+                layout.setVisibility(View.VISIBLE)
+            }
+        })
+        visToInvis?.start()
+    }
 }
\ No newline at end of file