1.修改问题。

app/build.gradle

@@ -129,7 +129,7 @@ dependencies {
      //时间选择器
     implementation 'com.contrarywind:Android-PickerView:4.1.9'
    //选择图片
-    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.8'
+    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.9'
 
     //高仿微信朋友圈图片展示效果 ImageWatcher
     implementation 'com.github.iielse:ImageWatcher:1.1.5'

app/src/main/java/com/quansu/heifengwuliu/activity/HomeActivity.kt

@@ -125,7 +125,7 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
                     .setFragment(twoFragment)
                     .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_two))
                     .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_two_focus))
-                    .setText(getString(R.string.source_information))
+                    .setText(getString(R.string.order_information))
                     .build(context())
             val three = menuTabBuilder
                     .setFragment(threeFragment)

app/src/main/java/com/quansu/heifengwuliu/adapter/CarEnterAdapter.kt

@@ -16,6 +16,7 @@ import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.inte.onTextChangeListener
 import com.quansu.heifengwuliu.model.SelectData
 import com.quansu.heifengwuliu.model.bean.ReceiveBean
+import com.quansu.heifengwuliu.utils.PopuBottomUtils
 import com.quansu.heifengwuliu.utils.PopuListUtils
 import com.quansu.heifengwuliu.utils.PopupUtils
 import com.quansu.heifengwuliu.vmodel.OwnerMoreVModel
@@ -106,7 +107,7 @@ class CarEnterAdapter(val vm: OwnerMoreVModel) : BAdapter<ReceiveBean, BaseDataB
 
         holder.dataBinding?.llGoodsType!!.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context, holder.dataBinding?.tvGoodsType!!, goodsTypeList, object : ChoiceListData {
+            PopuBottomUtils.showList(context,  goodsTypeList, object : ChoiceListData {
                 override fun onRestuse(code: String?, name: String?) {
                     item.goods_type_name = name!!
                     item.goods_type = code!!
@@ -120,7 +121,7 @@ class CarEnterAdapter(val vm: OwnerMoreVModel) : BAdapter<ReceiveBean, BaseDataB
 
         holder.dataBinding?.llChoseUnits!!.setOnClickListener {
             //选择单位
-            PopuListUtils.showQMUIPopup(context, holder.dataBinding?.llChoseUnits!!, numsTypeList, object : ChoiceData {
+            PopuBottomUtils.showListString(context,  numsTypeList, object : ChoiceData {
                 override fun onRestuse(name: String?) {
                     item.nums_type = name!!
                     holder.dataBinding?.tvChoseUnits!!.text = name

app/src/main/java/com/quansu/heifengwuliu/adapter/MsgAdapter.kt

@@ -1,6 +1,7 @@
 package com.quansu.heifengwuliu.adapter
 
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.View
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.qmuiteam.qmui.kotlin.onClick
@@ -8,6 +9,7 @@ import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.ArticleDetailActivity
 import com.quansu.heifengwuliu.databinding.ItemMsgBinding
 import com.quansu.heifengwuliu.model.MsgList
+import com.quansu.heifengwuliu.utils.VerifyUtils
 import com.quansu.heifengwuliu.vmodel.MsgVModel
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.UiSwitch
@@ -20,10 +22,14 @@ class MsgAdapter(var vm: MsgVModel) : BAdapter<MsgList, BaseDataBindingHolder<It
         holder.dataBinding?.ll!!.onClick {
             item.is_read=1
             holder.dataBinding?.tvMsg!!.visibility= View.GONE
-            UiSwitch.bundle(context, ArticleDetailActivity::class.java, Bundle().apply {
-                putInt("type",-1)
-                putString("id",item.data_id)
-            })
+            if(!TextUtils.isEmpty(item.android_url)){
+                VerifyUtils.isAndroidUrl(item.android_url,context,false)
+            }else {
+                UiSwitch.bundle(context, ArticleDetailActivity::class.java, Bundle().apply {
+                    putInt("type", -1)
+                    putString("id", item.data_id)
+                })
+            }
 
         }
     }

app/src/main/java/com/quansu/heifengwuliu/component/CpApp.kt

@@ -9,6 +9,7 @@ import com.hwangjr.rxbus.RxBus
 import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.model.bean.OneLoginBean
 import com.quansu.heifengwuliu.utils.StringUtils
+import com.quansu.heifengwuliu.utils.VerifyUtils
 import com.ysnows.base.ccextension.BIComponent
 import com.ysnows.base.model.PositionBean
 
@@ -40,26 +41,28 @@ open class CpApp() : IComponent, BIComponent() {
 
     fun openMsgList(cc: CC, url: String): Boolean {//打开消息列表
 
-        try {
-            if (url.contains("?")) {
+        VerifyUtils.isAndroidUrl(url,cc.context,true)
 
-                val i = Intent(cc.context, Class.forName(StringUtils.getPureUrl(url)))
-                val bundle = StringUtils.getUrlBundle(url)
-                i.putExtras(bundle!!)
-                i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-                cc.context.startActivity(i)
-
-            } else {
-
-                val i = Intent(cc.context, Class.forName(url))
-                i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-                cc.context.startActivity(i)
-
-
-            }
-        } catch (e: ClassNotFoundException) {
-            e.printStackTrace();
-        }
+//        try {
+//            if (url.contains("?")) {
+//
+//                val i = Intent(cc.context, Class.forName(StringUtils.getPureUrl(url)))
+//                val bundle = StringUtils.getUrlBundle(url)
+//                i.putExtras(bundle!!)
+//                i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+//                cc.context.startActivity(i)
+//
+//            } else {
+//
+//                val i = Intent(cc.context, Class.forName(url))
+//                i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+//                cc.context.startActivity(i)
+//
+//
+//            }
+//        } catch (e: ClassNotFoundException) {
+//            e.printStackTrace();
+//        }
 
 //        try {
 //            //打开自定义的Activity

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -22,16 +22,14 @@ import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentOwnermoreBinding
 import com.quansu.heifengwuliu.inte.ChoiceData
+import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.inte.onTextChangeListener
 import com.quansu.heifengwuliu.model.AddressBean
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.model.SelectData
 import com.quansu.heifengwuliu.model.bean.ReceiveBean
 import com.quansu.heifengwuliu.model.bean.SendBean
-import com.quansu.heifengwuliu.utils.PopuAllCarsUtils
-import com.quansu.heifengwuliu.utils.PopuListUtils
-import com.quansu.heifengwuliu.utils.PopupUtils
-import com.quansu.heifengwuliu.utils.VerifyUtils
+import com.quansu.heifengwuliu.utils.*
 import com.quansu.heifengwuliu.view.SimpleTextWatcher
 import com.quansu.heifengwuliu.vmodel.OwnerMoreVModel
 import com.ysnows.base.model.PositionBean
@@ -127,13 +125,22 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
 
         binding.llIsInsurance.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context(), binding.tvIsInsurance, insurance, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+
+            var list=ArrayList<SelectData>()
+
+            var item1= SelectData("1","是")
+            var item2= SelectData("0","否")
+            list.add(item1)
+            list.add(item2)
+
+            PopuBottomUtils.showList(context(),  list, object : ChoiceListData {
+                override fun onRestuse(code: String?, name: String?) {
                     vm.insurance.value = name
-                    is_insurance = if (name.equals("是")) 1 else 0
+                    is_insurance = code!!.toInt()
 
                 }
             })
+
         }
 
         binding.llAgree.setOnClickListener {

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -28,10 +28,7 @@ import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.model.SelectData
 import com.quansu.heifengwuliu.model.bean.ReceiveBean
 import com.quansu.heifengwuliu.model.bean.SendBean
-import com.quansu.heifengwuliu.utils.PopuAllCarsUtils
-import com.quansu.heifengwuliu.utils.PopuListUtils
-import com.quansu.heifengwuliu.utils.PopupUtils
-import com.quansu.heifengwuliu.utils.VerifyUtils
+import com.quansu.heifengwuliu.utils.*
 import com.quansu.heifengwuliu.view.SimpleTextWatcher
 import com.quansu.heifengwuliu.vmodel.OwnerSingleVModel
 import com.yanzhenjie.permission.AndPermission
@@ -127,7 +124,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
         binding.llChoseUnits.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context(), binding.llChoseUnits, numsTypeList, object : ChoiceData {
+            PopuBottomUtils.showListString(context(), numsTypeList, object : ChoiceData {
                 override fun onRestuse(name: String?) {
                     vm.unit.value = name
                 }
@@ -137,7 +134,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
         binding.llGoodsType.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context(), binding.llGoodsType, goodsTypeList, object : ChoiceListData {
+            PopuBottomUtils.showList(context(), goodsTypeList, object : ChoiceListData {
                 override fun onRestuse(code: String?, name: String?) {
                     goods_type_code = code!!
                     vm.goodstype.value = name
@@ -147,11 +144,17 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
         }
 
         binding.llIsInsurance.setOnClickListener {
+           var list=ArrayList<SelectData>()
 
-            PopuListUtils.showQMUIPopup(context(), binding.tvIsInsurance, insurance, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+           var item1= SelectData("1","是")
+            var item2= SelectData("0","否")
+            list.add(item1)
+            list.add(item2)
+
+            PopuBottomUtils.showList(context(),  list, object : ChoiceListData {
+                override fun onRestuse(code: String?, name: String?) {
                     vm.insurance.value = name
-                    is_insurance = if (name.equals("是")) 1 else 0
+                    is_insurance = code!!.toInt()
 
                 }
             })

app/src/main/java/com/quansu/heifengwuliu/fragment/WayBillFragment.kt

@@ -60,7 +60,7 @@ class WayBillFragment : MBTabFragment<DriverWayBillVModel, FragmentWaybillBindin
 
     override fun initView(view: View?) {
         super.initView(view)
-        binding.tvTitle.text="货源信息"
+        binding.tvTitle.text=getString(R.string.order_information)
 
     }
 

app/src/main/java/com/quansu/heifengwuliu/model/MsgList.kt

@@ -8,6 +8,6 @@ import com.ysnows.base.inter.IModel
  */
 data class MsgList(var data_id:String,var uid:String,var msg_id:String,
                    var is_read:Int,var create_time:String,var update_time:String,
-                   var title:String,var content:String
+                   var title:String,var content:String,var android_url:String
 ): IModel {
 }

app/src/main/java/com/quansu/heifengwuliu/utils/ChosePhotoUtils.java

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.utils;
 
 import android.app.Activity;
 import android.content.Context;
+import android.util.Log;
 import android.view.View;
 
 import com.luck.picture.lib.PictureSelector;
@@ -42,6 +43,7 @@ public class ChosePhotoUtils {
 
 //                                        ImageSelectorUtils.showCameraAction((Activity) context, C.REQUEST_CODE_CAMERA);
 
+                                        Log.e("-shy-", "--相机-- " );
                                         PictureSelector.create((Activity) context)
                                                 .openCamera(PictureMimeType.ofImage())
                                                 .imageEngine(LoadEngin.INSTANCE) // Please refer to the Demo GlideEngine.java

app/src/main/java/com/quansu/heifengwuliu/utils/PopuBottomUtils.kt

@@ -40,4 +40,25 @@ object PopuBottomUtils {
     }
 
 
+
+    fun showListString(context: Context,
+                 list: ArrayList<String>, chose: ChoiceData
+    ) {
+        val builder = BottomListSheetBuilder(context)
+        builder.setGravityCenter(true)
+                .setSkinManager(QMUISkinManager.defaultInstance(context))
+                .setTitle("请选择")
+                .setAddCancelBtn(true)
+                .setAllowDrag(false)
+                .setNeedRightMark(false)
+                .setOnSheetItemClickListener { dialog, itemView, position, tag ->
+                    chose?.onRestuse(list[position])
+                    dialog.dismiss()
+                }
+
+        for (item in list) {
+            builder.addItem(item)
+        }
+        builder.build().show()
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/utils/VerifyUtils.kt

@@ -1,5 +1,8 @@
 package com.quansu.heifengwuliu.utils
 
+import android.content.Context
+import android.content.Intent
+
 /**
  *Created by shihuiyun
  *on 2020/10/16
@@ -26,6 +29,36 @@ object VerifyUtils {
         return  Regex("(^\\d{15}\$)|(^\\d{17}([0-9]|X)\$)").matches(id.toUpperCase())
     }
 
+    /**
+     * 跳转 url地址
+     */
+    fun  isAndroidUrl(url:String,context: Context,flag:Boolean){
+        try {
+            if (url.contains("?")) {
+
+                val i = Intent(context, Class.forName(StringUtils.getPureUrl(url)))
+                val bundle = StringUtils.getUrlBundle(url)
+                i.putExtras(bundle!!)
+                if(flag) {
+                    i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                }
+                context.startActivity(i)
+
+            } else {
+
+                val i = Intent(context, Class.forName(url))
+                if(flag) {
+                    i.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                }
+                context.startActivity(i)
+
+
+            }
+        } catch (e: ClassNotFoundException) {
+            e.printStackTrace();
+        }
+    }
+
 
 }
 

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

@@ -1,375 +1,377 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
 
-    <data >
         <import type="android.view.View" />
 
         <variable
             name="vm"
             type="com.quansu.heifengwuliu.vmodel.ComVerityVModel" />
-    </data >
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingStart="17dp"
         android:background="@color/color_bg"
-        android:paddingEnd="16dp" >
-
+        android:orientation="vertical">
 
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:id="@+id/ll_top"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_marginTop="12dp"
-            app:qmui_borderColor="@color/white"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_radius="@dimen/dp_4"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingBottom="21dp"
-            android:paddingEnd="@dimen/dp_11"
+            android:layout_height="match_parent"
             android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:paddingStart="17dp"
+            android:paddingEnd="16dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:text="@string/bl_upload"
-                android:textColor="#26292F"
-                android:textSize="14sp"
-                 />
 
-            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-                android:id="@+id/img_id_man"
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:id="@+id/ll_top"
                 android:layout_width="match_parent"
-                android:layout_height="166dp"
-                android:layout_marginStart="23dp"
-                android:layout_marginEnd="22dp"
-                android:layout_marginTop="22dp"
-                android:onClick="@{v->vm.choseImg()}"
-                app:qmui_border_color="@color/white"
-                android:scaleType="fitXY"
-                android:src="@drawable/ic_company_bg"
-                app:layout_constraintStart_toStartOf="@id/tv_title"
-                app:layout_constraintTop_toBottomOf="@id/tv_title"
-                app:qmui_radius="1dp"
-                app:url="@{vm.imgBL}" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                android:layout_gravity="center"
-                android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
-                android:orientation="horizontal">
+                android:layout_marginTop="12dp"
+                android:orientation="vertical"
+                android:paddingStart="@dimen/dp_10"
+                android:paddingEnd="@dimen/dp_11"
+                android:paddingBottom="21dp"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_radius="@dimen/dp_4">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="点击上传 "
-                    android:textColor="#7B7B7B"
-                    android:textSize="13sp" />
+                    android:layout_marginTop="14dp"
+                    android:text="@string/bl_upload"
+                    android:textColor="#26292F"
+                    android:textSize="14sp" />
 
-                <TextView
+                <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                    android:id="@+id/img_id_man"
+                    android:layout_width="match_parent"
+                    android:layout_height="166dp"
+                    android:layout_marginStart="23dp"
+                    android:layout_marginTop="22dp"
+                    android:layout_marginEnd="22dp"
+                    android:onClick="@{v->vm.choseImg()}"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_company_bg"
+                    app:layout_constraintStart_toStartOf="@id/tv_title"
+                    app:layout_constraintTop_toBottomOf="@id/tv_title"
+                    app:qmui_border_color="@color/white"
+                    app:qmui_radius="1dp"
+                    app:url="@{vm.imgBL}" />
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="营业执照"
-                    android:textColor="#F5BF41"
-                    android:textSize="13sp" />
-
-
-            </LinearLayout>
-
+                    android:layout_gravity="center"
+                    android:layout_marginTop="9dp"
+                    android:orientation="horizontal"
+                    android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="点击上传 "
+                        android:textColor="#7B7B7B"
+                        android:textSize="13sp" />
 
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="营业执照"
+                        android:textColor="#F5BF41"
+                        android:textSize="13sp" />
 
 
+                </LinearLayout>
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:id="@+id/lay_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:orientation="vertical"
-            android:paddingStart="11dp"
-            android:paddingTop="3dp"
-            android:paddingEnd="11dp"
-            android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
-            android:paddingBottom="3dp"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="@color/white"
-            app:qmui_radius="4dp">
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="公司名称" />
-
-                <com.ysnows.base.widget.DelEditText
-                    android:id="@+id/edt_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:hint="请输入公司名称"
-                    android:paddingStart="@dimen/dp_18"
-                    android:gravity="right|center"
-                    android:text="@={vm.name}"
-                    android:textColorHint="#979899"
-                    android:textColor="#26292F"
-                    android:textSize="@dimen/sp_13" />
-
-
-            </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_marginEnd="3dp"
-                android:layout_marginStart="2dp"
-                android:background="@color/line_color"
-                android:layout_height="@dimen/dp_1"/>
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-            <LinearLayout
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:id="@+id/lay_input"
                 android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:orientation="vertical"
+                android:paddingStart="11dp"
+                android:paddingTop="3dp"
+                android:paddingEnd="11dp"
+                android:paddingBottom="3dp"
+                android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_radius="4dp">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="统一社会信用代码" />
 
-                <com.ysnows.base.widget.DelEditText
-                    android:id="@+id/edt_id_number"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:hint="请输入证件编号"
-                    android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.iDNumber}"
-                    android:gravity="center|right"
-                    android:textColor="#26292F"
-                    android:textColorHint="#979899"
-                    android:textSize="@dimen/sp_13" />
-
-            </LinearLayout>
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="公司名称"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
+
+                    <com.ysnows.base.widget.DelEditText
+                        android:id="@+id/edt_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="right|center"
+                        android:hint="请输入公司名称"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@={vm.name}"
+                        android:textColor="#26292F"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@color/line_color" />
 
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_marginEnd="3dp"
-                android:layout_marginStart="2dp"
-                android:background="@color/line_color"
-                android:layout_height="@dimen/dp_1"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="统一社会信用代码"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
+
+                    <com.ysnows.base.widget.DelEditText
+                        android:id="@+id/edt_id_number"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="center|right"
+                        android:hint="请输入证件编号"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@={vm.iDNumber}"
+                        android:textColor="#26292F"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13" />
+
+                </LinearLayout>
+
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@color/line_color" />
 
 
-            <LinearLayout
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="公司地址"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
+
+                    <com.ysnows.base.widget.DelEditText
+                        android:id="@+id/edt_addr"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="center|right"
+                        android:hint="请输入公司地址"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@={vm.companyAddr}"
+                        android:textColor="#26292F"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13" />
+
+                </LinearLayout>
+
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="公司地址" />
-
-                <com.ysnows.base.widget.DelEditText
-                    android:id="@+id/edt_addr"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:orientation="vertical"
+                android:paddingStart="11dp"
+                android:paddingTop="3dp"
+                android:paddingEnd="11dp"
+                android:paddingBottom="3dp"
+                android:visibility="@{vm.isShow?View.GONE :View.VISIBLE}"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_radius="4dp">
+
+
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:hint="请输入公司地址"
-                    android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.companyAddr}"
-                    android:gravity="center|right"
-                    android:textColor="#26292F"
-                    android:textColorHint="#979899"
-                    android:textSize="@dimen/sp_13" />
-
-            </LinearLayout>
-
-
-
-
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="公司名称"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="right|center"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@{vm.name}"
+                        android:textColor="#26292F"
+                        android:textSize="@dimen/sp_13" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@color/line_color" />
 
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:orientation="vertical"
-            android:paddingStart="11dp"
-            android:paddingTop="3dp"
-            android:paddingEnd="11dp"
-            android:visibility="@{vm.isShow?View.GONE :View.VISIBLE}"
-            android:paddingBottom="3dp"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="@color/white"
-            app:qmui_radius="4dp">
-
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="统一社会信用代码"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:gravity="center|right"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@={vm.iDNumber}"
+                        android:textColor="#26292F"
+                        android:textSize="@dimen/sp_13" />
+
+                </LinearLayout>
+
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="3dp"
+                    android:background="@color/line_color" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="公司名称" />
 
-                <TextView
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:paddingStart="@dimen/dp_18"
-                    android:gravity="right|center"
-                    android:text="@{vm.name}"
-                    android:textColor="#26292F"
-                    android:textSize="@dimen/sp_13" />
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:minWidth="56dp"
+                        android:text="公司地址"
+                        android:textColor="#26292F"
+                        android:textSize="14sp" />
 
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center|right"
+                        android:paddingStart="@dimen/dp_18"
+                        android:text="@={vm.companyAddr}"
+                        android:textColor="#26292F"
+                        android:textSize="@dimen/sp_13" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_marginEnd="3dp"
-                android:layout_marginStart="2dp"
-                android:background="@color/line_color"
-                android:layout_height="@dimen/dp_1"/>
+                </LinearLayout>
 
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="统一社会信用代码" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.iDNumber}"
-                    android:gravity="center|right"
-                    android:textColor="#26292F"
-                    android:textSize="@dimen/sp_13" />
-
-            </LinearLayout>
+            <TextView
+                android:id="@+id/tv_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:text="@string/personal_verify_tip"
+                android:textColor="#767778"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/lay_input" />
 
 
-            <View
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_marginEnd="3dp"
-                android:layout_marginStart="2dp"
-                android:background="@color/line_color"
-                android:layout_height="@dimen/dp_1"/>
-
+                android:layout_height="wrap_content"
+                android:layout_marginTop="13dp"
+                android:onClick="@{v->vm.toSubmit()}"
+                android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_tip">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:layout_height="50dp">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="#26292F"
-                    android:textSize="14sp"
-                    android:minWidth="56dp"
-                    android:text="公司地址" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.companyAddr}"
-                    android:gravity="center|right"
-                    android:textColor="#26292F"
-                    android:textSize="@dimen/sp_13" />
-
-            </LinearLayout>
-
-
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-
-
-
-        <TextView
-            android:id="@+id/tv_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            android:text="@string/personal_verify_tip"
-            android:textColor="#767778"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/lay_input" />
-
-
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_marginTop="13dp"
-            android:onClick="@{v->vm.toSubmit()}"
-            android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_tip"
-            android:layout_height="wrap_content">
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="106dp"
-                android:src="@drawable/ic_details_grab" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_gravity="center"
-                android:text="提交"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:layout_height="wrap_content">
-
-            </TextView>
+                    android:layout_gravity="center"
+                    android:layout_marginTop="10dp"
+                    android:text="提交"
+                    android:textColor="@color/white"
+                    android:textSize="16sp">
 
-        </FrameLayout>
+                </TextView>
 
+            </FrameLayout>
 
 
-    </LinearLayout >
+        </LinearLayout>
+    </LinearLayout>
 
-</layout >
+</layout>

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

@@ -311,6 +311,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="新支付密码："
+                        android:layout_marginEnd="10dp"
                         android:textColor="@color/text_title"
                         android:textSize="@dimen/sp_14">
 
@@ -320,9 +321,12 @@
                         android:id="@+id/ppet_new_password"
                         android:layout_width="match_parent"
                         android:layout_height="45dp"
+                        android:layout_below="@+id/tv_title"
+                        android:layout_centerInParent="true"
                         app:cipherEnable="true"
                         app:passwordLength="6"
-                        app:smode="rect">
+                        app:borderColor="#979797"
+                        app:smode="underline">
 
                     </com.quansu.heifengwuliu.view.PasswordView>
 

app/src/main/res/values/strings.xml

@@ -514,6 +514,7 @@ Api 已达到使用限制
     <string name="contact_information">平台联系方式：</string>
     <string name="vehicle">辆</string>
     <string name="apply_for_invoice">申请开票</string>
+    <string name="order_information">订单信息</string>
 
 
 </resources >

jpush/src/main/java/com/quansu/jpush/componnent/CpJpush.kt

@@ -130,7 +130,9 @@ class CpJpush : BIComponent(), IComponent {
                     //Toasts.toast(getContext(), "用户取消一键登录");
                     return@loginAuth
                 }
-                Toast.makeText(cc.context,content,Toast.LENGTH_SHORT).show()
+               // Toast.makeText(cc.context,content,Toast.LENGTH_SHORT).show()
+
+                Toast.makeText(cc.context,"一键登录失败",Toast.LENGTH_SHORT).show()
 
             }
         }