包装方式

app/src/main/java/com/dhsd/glowner/adapter/PackingTypeAdapter.kt

@@ -9,6 +9,7 @@ import com.chad.library.adapter4.QuickAdapterHelper
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.dahe.glex.bean.WayBillBean
 import com.dhsd.glowner.R
+import com.dhsd.glowner.bean.DictBean
 import com.dhsd.glowner.bean.PackTypeBean
 
 /**
@@ -17,11 +18,11 @@ import com.dhsd.glowner.bean.PackTypeBean
  * @Date 2024/2/4 14:49
  * @Description TODO
  */
-class PackingTypeAdapter : BaseQuickAdapter<PackTypeBean,QuickViewHolder>() {
+class PackingTypeAdapter : BaseQuickAdapter<DictBean,QuickViewHolder>() {
-    override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: PackTypeBean?) {
+    override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: DictBean?) {
         holder.getView<TextView>(R.id.rbWord).isSelected = item?.isCheck == true
 //        holder.getView<RadioButton>(R.id.rbWord).isChecked = item?.isCheck == true
-        holder.setText(R.id.rbWord,item?.content)
+        holder.setText(R.id.rbWord,item?.dictValue)
     }
 
     override fun onCreateViewHolder(

app/src/main/java/com/dhsd/glowner/bean/DictBean.kt

@@ -0,0 +1,40 @@
+package com.dhsd.glowner.bean
+
+import com.github.gzuliyujiang.wheelview.contract.TextProvider
+
+data class DictBean(
+    val createBy: String,
+    val createTime: String,
+    val default: Boolean,
+    val dictCode: Int,
+    val dictLabel: String,
+    val dictSort: Int,
+    val dictType: String,
+    val dictValue: String,
+    val isDefault: String,
+    val listClass: String,
+    val remark: String,
+    val status: String,
+    val updateBy: String,
+    val updateTime: String,
+    var isCheck: Boolean = false
+): TextProvider {
+    override fun provideText(): String {
+        return dictValue
+    }
+}
+
+data class GoodTypeBean(
+    val alctGoodsCategoryCode: Int,
+    val alctGoodsCategoryName: String,
+    val categoryId: Int,
+    val createTime: String,
+    val jttGoodsCategoryCode: Int,
+    val jttGoodsCategoryName: String,
+    val sortValue: String
+): TextProvider {
+    override fun provideText(): String {
+        return jttGoodsCategoryName
+    }
+}
+

app/src/main/java/com/dhsd/glowner/net/Api.kt

@@ -4,6 +4,8 @@ import com.dhsd.glowner.BuildConfig
 import com.dhsd.glowner.bean.AddressBean
 import com.dhsd.glowner.bean.CaptainBean
 import com.dhsd.glowner.bean.CarBean
+import com.dhsd.glowner.bean.DictBean
+import com.dhsd.glowner.bean.GoodTypeBean
 import com.dhsd.glowner.bean.LoginBean
 import com.dhsd.glowner.bean.PostAddressBean
 import io.reactivex.rxjava3.core.Observable
@@ -73,16 +75,15 @@ interface Api {
      * @param bean DispatchBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @POST(BASE_URL+"devApi/business/shipper/order/dispatchVehicles")
+    @POST(BASE_URL + "devApi/business/shipper/order/dispatchVehicles")
     fun dispatchVehicles(@Body bean: DispatchBean): Observable<CommonResponseBean<Any>>
 
 
-
     /**
      * 查询车队列表
      * @return Observable<CommonResponseBean<Any>>
      */
-    @GET(BASE_URL+"devApi/business/ft/common/dict/onlyCaptain")
+    @GET(BASE_URL + "devApi/business/ft/common/dict/onlyCaptain")
     fun getCaptainList(): Observable<CommonResponseBean<MutableList<CaptainBean>>>
 
 
@@ -91,8 +92,8 @@ interface Api {
      * @param captainId String 车队ID
      * @return Observable<CommonResponseBean<MutableList<CaptainBean>>>
      */
-    @GET(BASE_URL+"devApi/business/ft/common/dict/captain/driverAndCar")
+    @GET(BASE_URL + "devApi/business/ft/common/dict/captain/driverAndCar")
-    fun driverAndCarList(@Query("captainId") captainId:String): Observable<CommonResponseBean<MutableList<CarBean>>>
+    fun driverAndCarList(@Query("captainId") captainId: String): Observable<CommonResponseBean<MutableList<CarBean>>>
 
 
     /**
@@ -100,7 +101,7 @@ interface Api {
      * @param bean PostAddressBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @POST(BASE_URL+"devApi/business/shipper/common/address")
+    @POST(BASE_URL + "devApi/business/shipper/common/address")
     fun postAddress(@Body bean: PostAddressBean): Observable<CommonResponseBean<Any>>
 
     /**
@@ -108,8 +109,8 @@ interface Api {
      * @param addressId String
      * @return Observable<CommonResponseBean<PostAddressBean>>
      */
-    @GET(BASE_URL+"devApi/business/shipper/common/address/{addressId}")
+    @GET(BASE_URL + "devApi/business/shipper/common/address/{addressId}")
-    fun getAddressDetail(@Path("addressId") addressId:String) : Observable<CommonResponseBean<PostAddressBean>>
+    fun getAddressDetail(@Path("addressId") addressId: String): Observable<CommonResponseBean<PostAddressBean>>
 
 
     /**
@@ -117,7 +118,7 @@ interface Api {
      * @param bean PostAddressBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @PUT(BASE_URL+"devApi/business/shipper/common/address")
+    @PUT(BASE_URL + "devApi/business/shipper/common/address")
     fun updateAddress(@Body bean: PostAddressBean): Observable<CommonResponseBean<Any>>
 
 
@@ -126,14 +127,30 @@ interface Api {
      * @param addressIds String
      * @return Observable<CommonResponseBean<Any>>
      */
-    @DELETE(BASE_URL+"devApi/business/shipper/common/address/{addressIds}")
+    @DELETE(BASE_URL + "devApi/business/shipper/common/address/{addressIds}")
-    fun deleteAddress(@Path("addressIds") addressIds:String): Observable<CommonResponseBean<Any>>
+    fun deleteAddress(@Path("addressIds") addressIds: String): Observable<CommonResponseBean<Any>>
 
 
     /**
      * 获取地址列表
      * @return Observable<CommonResponseBean<OrderListBean<AddressBean>>>
      */
-    @GET(BASE_URL+"devApi/business/shipper/common/address/list")
+    @GET(BASE_URL + "devApi/business/shipper/common/address/list")
     fun getAddressList(): Observable<CommonResponseBean<OrderListBean<AddressBean>>>
+
+    /**
+     * 系统字典
+     * @param dictType String
+     * @return Observable<CommonResponseBean<MutableList<DictBean>>>
+     */
+    @GET(BASE_URL + "devApi//system/dict/data/type/{dictType}")
+    fun getDictData(@Path("dictType") dictType: String): Observable<CommonResponseBean<MutableList<DictBean>>>
+
+
+    /**
+     * 查询交通厅与安联货物分类对应关系字典
+     * @return Observable<CommonResponseBean<MutableList<GoodTypeBean>>>
+     */
+    @GET(BASE_URL + "devApi/business/ft/common/dict/goodsCategor")
+    fun getGoodsCategor(): Observable<CommonResponseBean<MutableList<GoodTypeBean>>>
 }

app/src/main/java/com/dhsd/glowner/ui/home/HomeFragment.kt

@@ -81,6 +81,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
 
 
     override fun getRefreshDate(stat: Int, page: Int, count: Int) {
+        if (stat==2){
+            binding.refresh.finishLoadMoreWithNoMoreData()
+            return
+        }
         initData()
     }
 
@@ -99,7 +103,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
             addItemDecoration(
                 RecycleViewDivider(
                     LinearLayout.VERTICAL,
-                    ConvertUtils.dp2px(16.0f),
+                    ConvertUtils.dp2px(12.0f),
                     Color.TRANSPARENT
                 )
             )
@@ -115,10 +119,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
                 CommonPopUtils.getInstance().showCarList(
                     mContext
                 ) { _, position ->
-                    if (position === 0) {
-
-                    }
-
                     when (position) {
                         0->{
                             launcher.launch(Intent(mContext, ChoiceCarActivity::class.java).apply {

app/src/main/java/com/dhsd/glowner/ui/home/activtiy/CarTypeActivity.kt

@@ -49,7 +49,7 @@ class CarTypeActivity : BaseActivity<ActivityCarTypeBinding>() {
                 datas[position].isCheck = !datas[position].isCheck
                 this.notifyItemChanged(position)
             }
-            submitList(datas)
+//            submitList(datas)
         }
 
 
@@ -79,7 +79,7 @@ class CarTypeActivity : BaseActivity<ActivityCarTypeBinding>() {
                 datas2[position].isCheck = !datas2[position].isCheck
                 this.notifyItemChanged(position)
             }
-            submitList(datas2)
+//            submitList(datas2)
         }
     }
 

app/src/main/java/com/dhsd/glowner/ui/home/activtiy/GoodsInfoActivity.kt

@@ -1,19 +1,30 @@
 package com.dhsd.glowner.ui.home.activtiy
 
+import BaseObserver
+import DataManager
+import RxHttpCallBack
 import android.os.Bundle
 import android.view.View
+import android.view.View.OnClickListener
 import androidx.recyclerview.widget.GridLayoutManager
 import com.dahe.mylibrary.base.BaseActivity
+import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.utils.PickerUtils
 import com.dahe.mylibrary.weight.FullyGridLayoutManager
 import com.dhsd.glowner.R
 import com.dhsd.glowner.adapter.PackingTypeAdapter
+import com.dhsd.glowner.bean.AddressBean
+import com.dhsd.glowner.bean.DictBean
+import com.dhsd.glowner.bean.GoodTypeBean
 import com.dhsd.glowner.bean.PackTypeBean
 import com.dhsd.glowner.databinding.ActivityGoodsInfoBinding
 import com.dhsd.glowner.utils.OnLimitClickHelper
 import com.dhsd.glowner.utils.OnLimitClickListener
+import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener
 import com.luck.picture.lib.decoration.GridSpacingItemDecoration
 import com.luck.picture.lib.utils.DensityUtil
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 
 /**
  * @ClassName GoodsInfoActivity
@@ -22,74 +33,146 @@ import com.luck.picture.lib.utils.DensityUtil
  * @Description 货物信息
  */
 class GoodsInfoActivity : BaseActivity<ActivityGoodsInfoBinding>(),
-    OnLimitClickListener {
+    OnLimitClickListener ,OnClickListener{
+
+    private var unitType = 1 //1:重量，2：体积
+
+    lateinit var adapter: PackingTypeAdapter
     override fun initView(savedInstanceState: Bundle?) {
         setStatusBarColor(R.color.white)
         setTitleBar("货物信息", true)
 
-        var datas = mutableListOf<PackTypeBean>(
+        binding.run {
-            PackTypeBean("散装",0),
+            adapter = recycler.run {
-            PackTypeBean("袋装",1,true),
+                layoutManager =
-            PackTypeBean("吨包",2),
+                    FullyGridLayoutManager(mContext, 3, GridLayoutManager.VERTICAL, false)
-            PackTypeBean("托盘",3),
+                addItemDecoration(
-            PackTypeBean("困扎",4),
+                    GridSpacingItemDecoration(
-            PackTypeBean("裸装",5),
+                        3,
-            PackTypeBean("箱装",6),
+                        DensityUtil.dip2px(mContext, 8f), false
-            PackTypeBean("其他",7)
+                    )
-        )
-
-        binding.recycler.run {
-            layoutManager = FullyGridLayoutManager(mContext, 3, GridLayoutManager.VERTICAL, false)
-            addItemDecoration(
-                GridSpacingItemDecoration(
-                    3,
-                    DensityUtil.dip2px(mContext, 8f), false
                 )
-            )
+                adapter = PackingTypeAdapter()
-            adapter = PackingTypeAdapter()
+                adapter as PackingTypeAdapter
-            adapter as PackingTypeAdapter
+            }.apply {
-        }.apply {
+                addOnItemChildClickListener(R.id.rbWord) { adapter, view, position ->
-            addOnItemChildClickListener(R.id.rbWord){ adapter, view, position ->
+//                    val size = adapter.items.filter { it.isCheck }.size
-                val size = datas.filter { it.isCheck }.size
+//                    val check = adapter.items[position].isCheck
-                val check = datas[position].isCheck
+//                    if (size > 2 && !check) {
-                if (size>2&&!check){
+//                        showToast("最多选择三项")
-                    showToast("最多选择三项")
+//                        return@addOnItemChildClickListener
-                    return@addOnItemChildClickListener
+//                    }
+//                    adapter.items[position].isCheck = !adapter.items[position].isCheck
+//                    this.notifyItemChanged(position)
+
+                    val items = adapter.items
+                    val indexOfFirst = items.indexOfFirst { it.isCheck }
+
+                    if (indexOfFirst > -1 && indexOfFirst != position) {
+                        items[indexOfFirst].isCheck = false
+                        items[position].isCheck = !items[position].isCheck
+                        notifyItemChanged(indexOfFirst)
+                        notifyItemChanged(position)
+                    } else {
+                        items[position].isCheck = !items[position].isCheck
+                        notifyItemChanged(position)
+                    }
+
                 }
-
-                datas[position].isCheck = !datas[position].isCheck
-                this.notifyItemChanged(position)
-
             }
-            submitList(datas)
         }
 
         binding.run {
             tvGood.setOnClickListener(OnLimitClickHelper(this@GoodsInfoActivity))
             tvGoodType.setOnClickListener(OnLimitClickHelper(this@GoodsInfoActivity))
+            tvChange.setOnClickListener(this@GoodsInfoActivity)
+//            tvChange.setOnClickListener(OnLimitClickHelper(this@GoodsInfoActivity))
         }
     }
 
     override fun initDate() {
+        DataManager.getInstance().getDictData("packaging_method")
+            .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<DictBean>>() {
+                override fun onSuccess(t: CommonResponseBean<MutableList<DictBean>>) {
+                    super.onSuccess(t)
+                    initList(t.data)
+                }
+            }))
     }
 
     override fun onClick(view: View?) {
         super.onClick(view)
-        when(view?.id){
+        when (view?.id) {
-            R.id.tvGood->{
+            R.id.tvGood -> {
-                var datas  = mutableListOf("螺纹钢","螺纹钢1","螺纹钢2")
+                var datas = mutableListOf("螺纹钢", "螺纹钢1", "螺纹钢2")
-                PickerUtils.getInstance().showSingleSelect(this, "请选择货物", datas
+                PickerUtils.getInstance().showSingleSelect(
+                    this, "请选择货物", datas
                 ) { position, item ->
                     showToast(item as String)
                 }
             }
-            R.id.tvGoodType->{
+
-                var datas  = mutableListOf("钢铁","螺纹钢1","螺纹钢2")
+            R.id.tvGoodType -> {
-                PickerUtils.getInstance().showSingleSelect(this, "请选择货物类型", datas
+                getGoodsType()
-                ) { position, item ->
+            }
-                    showToast(item as String)
+
+            R.id.tvChange -> {
+                changeUnitType()
+            }
+        }
+    }
+
+    private fun initList(rows: List<DictBean>) {
+        if (rows.isEmpty()) {
+            adapter.submitList(null)
+            adapter.setStateViewLayout(mContext, R.layout.empty_view)
+        } else {
+            if (mRefreshPage === 1) {
+                adapter?.submitList(rows)
+            } else {
+                adapter?.addAll(rows)
+            }
+        }
+    }
+
+
+    private fun getGoodsType() {
+        DataManager.getInstance().getGoodsCategor()
+            .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<MutableList<GoodTypeBean>>() {
+                override fun onSuccess(t: CommonResponseBean<MutableList<GoodTypeBean>>) {
+                    super.onSuccess(t)
+                    PickerUtils.getInstance().showSelectCarColor(
+                        this@GoodsInfoActivity, "请选择货物类型",
+                        "", t.data
+                    ) { position, item ->
+                        item as GoodTypeBean
+                        binding.tvGoodType.text = item.jttGoodsCategoryName
+                    }
+                }
+            }))
+    }
+
+    private fun changeUnitType() {
+        when (unitType) {
+            1 -> {
+                unitType = 2
+                binding.run {
+                    etWeight.hint = "请填写总体积(m³)"
+                    binding.tvUnit.text = "体积(m³)"
+                }
+
+            }
+
+            2 -> {
+                unitType = 1
+                binding.run {
+                    etWeight.hint = "请填写总重量(吨)"
+                    tvUnit.text = "重量(吨)"
                 }
             }
         }
     }
+
 }

app/src/main/java/com/dhsd/glowner/ui/home/activtiy/SendGoodsActivity.kt

@@ -39,12 +39,6 @@ class SendGoodsActivity : BaseActivity<ActivitySendGoodsBinding>() {
         setStatusBarColor(R.color.white)
         setTitleBar("普通装货", true)
 
-        binding.rgTeam.setOnCheckedChangeListener { radioGroup, i ->
-            ToastUtils.showToast(mContext, radioGroup.id.toString())
-        }
-
-
-
         datas = mutableListOf<AddressBean>(
             AddressBean(),
             AddressBean()

app/src/main/res/layout/activity_goods_info.xml

@@ -47,27 +47,20 @@
                         android:textSize="@dimen/sp_16" />
 
 
-                    <TextView
+                    <EditText
                         android:id="@+id/tvGood"
-                        android:layout_weight="1"
-                        android:gravity="right"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="螺纹钢"
+                        android:layout_weight="1"
-                        android:drawablePadding="@dimen/dp_6"
+                        android:maxLines="1"
+                        android:inputType="text"
                         android:drawableRight="@drawable/right"
+                        android:drawablePadding="@dimen/dp_6"
+                        android:gravity="right"
+                        android:background="@null"
+                        android:text="螺纹钢"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
-
-                    <!--                    <org.angmarch.views.NiceSpinner-->
-                    <!--                        android:layout_weight="1"-->
-                    <!--                        android:text="螺纹钢"-->
-                    <!--                        android:gravity="right"-->
-                    <!--                        android:id="@+id/niceSpinner"-->
-                    <!--                        android:layout_width="wrap_content"-->
-                    <!--                        android:layout_height="40dp"-->
-                    <!--                        android:paddingBottom="@dimen/dp_0"-->
-                    <!--                        />-->
                 </LinearLayout>
 
                 <View
@@ -94,12 +87,14 @@
 
 
                     <TextView
+                        android:gravity="right"
+                        android:layout_weight="1"
                         android:id="@+id/tvGoodType"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:drawableRight="@drawable/right"
                         android:drawablePadding="@dimen/dp_6"
-                        android:text="钢铁"
+                        android:hint="请选择货物类型"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
                 </LinearLayout>
@@ -131,18 +126,17 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_3"
                         android:layout_marginRight="@dimen/dp_5"
                         android:background="@drawable/shape_white_8"
-                        android:paddingTop="@dimen/dp_15"
+                        android:paddingTop="@dimen/dp_10"
-                        android:paddingBottom="@dimen/dp_15" />
+                        android:paddingBottom="@dimen/dp_10" />
 
                 </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:layout_marginTop="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_6"
                     android:background="@color/color_E1" />
 
                 <LinearLayout
@@ -157,47 +151,110 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:drawableLeft="@drawable/start"
-                        android:text="总质量体积"
+                        android:text="总重量/体积"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
 
 
                     <TextView
+                        android:id="@+id/tvChange"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="添加单位"
+                        android:text="切换单位"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:gravity="center_vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_14"
                     android:background="@drawable/shape_gray_5"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal"
                     android:padding="@dimen/dp_11">
 
                     <EditText
-                        android:layout_weight="1"
+                        android:id="@+id/etWeight"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="2.5"
                         android:background="@null"
-                        android:hint="公司/个人名称"
+                        android:hint="请填写总质量(吨)"
-                        android:textColor="#FF4A02"
+                        android:maxLines="1"
+                        android:inputType="numberDecimal"
+                        android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
 
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="@dimen/dp_20"
-                        android:background="@color/color_c"
+                        android:layout_marginRight="@dimen/dp_12"
-                        android:layout_marginRight="@dimen/dp_12" />
+                        android:background="@color/color_c" />
+
+                    <TextView
+                        android:id="@+id/tvUnit"
+                        android:gravity="center"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="重量(吨)"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:orientation="horizontal">
+
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="重量（吨）"
+                        android:layout_weight="1"
+                        android:text="货物价值(非必填)"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_14"
+                    android:background="@drawable/shape_gray_5"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/dp_11">
+
+                    <EditText
+                        android:id="@+id/etMoney"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2.5"
+                        android:background="@null"
+                        android:maxLines="1"
+                        android:inputType="numberDecimal"
+                        android:hint="请填写货物价值"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/sp_16" />
+
+                    <View
+                        android:layout_width="@dimen/dp_1"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_marginRight="@dimen/dp_12"
+                        android:background="@color/color_c" />
+
+                    <TextView
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="元"
+                        android:gravity="center"
                         android:textColor="@color/black"
                         android:textSize="@dimen/sp_16" />
                 </LinearLayout>
@@ -256,7 +313,7 @@
             android:layout_marginLeft="@dimen/dp_16"
             android:layout_weight="2"
             android:background="@drawable/bg_btn"
-            android:text="立即发货"
+            android:text="确定"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_17" />
 

app/src/main/res/layout/activity_login.xml

@@ -62,6 +62,7 @@
 
         <EditText
             android:maxLines="1"
+            android:inputType="text"
             android:id="@+id/etPhone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_45"
@@ -73,6 +74,7 @@
             android:layout_marginTop="@dimen/dp_16"
             android:id="@+id/etPwd"
             android:maxLines="1"
+            android:inputType="text"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_45"
             android:background="@drawable/shape_phone_bg"
@@ -97,6 +99,7 @@
                 android:background="@drawable/shape_phone_bg"
                 android:hint="请输入验证码"
                 android:maxLines="1"
+                android:inputType="number"
                 android:paddingLeft="@dimen/dp_20"></EditText>
             <ImageView
                 android:id="@+id/ivCode"

app/src/main/res/layout/activity_send_goods.xml

@@ -163,86 +163,6 @@
                         android:textSize="@dimen/sp_16" />
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_1"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:background="@color/color_E1" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:orientation="horizontal">
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:drawableLeft="@drawable/start"
-                        android:text="指派方式"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/sp_16" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="16米，厢式"
-                        android:textColor="#FF4A02"
-                        android:textSize="@dimen/sp_16" />
-                </LinearLayout>
-
-                <RadioGroup
-                    android:id="@+id/rgTeam"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginBottom="@dimen/dp_16"
-                    android:orientation="horizontal">
-
-                    <RadioButton
-                        android:id="@+id/rbDir"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_weight="1"
-                        android:background="@drawable/select_auth_team"
-                        android:button="@null"
-                        android:checked="true"
-                        android:gravity="center"
-                        android:text="直接指派"
-                        android:textColor="@drawable/select_auth_team_text"
-                        android:textSize="@dimen/sp_15" />
-
-                    <RadioButton
-                        android:id="@+id/rbCars"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginLeft="@dimen/dp_12"
-                        android:layout_weight="1"
-                        android:background="@drawable/select_auth_team"
-                        android:button="@null"
-                        android:checked="false"
-                        android:gravity="center"
-                        android:text="车队指派"
-                        android:textColor="@drawable/select_auth_team_text"
-                        android:textSize="@dimen/sp_15" />
-
-                    <RadioButton
-                        android:id="@+id/rbSna"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_marginLeft="@dimen/dp_12"
-                        android:layout_weight="1"
-                        android:background="@drawable/select_auth_team"
-                        android:button="@null"
-                        android:checked="false"
-                        android:gravity="center"
-                        android:text="抢单模式"
-                        android:textColor="@drawable/select_auth_team_text"
-                        android:textSize="@dimen/sp_15" />
-                </RadioGroup>
             </LinearLayout>
 
 

app/src/main/res/layout/fragment_home.xml

@@ -196,7 +196,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:paddingLeft="@dimen/dp_14"
-                    android:paddingTop="@dimen/dp_24"
                     android:paddingRight="@dimen/dp_14" />
             </com.scwang.smart.refresh.layout.SmartRefreshLayout>
         </LinearLayout>