中建365-二期开发-bug修复

app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt

@@ -61,14 +61,18 @@ class CreateGoodsOrderAct : BaseVmAct<ShopMallVm>() {
         }
 
         mViewModel.defaultAddressLiveData.observe(this){
-            addrId = it.data.id
-            binding.tvChooseAddress.text = "${it.data.province}${it.data.city}${it.data.district}${it.data.address}"
+            if(it.data != null){
+                addrId = it.data.id
+                binding.tvChooseAddress.text = "${it.data.province}${it.data.city}${it.data.district}${it.data.address}"
+            }
+
         }
 
         mViewModel.computeAmountLiveData.observe(this){
             binding.tvTotalPrice.text ="¥ ${it.data.pay_price}"
             binding.tvPlatformDiscounts.text ="¥ ${it.data.discount_price}"
             couponBean?.let {
+                couponsId = it.id
                 binding.tvDiscounts.text = "可优惠¥ ${it.as_amount}"
         //        binding.tvPlatformDiscounts.text = "${(bean!!.ori_price * bean!!.skuNum) - (it.skuPrice * it.skuNum) - couponBean.as_amount}"
 
@@ -178,11 +182,11 @@ class CreateGoodsOrderAct : BaseVmAct<ShopMallVm>() {
                 REQUEST_COUP ->{
                      couponBean = data?.extras!!.getParcelable<ChooseCouponBean>("coupon")
                     if (couponBean != null) {
-                        couponsId = couponBean!!.id
+
 
                         bean?.let {
                            // binding.tvTotalPrice.text ="¥ ${it.skuPrice * it.skuNum - couponBean.as_amount}"
-                            mViewModel.computeAmount(it.skuId,it.skuNum,couponsId)
+                            mViewModel.computeAmount(it.skuId,it.skuNum,couponBean!!.id)
 
                         }
                     }

app/src/main/java/com/zj365/dc/adapter/shop/ShopCategoryAdapter.kt

@@ -13,12 +13,12 @@ import de.hdodenhof.circleimageview.CircleImageView
 class ShopCategoryAdapter : BaseAdapter<ShopCategoryBean>(R.layout.item_shop_categroy) {
     override fun convert(holder: BaseViewHolder, item: ShopCategoryBean) {
 
-        if (data.size != 8){
+      //  if (data.size == 8){
             var screenWidth = context.resources.displayMetrics.widthPixels
             val layoutParam = holder.getView<LinearLayout>(R.id.root).layoutParams
             layoutParam.width = screenWidth /4
             holder.getView<LinearLayout>(R.id.root).layoutParams = layoutParam
-        }
+     //   }
 
         var img = holder.getView<RImageView>(R.id.img_category)
         var categoryName = holder.getView<TextView>(R.id.tv_category)

app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt

@@ -74,7 +74,7 @@ class ShopFragment: BaseFragList<ShopMallVm>() {
     override fun initView() {
         super.initView()
         mViewModel.getGoodsCategory(0L)
-        mViewModel.getGoodsList(null,0L,0,page)
+     //   mViewModel.getGoodsList(null,0L,0,page)
 
         binding.etSearch.setOnEditorActionListener(object : TextView.OnEditorActionListener {
             override fun onEditorAction(p0: TextView?, p1: Int, p2: KeyEvent?): Boolean {

network/src/main/java/com/xty/network/model/ChooseAddressBean.kt

@@ -5,7 +5,7 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class ChooseAddressBean(
-    var id:Long,
+    var id:Long?,
     var username:String,
     var mobile:String,
     var province:String,