Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/zxhl/cms/net/model/box/ShopOrderEntity.kt

@@ -22,5 +22,5 @@ class ShopOrderEntity {
     var orderStatus: Int? = 0//订单状态：0待发货；1已发货；2已签收；3其他
     var orderType: String? = ""
     var goodsList: List<GoodList>? = null
-    var equitCard: List<RightsDetailEntity>? = null
+    var equitCard: RightsDetailEntity? = null
 }
\ No newline at end of file

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

@@ -150,7 +150,7 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
         isClickPayBtn = true
         mLoading?.setLoading("请稍后...")
         mLoading?.show()
-        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "")
+        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","51")
     }
 
     override fun requestOrderSuc(result: AliPayEntity) {

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

@@ -2,14 +2,12 @@ package com.zxbw.modulemain.activity
 
 import android.content.Intent
 import android.text.TextUtils
-import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.adapter.FlashSaleAdapter
 import com.zxbw.modulemain.adapter.MoreDiscountAdapter
 import com.zxbw.modulemain.adapter.TimeAdapter
-import com.zxbw.modulemain.box.activity.OrderDetailActivity
 import com.zxbw.modulemain.contract.FlashSaleContract
 import com.zxbw.modulemain.presenter.FlashSalePresenter
 import com.zxhl.cms.AppContext

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

@@ -5,13 +5,11 @@ import android.util.Log
 import android.view.View
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.fragment.MagicBoxOrderFragment
-import com.zxbw.modulemain.fragment.ShopOrderListFragment
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.FragmentAdapter
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.common.base.BaseFragment
 
-import io.reactivex.Observable
 import kotlinx.android.synthetic.main.activity_layout_my_order.*
 
 

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

@@ -2,6 +2,7 @@ package com.zxbw.modulemain.activity
 
 import android.content.Intent
 import android.net.Uri
+import android.net.http.SslError
 import android.os.Handler
 import android.text.TextUtils
 import android.util.Log
@@ -537,6 +538,7 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
                     ) {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
                         startActivity(intent)
+                        EventUtils.onEvent("h5_open_zfb_suc")
                         return true
                     }
                 } catch (e: Exception) { //防止crash (如果手机上没有安装处理某个scheme开头的url的APP, 会导致crash)
@@ -544,26 +546,44 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
                     showResultLoading(false)
                     return true //没有安装该app时，返回true，表示拦截自定义链接，但不跳转，避免弹出上面的错误页面
                 }
-                //处理http和https开头的url
-                view?.loadUrl(url)
                 return false
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
                 Log.e("WXW", "cURL" + url.toString())
+                Log.d("wxw", "EndTime" + System.currentTimeMillis())
                 super.onPageFinished(view, url)
                 if (url?.contains(NetConfig.H5.WEB_URL_H5_PAY) == true) {
                     id_shop_pay_web_view?.loadUrl("javascript:loadPayHtml('$form')");
                 }
             }
 
+            override fun onReceivedSslError(
+                view: WebView?,
+                handler: SslErrorHandler?,
+                error: SslError?
+            ) {
+                // 接受所有网站的证书，忽略SSL错误，执行访问网页
+                handler?.proceed();
+            }
+
             override fun onReceivedError(
                 view: WebView?,
                 request: WebResourceRequest?,
                 error: WebResourceError?
             ) {
                 super.onReceivedError(view, request, error)
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    Log.d("wxw", "1error${error?.errorCode}")
+                    Log.d("wxw", "2error${error?.description}")
+                    Log.d("wxw", "3error${error?.toString()}")
+                    EventUtils.onEvent(
+                        "h5_pay_error1",
+                        "code: ${error?.errorCode} desc: ${error?.description}"
+                    )
+                } else {
                     EventUtils.onEvent("h5_pay_error1", error.toString())
+                }
                 showResultLoading(false)
             }
 
@@ -572,10 +592,26 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
                 request: WebResourceRequest?,
                 errorResponse: WebResourceResponse?
             ) {
-                super.onReceivedHttpError(view, request, errorResponse)
+
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+                    if (request?.url?.path?.endsWith("/favicon.ico") == true) {
+
+                    } else {
+                        Log.d("wxw", "1errorResponse?.statusCode${request?.url}")
+                        Log.d("wxw", "2errorResponse?.statusCode${errorResponse?.statusCode}")
+                        EventUtils.onEvent(
+                            "h5_pay_error2",
+                            errorResponse?.statusCode.toString() + " url:${request?.url}"
+                        )
+                        showResultLoading(false)
+                    }
+                } else {
                     EventUtils.onEvent("h5_pay_error2", errorResponse.toString())
                     showResultLoading(false)
                 }
+                super.onReceivedHttpError(view, request, errorResponse)
+
+            }
         }
         id_shop_pay_web_view.loadUrl(NetConfig.H5.WEB_URL_H5_PAY)
 

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

@@ -155,7 +155,7 @@ class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
         isClickPayBtn = true
         mLoading?.setLoading("请稍后...")
         mLoading?.show()
-        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "")
+        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","50")
     }
 
     override fun requestOrderSuc(result: AliPayEntity) {

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

@@ -29,6 +29,7 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         var bean = mList[position]
+        if(!bean.goodsList.isNullOrEmpty()){
             holder.img_order_no_copy?.setOnClickListener {
                 copy(holder.id_tv_order_no?.text.toString())
             }
@@ -42,8 +43,12 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
                 LinearLayoutManager(mContext)
             holder.id_rl_order_item?.adapter = mAdapter
             mAdapter?.clear()
-        mAdapter?.appendToList(bean.equitCard)
+            mAdapter?.appendToList(bean.goodsList)
             mAdapter?.notifyDataSetChanged()
+        }else{
+
+        }
+
     }
 
 

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

@@ -14,12 +14,12 @@ import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
 import com.zxhl.cms.net.model.box.GoodList
-import com.zxhl.cms.net.model.qy.RightsDetailEntity
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.RecycleImageView
 
-class ItemOrderAdapter : BaseRecyclerAdapter<RightsDetailEntity, ItemOrderAdapter.ViewHolder> {
+
+class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHolder> {
     private var mContext: Context? = null
 
     constructor(
@@ -30,35 +30,35 @@ class ItemOrderAdapter : BaseRecyclerAdapter<RightsDetailEntity, ItemOrderAdapte
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         var bean = mList[position]
-//        if (!TextUtils.isEmpty(bean.trackingNo)) {
-//            holder.id_tv_courier_no?.text = bean.trackingNo
-//            holder.id_img_copy?.visibility = View.VISIBLE
-//        } else {
-//            holder.id_tv_courier_no?.text = "正在打包中…"
-//            holder.id_img_copy?.visibility = View.GONE
-//        }
+        if (!TextUtils.isEmpty(bean.trackingNo)) {
+            holder.id_tv_courier_no?.text = bean.trackingNo
+            holder.id_img_copy?.visibility = View.VISIBLE
+        } else {
+            holder.id_tv_courier_no?.text = "正在打包中…"
+            holder.id_img_copy?.visibility = View.GONE
+        }
         holder.id_img_copy?.setOnClickListener {
             copy(holder.id_tv_courier_no?.text.toString())
         }
-//        holder.id_img_query?.setOnClickListener {
-//            if(!TextUtils.equals(bean.trackingNo,"正在打包中")){
-//                JumpUtils.webJump("","https://m.kuaidi100.com/app/query/?com=&nu="+bean.trackingNo+"&coname=xymh")
-//            }
-//
-//        }
-
-
-//        if (bean.orderStatus == 0) {
-//            holder.id_tv_status?.text = "待发货"
-//        } else if (bean.orderStatus == 1) {
-//            holder.id_tv_status?.text = "已发货"
-//        } else {
-//            holder.id_tv_status?.text = "已签收"
-//        }
-//        holder.id_tv_goods_name?.text = bean.productName
-//        holder.id_img_goods?.setLoadImageUrl(bean.mainImage, false)
-//        holder.id_tv_nums?.text = "x ${bean.amount}"
-//        holder.id_tv_sale_price?.text = "¥ ${bean.salePriceStr}"
+        holder.id_img_query?.setOnClickListener {
+            if(!TextUtils.equals(bean.trackingNo,"正在打包中")){
+                JumpUtils.webJump("","https://m.kuaidi100.com/app/query/?com=&nu="+bean.trackingNo+"&coname=xymh")
+            }
+
+        }
+
+
+        if (bean.orderStatus == 0) {
+            holder.id_tv_status?.text = "待发货"
+        } else if (bean.orderStatus == 1) {
+            holder.id_tv_status?.text = "已发货"
+        } else {
+            holder.id_tv_status?.text = "已签收"
+        }
+        holder.id_tv_goods_name?.text = bean.productName
+        holder.id_img_goods?.setLoadImageUrl(bean.mainImage, false)
+        holder.id_tv_nums?.text = "x ${bean.amount}"
+        holder.id_tv_sale_price?.text = "¥ ${bean.salePriceStr}"
 
     }
 

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

-package com.zxbw.modulemain.adapter
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.zxbw.modulemain.R
-import com.zxhl.cms.AppContext
-import com.zxhl.cms.common.base.BaseRecyclerAdapter
-import com.zxhl.cms.net.model.box.ShopOrderEntity
-import com.zxhl.cms.utils.JumpUtils
-import com.zxhl.cms.utils.Utils
-import com.zxhl.cms.widget.RecycleImageView
-
-class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.ViewHolder> {
-    private var mContext: Context? = null
-
-    constructor(
-        content: Context?
-    ) : super() {
-        mContext = content
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        var bean = mList[position]
-        if (!TextUtils.isEmpty(bean.goodsList?.get(0)?.trackingNo)) {
-            holder.id_tv_courier_no?.text = bean.goodsList?.get(0)?.trackingNo
-            holder.id_img_copy?.visibility = View.VISIBLE
-        } else {
-            holder.id_tv_courier_no?.text = "生成中…"
-            holder.id_img_copy?.visibility = View.GONE
-        }
-        holder.id_img_copy?.setOnClickListener {
-            copy(holder.id_tv_courier_no?.text.toString())
-        }
-        holder.img_order_no_copy?.setOnClickListener {
-            copy(holder.id_tv_order_no?.text.toString())
-        }
-        holder.id_tv_total_price?.text = "¥${bean.cash}"
-        var mPrice = bean.cash?.toDouble()?.plus(bean.discount?.toDouble())
-        holder.id_tv_pricedesc?.text = "总价:¥${mPrice}｜优惠:¥${bean.discount}｜运费:¥${bean.freight}｜"
-        if (bean.orderStatus == 0) {
-            holder.id_tv_status?.text = "待发货"
-        } else if (bean.orderStatus == 1) {
-            holder.id_tv_status?.text = "已发货"
-        } else {
-            holder.id_tv_status?.text = "已签收"
-        }
-        holder.id_img_query?.setOnClickListener {
-            if(!TextUtils.equals(bean.trackingNo,"正在打包中")){
-                JumpUtils.webJump("","https://m.kuaidi100.com/app/query/?com=&nu="+bean.trackingNo+"&coname=xymh")
-            }
-        }
-        holder.id_tv_goods_name?.text = bean.goodsList?.get(0)?.productName
-        holder.id_img_goods?.setLoadImageUrl(bean.goodsList?.get(0)?.mainImage, false)
-        holder.id_tv_nums?.text = "x ${bean.goodsList?.get(0)?.amount}"
-        holder.id_tv_sale_price?.text = "¥ ${bean.goodsList?.get(0)?.salePriceStr}"
-        holder.id_tv_order_no?.text = bean.orderNo
-        holder.id_tv_pay_time?.text = bean.payTime
-    }
-
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            LayoutInflater.from(AppContext.get())
-                .inflate(R.layout.item_layout_shop_order, parent, false)
-        )
-    }
-
-    class ViewHolder : RecyclerView.ViewHolder {
-
-        var id_img_goods: RecycleImageView?
-        var id_tv_goods_name: TextView?
-        var id_tv_pay_price: TextView?
-        var id_tv_status: TextView?
-        var id_tv_courier_no: TextView?
-        var id_tv_sale_price: TextView?
-        var id_tv_nums: TextView?
-        var id_tv_total_price: TextView?
-        var id_tv_pricedesc: TextView?
-        var id_tv_order_no: TextView?
-        var id_tv_pay_time: TextView?
-        var id_img_copy: ImageView?
-        var img_order_no_copy: ImageView?
-        var id_img_query: TextView?
-
-        constructor(
-            itemView: View
-        ) : super(itemView) {
-
-            id_tv_goods_name = itemView.findViewById<TextView>(R.id.id_tv_goods_name)
-            id_tv_pay_price = itemView.findViewById<TextView>(R.id.id_tv_pay_price)
-            id_tv_status = itemView.findViewById<TextView>(R.id.id_tv_status)
-            id_tv_courier_no = itemView.findViewById<TextView>(R.id.id_tv_courier_no)
-            id_tv_sale_price = itemView.findViewById<TextView>(R.id.id_tv_sale_price)
-            id_tv_nums = itemView.findViewById<TextView>(R.id.id_tv_nums)
-            id_tv_total_price = itemView.findViewById<TextView>(R.id.id_tv_total_price)
-            id_tv_pricedesc = itemView.findViewById<TextView>(R.id.id_tv_pricedesc)
-            id_tv_order_no = itemView.findViewById<TextView>(R.id.id_tv_order_no)
-            id_tv_pay_time = itemView.findViewById<TextView>(R.id.id_tv_pay_time)
-            id_img_copy = itemView.findViewById<ImageView>(R.id.id_img_copy)
-            img_order_no_copy = itemView.findViewById<ImageView>(R.id.img_order_no_copy)
-            id_img_goods = itemView.findViewById<RecycleImageView>(R.id.id_img_goods)
-            id_img_query = itemView.findViewById<TextView>(R.id.id_img_query)
-
-        }
-    }
-
-    fun copy(string: String) {
-        //获取剪贴板管理器：
-        val cm: ClipboardManager =
-            mContext?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        // 创建普通字符型ClipData
-
-        val mClipData: ClipData =
-            ClipData.newPlainText("Label", string)
-        // 将ClipData内容放到系统剪贴板里。
-        cm.setPrimaryClip(mClipData)
-        Utils.showToast(mContext, "已复制到剪切板")
-    }
-}
\ No newline at end of file

moduleMain/src/main/java/com/zxbw/modulemain/box/activity/OrderDetailActivity.kt

@@ -2,6 +2,7 @@ package com.zxbw.modulemain.box.activity
 
 import android.content.Intent
 import android.net.Uri
+import android.net.http.SslError
 import android.os.Handler
 import android.text.TextUtils
 import android.util.Log
@@ -26,7 +27,6 @@ import com.zxhl.cms.pay.PayContract
 import com.zxhl.cms.pay.PayPresenter
 import com.zxhl.cms.utils.*
 import com.zxhl.cms.widget.LoadingDialog
-
 import com.zxhl.cms.net.model.uc.PayResultEntity
 import com.zxhl.cms.pay.PaymentFunAdapter
 import io.reactivex.Observable
@@ -34,7 +34,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.activity_layout_order_detail.*
 
-
 class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContract.View {
     private var mPresenter: OrderDetailPresenter? = null
     private var mAdapter: OrderAdapter? = null
@@ -508,6 +507,7 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
                     ) {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
                         startActivity(intent)
+                        EventUtils.onEvent("h5_open_zfb_suc")
                         return true
                     }
                 } catch (e: Exception) { //防止crash (如果手机上没有安装处理某个scheme开头的url的APP, 会导致crash)
@@ -515,26 +515,44 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
                     showResultLoading(false)
                     return true //没有安装该app时，返回true，表示拦截自定义链接，但不跳转，避免弹出上面的错误页面
                 }
-                //处理http和https开头的url
-                view?.loadUrl(url)
                 return false
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
                 Log.e("WXW", "cURL" + url.toString())
+                Log.d("wxw", "EndTime" + System.currentTimeMillis())
                 super.onPageFinished(view, url)
                 if (url?.contains(NetConfig.H5.WEB_URL_H5_PAY) == true) {
                     id_pay_web_view?.loadUrl("javascript:loadPayHtml('$form')");
                 }
             }
 
+            override fun onReceivedSslError(
+                view: WebView?,
+                handler: SslErrorHandler?,
+                error: SslError?
+            ) {
+                // 接受所有网站的证书，忽略SSL错误，执行访问网页
+                handler?.proceed();
+            }
+
             override fun onReceivedError(
                 view: WebView?,
                 request: WebResourceRequest?,
                 error: WebResourceError?
             ) {
                 super.onReceivedError(view, request, error)
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    Log.d("wxw", "1error${error?.errorCode}")
+                    Log.d("wxw", "2error${error?.description}")
+                    Log.d("wxw", "3error${error?.toString()}")
+                    EventUtils.onEvent(
+                        "h5_pay_error1",
+                        "code: ${error?.errorCode} desc: ${error?.description}"
+                    )
+                } else {
                     EventUtils.onEvent("h5_pay_error1", error.toString())
+                }
                 showResultLoading(false)
             }
 
@@ -543,12 +561,27 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
                 request: WebResourceRequest?,
                 errorResponse: WebResourceResponse?
             ) {
-                super.onReceivedHttpError(view, request, errorResponse)
+
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+                    if (request?.url?.path?.endsWith("/favicon.ico") == true) {
+
+                    } else {
+                        Log.d("wxw", "1errorResponse?.statusCode${request?.url}")
+                        Log.d("wxw", "2errorResponse?.statusCode${errorResponse?.statusCode}")
+                        EventUtils.onEvent(
+                            "h5_pay_error2",
+                            errorResponse?.statusCode.toString() + " url:${request?.url}"
+                        )
+                        showResultLoading(false)
+                    }
+                } else {
                     EventUtils.onEvent("h5_pay_error2", errorResponse.toString())
                     showResultLoading(false)
                 }
+                super.onReceivedHttpError(view, request, errorResponse)
 
             }
+        }
         id_pay_web_view.loadUrl(NetConfig.H5.WEB_URL_H5_PAY)
 
     }

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

@@ -15,7 +15,7 @@ class CardDetailContract {
     }
 
     interface Presenter {
-        fun requestRightsAliPay(goodsId: String, payType: String, phone: String)
+        fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String)
 
         fun verifyPay(order: String?, payType: Int)
     }

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

-package com.zxbw.modulemain.fragment
-
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.ShopOrderAdapter
-import com.zxbw.modulemain.contract.ShopOrderListContract
-import com.zxbw.modulemain.presenter.ShopOrderListPresenter
-import com.zxhl.cms.common.base.BaseFragment
-import com.zxhl.cms.net.model.box.ShopOrderEntity
-import com.zxhl.cms.utils.Utils
-import kotlinx.android.synthetic.main.fragment_shop_order.*
-
-
-/**
- * @author (wangXuewei)
- * @datetime 2022-03-02 18:28 GMT+8
- * @detail :
- */
-class ShopOrderListFragment : BaseFragment(), ShopOrderListContract.View {
-    private var mPresenter: ShopOrderListPresenter? = null
-    private var mAdapter: ShopOrderAdapter?=null
-    override fun layoutID(): Int {
-        return R.layout.fragment_shop_order
-    }
-
-    override fun init(view: View?) {
-        mPresenter = ShopOrderListPresenter(this)
-        mAdapter= ShopOrderAdapter(mActivity)
-        recyclerView.layoutManager=LinearLayoutManager(mActivity)
-        recyclerView.adapter=mAdapter
-        mPresenter?.getShopOrderList(true)
-        refreshLayout.setColorSchemeColors(resources.getColor(R.color.color_3A95FD))
-        refreshLayout?.setOnRefreshListener {
-            mPresenter?.getShopOrderList(true)
-        }
-        recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                super.onScrollStateChanged(recyclerView, newState)
-
-            }
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-                if (Utils.isSlideToBottom(recyclerView)) {
-                    if ((mAdapter?.list?.size ?: 0) > 0) {
-                        mPresenter?.getShopOrderList(false)
-                    }
-                }
-            }
-        })
-
-    }
-
-    companion object {
-        fun newInstance() = ShopOrderListFragment()
-    }
-
-    override fun setShopOrderListData(isRefresh: Boolean, reslut: List<ShopOrderEntity>?) {
-        if (isRefresh) {
-            mAdapter?.clear()
-        }
-        setEmptyView(false)
-        val start = mAdapter?.getItemCount() ?: 0
-        mAdapter?.appendToList(reslut)
-        if (isRefresh) {
-            mAdapter?.notifyDataSetChanged()
-        } else {
-            val end = mAdapter?.getItemCount() ?: 0
-            mAdapter?.notifyItemRangeChanged(start, end)
-        }
-    }
-
-    override fun setLoadMore(isBoolean: Boolean) {
-
-    }
-
-    override fun setEmptyView(isEmpty: Boolean) {
-        refreshLayout?.isRefreshing = false
-        if (isEmpty) {
-            id_order_empty.visibility = View.VISIBLE
-        } else {
-            id_order_empty.visibility = View.GONE
-        }
-    }
-}
\ No newline at end of file

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

@@ -136,25 +136,26 @@ class TobePickUpFragment: BaseFragment(), WareHouseContract.View,
             if (mChoosList.isEmpty()) {
                 Utils.showToast(mActivity, "请选择要发货的物品")
             } else {
-                if(Constant.Switch.isBindLogin){
                 val intent = Intent(mActivity, OrderDetailActivity::class.java)
                 intent.putStringArrayListExtra(
                     "stringList",
                     mChoosList as java.util.ArrayList<String>?
                 )
                 startActivity(intent)
-                }else{
-                    JumpUtils.AfterLoginJump(
-                        "",
-                        "",
-                        "",
-                        "",
-                        "",
-                        "",
-                        ""
-                    )
-//                        wechatutil!!.wechatLogin(mActivity, Constant.Key.FIVE_LOTTERY)
-                }
+//                if(Constant.Switch.isBindLogin){
+//
+//                }else{
+//                    JumpUtils.AfterLoginJump(
+//                        "",
+//                        "",
+//                        "",
+//                        "",
+//                        "",
+//                        "",
+//                        ""
+//                    )
+////                        wechatutil!!.wechatLogin(mActivity, Constant.Key.FIVE_LOTTERY)
+//                }
             }
             //  JumpUtils.OrderDetailJump()
         }

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_img_kefu?.setOnClickListener {
+            JumpUtils.webJump("客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
+        }
         id_tv_kaitong?.setOnClickListener {
             JumpUtils.MemberOrderJump()
         }

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

 package com.zxbw.modulemain.presenter
 
+import android.util.Log
 import com.zxbw.modulemain.contract.BoxOrderContract
 import com.zxhl.cms.net.ApiClient
 import com.zxhl.cms.net.RxSchedulers
@@ -51,8 +52,9 @@ class BoxOrderPresenter : BoxOrderContract.Presenter {
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
-//                    Log.d("wxw", "goodsListError " + code + " errorMsg " + errorMsg)
+                    Log.d("wxw", "goodsListError " + code + " errorMsg " + errorMsg)
                     //  mView.setEmptyView(true)
+                   mView.setEmptyView(true)
                 }
             })
 

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

@@ -21,8 +21,8 @@ class CardDetailPresenter : CardDetailContract.Presenter {
     }
 
 
-    override fun requestRightsAliPay(goodsId: String, payType: String, phone: String) {
-        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone,"51")
+    override fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String) {
+        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone,type)
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<AliPayEntity>() {
                 override fun onSuccess(result: AliPayEntity?) {

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

@@ -27,6 +27,10 @@
 
     </LinearLayout>
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refreshLayout"
             android:layout_width="match_parent"
@@ -40,13 +44,12 @@
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-
         <LinearLayout
             android:id="@+id/id_order_empty"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-        android:layout_marginTop="160dp"
+            android:layout_marginTop="170dp"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone">
@@ -64,6 +67,7 @@
                 android:textColor="@color/color_999999"
                 android:textSize="13sp" />
         </LinearLayout>
+    </FrameLayout>
 
 
 </LinearLayout>
\ No newline at end of file

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

@@ -54,6 +54,14 @@
                 android:layout_marginRight="16dp"
                 android:src="@drawable/icon_head_defalt" />
 
+            <ImageView
+                android:id="@+id/id_img_kefu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/id_img_setting"
+                android:padding="16dp"
+                android:src="@drawable/icon_kefu_hei" />
+
             <ImageView
                 android:id="@+id/id_img_setting"
                 android:layout_width="wrap_content"
@@ -94,12 +102,13 @@
                         android:text="普通用户"
                         android:textColor="@color/white"
                         android:textSize="10sp" />
+
                     <ImageView
                         android:id="@+id/id_img_vip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@drawable/mark_vip"
-                        android:visibility="gone"/>
+                        android:visibility="gone" />
                 </LinearLayout>
 
                 <TextView
@@ -360,17 +369,18 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
-            android:textStyle="bold"
             android:text="常用功能"
             android:textColor="@color/color_333333"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
             android:orientation="horizontal">
+
             <LinearLayout
                 android:id="@+id/id_ll_shangwu_hezuo"
                 android:layout_width="0dp"
@@ -416,7 +426,6 @@
             </LinearLayout>
 
 
-
             <LinearLayout
                 android:id="@+id/id_ll_xieyi_zhengze"
                 android:layout_width="0dp"
@@ -461,11 +470,12 @@
                     android:textSize="12sp" />
             </LinearLayout>
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
             android:orientation="horizontal">
 
             <LinearLayout
@@ -518,8 +528,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:visibility="invisible"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="invisible">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -539,9 +549,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:visibility="invisible"
                 android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="invisible">
 
                 <ImageView
                     android:layout_width="wrap_content"