Merge remote-tracking branch 'origin/develop_1.1.0' into develop_1.1.0

app/src/main/java/com/zxhl/shop/activity/MainActivity.java

@@ -190,7 +190,8 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
             }, 1500);
         } else {
             EventUtils.INSTANCE.onEvent("double_exit", "双击退出");
-            closeApp();
+            exitActivity();
+           // closeApp();
         }
     }
 

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

@@ -21,5 +21,8 @@ class AbuoutUsActivity:BaseActivity() {
 
     override fun init() {
         id_tv_version?.text="版本号：V${Constant.Param.vn}"
+        id_img_back?.setOnClickListener {
+            finish()
+        }
     }
 }
\ No newline at end of file

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

@@ -20,8 +20,6 @@ import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.box.AppInEntity
 import com.zxhl.cms.net.model.box.MobileOpEntity
 import com.zxhl.cms.net.model.qy.CouponsEntity
-import com.zxhl.cms.net.model.qy.RightsDetailEntity
-import com.zxhl.cms.net.model.qy.SkillGoodsEntity
 import com.zxhl.cms.net.model.uc.AliPayEntity
 import com.zxhl.cms.net.model.uc.PayResultEntity
 import com.zxhl.cms.net.model.video.MemberEntity
@@ -59,7 +57,7 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity
                 DialogUtils.showFetchAllCard(
                     this,
                     selectPrice.toString(),
-                    null,
+                    couponsentity,
                     mCouponsResult,
                     object : DialogUtils.OnFetchCardListener {
                         override fun onSelectCoupons(coupons: CouponsEntity?) {

moduleMain/src/main/java/com/zxbw/modulemain/contract/HomeContract.kt

 package com.zxbw.modulemain.contract
 
 import com.zxhl.cms.net.model.box.TabEntity
+import com.zxhl.cms.net.model.qy.CouponsEntity
 import com.zxhl.cms.net.model.qy.HomeBannerEntity
 
 /**
@@ -11,10 +12,12 @@ class HomeContract {
     interface View {
         fun setBannerList(result: List<HomeBannerEntity>?)
         fun setTabList(list: List<TabEntity>?)
+        fun setCouponsList(result: List<CouponsEntity>?)
     }
 
     interface Presenter {
         fun getBannerList()
         fun getTabList()
+        fun getFetchCard()
     }
 }
\ No newline at end of file

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

 package com.zxbw.modulemain.fragment
 
 import android.graphics.Color
+import android.util.Log
 import android.view.View
 import androidx.viewpager.widget.ViewPager
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.adapter.HomeBannerAdapter
 import com.zxbw.modulemain.contract.HomeContract
 import com.zxbw.modulemain.presenter.HomePresenter
+import com.zxbw.modulemain.view.DialogUtils
+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
 import com.zxhl.cms.down.UpdateVersionManager
 import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.box.TabEntity
+import com.zxhl.cms.net.model.qy.CouponsEntity
 import com.zxhl.cms.net.model.qy.HomeBannerEntity
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.UpdateCallback
 import com.zxhl.cms.utils.Utils
-import kotlinx.android.synthetic.main.activity_layout_tb_goods_detail.*
 import kotlinx.android.synthetic.main.fragment_layout_home.*
 import me.jessyan.autosize.utils.ScreenUtils
 
@@ -140,7 +143,22 @@ class HomeFragment : BaseFragment(), HomeContract.View, UpdateCallback {
 
     }
 
+    override fun setCouponsList(result: List<CouponsEntity>?) {
+        if(!result.isNullOrEmpty()){
+            DialogUtils.showifshowCoup(mActivity, result, View.OnClickListener {
+                JumpUtils.RechargeJump()
+            })
+        }
+
+    }
+
     override fun CheckUpate(boolean: Boolean) {
+        Log.e("MXL", "更新：" + boolean)
+        if (Constant.Switch.isOpenVip) {
+            if (!boolean) {
+                mPresenter?.getFetchCard()
+            }
+        }
 
     }
 

moduleMain/src/main/java/com/zxbw/modulemain/presenter/HomePresenter.kt

@@ -12,6 +12,7 @@ import com.zxhl.cms.net.RxSchedulers
 import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.callback.BaseObserver
 import com.zxhl.cms.net.model.box.AppInEntity
+import com.zxhl.cms.net.model.qy.CouponsEntity
 import com.zxhl.cms.net.model.qy.HomeBannerEntity
 import com.zxhl.cms.net.model.qy.JgqQyEntity
 import com.zxhl.cms.net.model.qy.TbGoodsEntity
@@ -63,4 +64,18 @@ class HomePresenter : HomeContract.Presenter {
                 }
             })
     }
+
+    override fun getFetchCard() {
+        ApiClient.homeApi.getFetchallCard().compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<List<CouponsEntity>>() {
+                override fun onSuccess(result: List<CouponsEntity>?) {
+                    mView.setCouponsList(result)
+
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+
+                }
+            })
+    }
 }
\ No newline at end of file

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

@@ -545,4 +545,45 @@ object DialogUtils {
         mDialog.show()
     }
 
+    fun showifshowCoup(
+        context: Activity,
+        result: List<CouponsEntity>?,
+        listener: View.OnClickListener
+    ) {
+        if (context.isDestroyed) return
+        val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_layout_if_hava_coups,
+                context,
+                mDialog,
+                0,
+                Gravity.CENTER
+            )
+        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")){
+                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}"
+        mDialogView.findViewById<ImageView>(R.id.id_img_close_dialog).setOnClickListener {
+            mDialog.dismiss()
+        }
+        mDialogView.findViewById<RelativeLayout>(R.id.id_rl_have_coup).setOnClickListener {
+            mDialog.dismiss()
+            listener.onClick(it)
+        }
+
+        mDialog.setCanceledOnTouchOutside(false)
+        mDialog.setCancelable(false)
+        mDialog.show()
+    }
 }
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/id_rl_have_coup"
+        android:layout_width="360dp"
+        android:layout_height="404dp"
+        android:background="@drawable/icon_youhuiquan_tanchuang">
+
+        <ImageView
+            android:id="@+id/id_img_youhuiquan_1"
+            android:layout_width="190dp"
+            android:layout_height="50dp"
+            android:layout_marginLeft="74dp"
+            android:layout_marginTop="190dp"
+            android:src="@drawable/icon_youhuiuan_1" />
+
+        <TextView
+            android:id="@+id/id_tv_ten_yuan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="83dp"
+            android:layout_marginTop="196dp"
+            android:includeFontPadding="false"
+            android:text="10"
+            android:textColor="#E23E1D"
+            android:textSize="29sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/id_tv_ten_yuan"
+            android:layout_marginLeft="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_toRightOf="@+id/id_tv_ten_yuan"
+            android:includeFontPadding="false"
+            android:text="元"
+            android:textColor="#E23E1D"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/id_tv_ten_nums"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/id_img_youhuiquan_1"
+            android:layout_alignRight="@+id/id_img_youhuiquan_1"
+            android:layout_margin="10dp"
+            android:textColor="#FCF8E2"
+            android:textSize="19sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/id_img_youhuiquan_2"
+            android:layout_width="190dp"
+            android:layout_height="50dp"
+            android:layout_below="@+id/id_img_youhuiquan_1"
+            android:layout_marginLeft="74dp"
+            android:src="@drawable/icon_youhuiquan_2" />
+
+        <TextView
+            android:id="@+id/id_tv_five_yuan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/id_img_youhuiquan_2"
+            android:layout_alignTop="@+id/id_img_youhuiquan_2"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="10dp"
+            android:includeFontPadding="false"
+            android:text="5"
+            android:textColor="#E23E1D"
+            android:textSize="29sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/id_tv_five_yuan"
+            android:layout_marginLeft="12dp"
+            android:layout_marginBottom="4dp"
+            android:layout_toRightOf="@+id/id_tv_five_yuan"
+            android:includeFontPadding="false"
+            android:text="元"
+            android:textColor="#E23E1D"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/id_five_ten_nums"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#FCF8E2"
+                    android:textStyle="bold"
+                    android:layout_alignTop="@+id/id_img_youhuiquan_2"
+                    android:layout_alignRight="@+id/id_img_youhuiquan_2"
+                    android:layout_margin="10dp"
+                    android:textSize="19sp"/>
+    </RelativeLayout>
+    <ImageView
+        android:id="@+id/id_img_close_dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:src="@drawable/icon_close_youhuiquan"/>
+</LinearLayout>