1.1.6

app/build.gradle

@@ -55,7 +55,7 @@ android {
             applicationId rootProject.ext.android.applicationId
             manifestPlaceholders = [CHANNEL_VALUE: "企业端(测试)"]
 
-            buildConfigField "String", "BASE_URL", "\"http://pass.dahehuoyun.com:8091/\""
+            buildConfigField "String", "BASE_URL", "\"http://192.168.1.129:8091/\""
             buildConfigField "String", "BASE_HEAD_URL", "\"http://47.104.167.116:8080/guns/gunsApi/kaptcha/\""
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
@@ -64,7 +64,7 @@ android {
         sign_product {
             applicationId rootProject.ext.android.applicationId
             manifestPlaceholders = [CHANNEL_VALUE: "企业端"]
-            buildConfigField "String", "BASE_URL", "\"http://pass.dahehuoyun.com:8091/\""
+            buildConfigField "String", "BASE_URL", "\"http://pass.test.dahehuoyun.com:8091/\""
             buildConfigField "String", "BASE_HEAD_URL", "\"http://47.104.167.116:8080/guns/gunsApi/kaptcha/\""
             buildConfigField "boolean", "isTest", "false"
 //            resValue "string", "appName", "审核"

app/sign_product/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 8,
+      "versionCode": 12,
-      "versionName": "1.0.8",
+      "versionName": "1.1.2",
-      "outputFile": "企业端正式_release_1.0.8_202204061736.apk"
+      "outputFile": "企业端正式_release_1.1.2_202204251458.apk"
     }
   ]
 }

app/src/main/java/com/dahe/pass/base/AppConfig.java

@@ -11,5 +11,8 @@ public class AppConfig {
     public static final String BEAN= "DA_HE_BEAN";
     public static String START_TIME= "DA_HE_START_TIME";
     public static String END_TIME= "DA_HE_END_TIME";
+    public static String PHONE= "DA_HE_PHONE";
+    public static String PWD= "DA_HE_PWD";
+    public static String REISTER= "DA_HE_REISTER";
     public static final String CODE= "DA_HE_PHONE";
 }

app/src/main/java/com/dahe/pass/bean/ComFirstBean.java

@@ -0,0 +1,100 @@
+package com.dahe.pass.bean;
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+import java.util.jar.Attributes;
+
+/**
+ * @ClassName ComFirstBean
+ * @Author 用户
+ * @Date 2022/4/12 10:25
+ * @Description TODO
+ */
+public class ComFirstBean implements IPickerViewData {
+    private String searchValue;
+    private String createTime;
+    private String deptName;
+    private String phone;
+    private String parentId;
+    private String deptId;
+    private String signName;
+    private String sign;
+    private String startWith;
+
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getSignName() {
+        return signName;
+    }
+
+    public void setSignName(String signName) {
+        this.signName = signName;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getStartWith() {
+        return startWith;
+    }
+
+    public void setStartWith(String startWith) {
+        this.startWith = startWith;
+    }
+
+    @Override
+    public String getPickerViewText() {
+        return signName;
+    }
+}

app/src/main/java/com/dahe/pass/bean/ComSecondBean.java

@@ -0,0 +1,56 @@
+package com.dahe.pass.bean;
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName ComSecondBean
+ * @Author 用户
+ * @Date 2022/4/12 9:39
+ * @Description TODO
+ */
+public class ComSecondBean implements Serializable , IPickerViewData {
+
+    private String childSignId;
+    private String childSign;
+    private String childSignName;
+    private String childStartWith;
+
+    public String getChildSignId() {
+        return childSignId;
+    }
+
+    public void setChildSignId(String childSignId) {
+        this.childSignId = childSignId;
+    }
+
+    public String getChildSign() {
+        return childSign;
+    }
+
+    public void setChildSign(String childSign) {
+        this.childSign = childSign;
+    }
+
+    public String getChildSignName() {
+        return childSignName;
+    }
+
+    public void setChildSignName(String childSignName) {
+        this.childSignName = childSignName;
+    }
+
+    public String getChildStartWith() {
+        return childStartWith;
+    }
+
+    public void setChildStartWith(String childStartWith) {
+        this.childStartWith = childStartWith;
+    }
+
+    @Override
+    public String getPickerViewText() {
+        return childSignName;
+    }
+}

app/src/main/java/com/dahe/pass/bean/CompanyBean.java

@@ -3,6 +3,7 @@ package com.dahe.pass.bean;
 import com.contrarywind.interfaces.IPickerViewData;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 
 /**
  * @ClassName CompanyBean
@@ -10,7 +11,7 @@ import java.io.Serializable;
  * @Date 2022/1/15 9:05
  * @Description TODO
  */
-public class CompanyBean implements Serializable , IPickerViewData {
+public class CompanyBean implements IPickerViewData {
     private String searchValue;
     private String createTime;
     private String deptName;
@@ -19,7 +20,25 @@ public class CompanyBean implements Serializable , IPickerViewData {
     private String deptId;
     private String signName;
     private String sign;
+    private String startWith;
 
+    private ArrayList<ComSecondBean> appleInfoVos;
+
+    public ArrayList<ComSecondBean> getAppleInfoVos() {
+        return appleInfoVos;
+    }
+
+    public void setAppleInfoVos(ArrayList<ComSecondBean> appleInfoVos) {
+        this.appleInfoVos = appleInfoVos;
+    }
+
+    public String getStartWith() {
+        return startWith;
+    }
+
+    public void setStartWith(String startWith) {
+        this.startWith = startWith;
+    }
 
     public String getSignName() {
         return signName;

app/src/main/java/com/dahe/pass/net/Api.java

@@ -67,6 +67,12 @@ public interface Api {
     @POST(BASE_URL+"apply/approval/company/list")
     Observable<CommonResponseBean<List<CompanyBean>>> companyLst();
 
+    @POST(BASE_URL+"apply/approval/company/list")
+    Observable<CommonResponseBean<List<CompanyBean>>> companyLst(@Query("sign") String sign);
+
+    @POST(BASE_URL+"apply/approval/pid/list")
+    Observable<CommonResponseBean<List<CompanyBean>>> pidList();
+
     @POST(BASE_URL+"apply/enterprise/type/list")
     Observable<CommonResponseBean<List<CompanyTypeBean>>> typeLst(@Query("sign") String sign);
 
@@ -81,6 +87,17 @@ public interface Api {
     @POST(BASE_URL+"use/of/pass/count")
     Observable<CommonResponseBean<PassBean>> passCount(@Query("useDate") String usedate);
 
+    @GET(BASE_URL+"use/notReport/getTodayInfo")
+    Observable<CommonResponseBean<ApplyBean>> getTodayInfo(@Query("useDate") String usedate);
+
+    @POST(BASE_URL+"apply/approval/pid/all")
+    Observable<CommonResponseBean<ArrayList<CompanyBean>>> pidAll();
+
+
+    //新增用户不上报信息
+    @POST(BASE_URL+"use/notReport/add")
+    Observable<CommonResponseBean> notReportadd(@Query("useDate") String useDate);
+
     @POST(BASE_URL+"apply/count")
     Observable<CommonResponseBean<PassBean>> applyCount(@Query("updateStartTime") String createTime,@Query("updateEndTime") String updateEndTime);
 
@@ -104,5 +121,11 @@ public interface Api {
     @POST(BASE_URL+"use/of/pass/importData")
     Observable<CommonResponseBean> importData(@Body PassBean passBean);
 
+    @POST(BASE_URL+"user/lookSmsCode")
+    Observable<CommonResponseBean> lookSmsCode(@Query("phone") String phone,@Query("code") String code);
+
+    @GET(BASE_URL+"use/of/pass/getPassNoInfo")
+    Observable<CommonResponseBean> getPassNoInfo(@Query("passNo") String passNo);
+
 }
 

app/src/main/java/com/dahe/pass/ui/account/LoginActivity.kt

@@ -1,6 +1,9 @@
 package com.dahe.pass.ui.account
 
 import android.Manifest
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import android.text.method.HideReturnsTransformationMethod
@@ -11,6 +14,7 @@ import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.net.JsonUtils
 import com.dahe.mylibrary.utils.ActivityUtils
 import com.dahe.pass.R
+import com.dahe.pass.base.AppConfig
 import com.dahe.pass.bean.UserBean
 import com.dahe.pass.net.BaseObserver
 import com.dahe.pass.net.DataManager
@@ -19,6 +23,7 @@ import com.dahe.pass.ui.HomeActivity
 import com.dahe.pass.ui.account.activity.RegisterActivity
 import com.dahe.pass.utils.AppActivityUtils
 import com.dahe.pass.utils.SPUtils
+import com.lxj.xpopup.util.KeyboardUtils
 import kotlinx.android.synthetic.main.activity_login.*
 import pub.devrel.easypermissions.AppSettingsDialog
 import pub.devrel.easypermissions.EasyPermissions
@@ -86,7 +91,9 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View.
             R.id.tv_yszc -> AppActivityUtils.openWebViewActivity(this, "隐私政策",
                 "https://downtest.dahehuodongbao.com/passcheck/user-privacy.html")
 
-            R.id.tvZc, R.id.tvXyh -> ActivityUtils.startActivity(this, RegisterActivity::class.java)
+            R.id.tvZc, R.id.tvXyh -> ActivityUtils.startActivityForResult(this,
+                RegisterActivity::class.java,
+                0)
 
         }
     }
@@ -106,6 +113,7 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View.
      * 密码登录
      */
     private fun logByPass() {
+        KeyboardUtils.hideSoftInput(et_phone)
         val s: String = et_phone.getText().toString().trim()
         val s1: String = et_pass.getText().toString().trim()
         if (TextUtils.isEmpty(s) || TextUtils.isEmpty(s1)) {
@@ -188,4 +196,13 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View.
                 .setRationale("如果没有请求的权限，此应用可能无法正常工作。 打开应用程序设置屏幕以修改应用程序权限").build().show()
         }
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (data != null && resultCode == RESULT_OK) {
+//            val extras = data.extras
+//            et_phone.setText(extras?.getString(AppConfig.PHONE))
+//            et_pass.setText(extras?.getString(AppConfig.PWD))
+        }
+    }
 }

app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt

@@ -1,6 +1,7 @@
 package com.dahe.pass.ui.account.activity
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
@@ -23,6 +24,7 @@ import com.dahe.pass.net.RxHttpCallBack
 import com.dahe.pass.ui.account.LoginActivity
 import com.dahe.pass.utils.AppActivityUtils
 import com.dahe.pass.utils.GetJsonDataUtil
+import com.dahe.pass.utils.SPUtils
 import com.google.gson.Gson
 import com.lxj.xpopup.XPopup
 import com.lxj.xpopup.util.KeyboardUtils
@@ -56,8 +58,36 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener {
     }
 
     override fun initDate() {
+        val get = SPUtils.get(this, AppConfig.REISTER, "")
+        if (get is BusInfoBean){
+            etNsr.setText(get.unifiedSocialCreditCode)
+            etQymc.setText(get.enterpriseName)
+            etDj.setText(get.nationalClassA)
+            etDz.setText(get.placeOfRegistration)
+            etGsdz.setText(get.companyAddress)
+            etFzr.setText(get.contacts)
+            etFzrPhone.setText(get.contactsPhone)
+            etTbr.setText(get.name)
+        }
     }
 
+    override fun onStop() {
+        super.onStop()
+        val busInfoBean = BusInfoBean()
+
+        busInfoBean.unifiedSocialCreditCode = etNsr.text.toString()
+        busInfoBean.enterpriseName = etQymc.text.toString()
+        busInfoBean.nationalClassA = etDj.text.toString()
+        busInfoBean.placeOfRegistration = etDz.text.toString()
+        busInfoBean.companyAddress = etGsdz.text.toString()
+        busInfoBean.contacts = etFzr.text.toString()
+        busInfoBean.contactsPhone = etFzrPhone.text.toString()
+        busInfoBean.name = etTbr.text.toString()
+
+        SPUtils.put(this,AppConfig.REISTER,busInfoBean)
+    }
+
+
     override fun onClick(view: View) {
         super.onClick(view)
         when (view.id) {
@@ -155,10 +185,10 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener {
             return
         }
 
-        if (!::curCompanyBean.isInitialized) {
+//        if (!::curCompanyBean.isInitialized) {
-            showToast("请完善审批单位")
+//            showToast("请完善审批单位")
-            return
+//            return
-        }
+//        }
 
         if (etNsr.text.toString().isNullOrEmpty() || etFzr.text.toString().isNullOrEmpty() ||
             etFzrPhone.text.toString().isNullOrEmpty() || etDj.text.toString().isNullOrEmpty() ||
@@ -180,7 +210,7 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener {
         busInfoBean.unifiedSocialCreditCode = etNsr.text.toString()
         busInfoBean.enterpriseName = qymc
         busInfoBean.nationalClassA = etDj.text.toString()
-        busInfoBean.approvedBy = curCompanyBean.sign
+//        busInfoBean.approvedBy = curCompanyBean.sign
 //        busInfoBean.businessType = ywlx
         busInfoBean.placeOfRegistration = etDz
         busInfoBean.companyAddress = etGsdz.text.toString()
@@ -196,6 +226,11 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener {
             .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
                 override fun onSuccess(t: CommonResponseBean<Any>?) {
                     super.onSuccess(t)
+
+//                    val intent = Intent("com.dahehaoyun.log.info")
+//                    intent.putExtra(AppConfig.PHONE,bean.phone)
+//                    intent.putExtra(AppConfig.PWD,bean.pwd)
+//                    sendBroadcast(intent)
                     ActivityUtils.finishOtherActivities(LoginActivity::class.java)
                 }
             }))

app/src/main/java/com/dahe/pass/ui/account/activity/RegisterActivity.kt

@@ -1,5 +1,6 @@
 package com.dahe.pass.ui.account.activity
 
+import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import android.text.method.HideReturnsTransformationMethod
@@ -18,6 +19,7 @@ import com.dahe.pass.net.DataManager
 import com.dahe.pass.net.RxHttpCallBack
 import com.dahe.pass.ui.HomeActivity
 import com.dahe.pass.utils.AppActivityUtils
+import com.lxj.xpopup.util.KeyboardUtils
 import kotlinx.android.synthetic.main.activity_register.*
 import java.util.*
 
@@ -89,6 +91,7 @@ class RegisterActivity : BaseActivity(), View.OnClickListener {
     }
 
     fun next() {
+        KeyboardUtils.hideSoftInput(etPhone)
         val phone = etPhone.text.toString()
         val code = etCode.text.toString()
         val pwd = etPass.text.toString()
@@ -97,17 +100,38 @@ class RegisterActivity : BaseActivity(), View.OnClickListener {
             showToast("请完善信息")
             return
         }
-        val busInfoBean = BusInfoBean()
-        busInfoBean.phone = phone
 
-        val paramsDao = BusInfoBean.ParamsDao()
+        DataManager.getInstance().lookSmsCode(phone,code)
-        paramsDao.code = code
+            .compose(DataManager.setThread())
-        busInfoBean.params = paramsDao
+            .subscribe(BaseObserver(this,object : RxHttpCallBack<Any>(){
+                override fun onSuccess(t: CommonResponseBean<Any>?) {
+                    super.onSuccess(t)
+                    val busInfoBean = BusInfoBean()
+                    busInfoBean.phone = phone
 
-        busInfoBean.pwd = pwd
+                    val paramsDao = BusInfoBean.ParamsDao()
-        val bundle = Bundle()
+                    paramsDao.code = code
-        bundle.putSerializable(AppConfig.BEAN, busInfoBean)
+                    busInfoBean.params = paramsDao
-        ActivityUtils.startActivity(mContext, BusinessInfoActivity::class.java, bundle)
+
+                    busInfoBean.pwd = pwd
+                    val bundle = Bundle()
+                    bundle.putSerializable(AppConfig.BEAN, busInfoBean)
+                    ActivityUtils.startActivity(mContext, BusinessInfoActivity::class.java, bundle)
+                }
+            }))
+
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+//        val intent = Intent()
+//        val bundle = Bundle()
+//        bundle.putString(AppConfig.PHONE,etPhone.text.toString())
+//        bundle.putString(AppConfig.PHONE,etPass.text.toString())
+//        intent.putExtras(bundle)
+//        setResult(RESULT_OK,intent)
+//        finish()
     }
 
 }

app/src/main/java/com/dahe/pass/ui/gone/GoneFragment.kt

@@ -20,6 +20,7 @@ import com.dahe.mylibrary.utils.TimeUtil
 import com.dahe.pass.R
 import com.dahe.pass.adapter.GoneAdapter
 import com.dahe.pass.base.AppConfig
+import com.dahe.pass.bean.ApplyBean
 import com.dahe.pass.bean.PassBean
 import com.dahe.pass.net.BaseObserver
 import com.dahe.pass.net.DataManager
@@ -27,6 +28,7 @@ import com.dahe.pass.net.RxHttpCallBack
 import com.dahe.pass.ui.gone.activity.AddGoActivity
 import com.dahe.pass.ui.gone.activity.EditGoActivity
 import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.interfaces.OnConfirmListener
 import kotlinx.android.synthetic.main.fragment_gone.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -71,6 +73,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener {
 
         tvSearch.setOnClickListener(this)
         llClear.setOnClickListener(this)
+        tvNoUse.setOnClickListener(this)
         tvSearch.addTextChangedListener {
             if (it.toString().length > 0) {
                 llClear.visibility = View.VISIBLE
@@ -82,7 +85,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode==10005){
+        if (requestCode == 10005) {
             val data1 = data?.data
             //文件名
             val path = PickUtils.getPath(getContext(), data1)
@@ -94,6 +97,7 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener {
     override fun onClick(v: View) {
         when (v.id) {
             R.id.tvSearch -> setBir(tvSearch)
+            R.id.tvNoUse -> noUse()
             R.id.llClear -> {
                 tvSearch.text = ""
                 initData()
@@ -104,6 +108,45 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener {
     override fun getRefreshDate(stat: Int, page: Int, count: Int) {
     }
 
+    fun isShowNoUse(){
+        DataManager.getInstance().getTodayInfo("")
+            .compose(DataManager.setThread())
+            .subscribe(BaseObserver(mContext,object : RxHttpCallBack<ApplyBean>(){
+                override fun onSuccess(t: CommonResponseBean<ApplyBean>) {
+                    super.onSuccess(t)
+                    val data = t.data
+                    if (null == data.enterpriseName){
+                        tvNoUse.visibility = View.VISIBLE
+                    }else{
+                        tvNoUse.visibility = View.GONE
+                    }
+                }
+            }))
+    }
+
+    fun noUse() {
+        XPopup.Builder(activity)
+            .dismissOnBackPressed(true)
+            .dismissOnTouchOutside(true)
+//                        .hasNavigationBar(false)
+            .isDestroyOnDismiss(true)
+            .asConfirm("温馨提示", "当您提交当天未使用后，当天是不可以再上报了，你确认定要提交吗？",
+                "取消", "确定",
+                object : OnConfirmListener {
+                    override fun onConfirm() {
+                        DataManager.getInstance().notReportadd(TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd",
+                            Locale.getDefault())))
+                            .compose(DataManager.setThread())
+                            .subscribe(BaseObserver(activity,object : RxHttpCallBack<Any>(){
+                                override fun onSuccess(t: CommonResponseBean<Any>?) {
+                                    super.onSuccess(t)
+                                    tvNoUse.visibility = View.GONE
+                                }
+                            }))
+                    }
+                }, null, false).show()
+    }
+
     fun initData() {
         DataManager.getInstance().passCount(tvSearch.text.toString())
             .compose(DataManager.setThread())
@@ -131,6 +174,8 @@ class GoneFragment : BaseFragment(), RefreshCallBack, View.OnClickListener {
                     applyAdapter.setList(t?.data?.rows)
                 }
             }))
+
+        isShowNoUse()
 //        Observable.zip(DataManager.getInstance().passCount(),
 //            DataManager.getInstance().passList(tvSearch.text.toString()),
 //            { item1, item2 ->

app/src/main/java/com/dahe/pass/ui/gone/activity/AddGoActivity.kt

@@ -29,8 +29,10 @@ import com.dahe.pass.utils.GetJsonDataUtil
 import com.dahe.pass.utils.SPUtils
 import com.google.gson.Gson
 import com.king.keyboard.KingKeyboard
+import com.lxj.xpopup.XPopup
 import com.lxj.xpopup.util.KeyboardUtils
 import kotlinx.android.synthetic.main.activity_add_go.*
+import kotlinx.android.synthetic.main.activity_business_info.*
 import org.json.JSONArray
 import java.text.SimpleDateFormat
 import java.util.*
@@ -44,8 +46,8 @@ import java.util.*
  */
 class AddGoActivity : BaseActivity(), View.OnClickListener {
 
-    private var pointType : Int = 0
+    private var pointType: Int = 0
-    private lateinit var kingKeyboard : KingKeyboard
+    private lateinit var kingKeyboard: KingKeyboard
 
     override fun getLayout() = R.layout.activity_add_go
 
@@ -61,13 +63,14 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
         etQd.setOnClickListener(this)
         etZd.setOnClickListener(this)
         tvUpTime.setOnClickListener(this)
+        tvType.setOnClickListener(this)
 //        tvTxbh.filters = arrayOf<InputFilter>(InputFilterMinMax(0,2455))
         etDs.filters = arrayOf<InputFilter>(NumRangeInputFilter())
 //        tvSTime.text = SPUtils.get(mContext,AppConfig.START_TIME, "").toString()
 //        tvETime.text = SPUtils.get(mContext,AppConfig.END_TIME, "").toString()
 
-        kingKeyboard = KingKeyboard(this,keyboardParent)
+        kingKeyboard = KingKeyboard(this, keyboardParent)
-        kingKeyboard.register(etCarNum,KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE)
+        kingKeyboard.register(etCarNum, KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE)
     }
 
     override fun initDate() {
@@ -98,6 +101,7 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
             R.id.tvStartTime -> setBir(2, tvStartTime)
             R.id.tvEndTime -> setBir(3, tvEndTime)
             R.id.tvSflx -> freeOrBuy()
+            R.id.tvType -> choiceType()
             R.id.etQd -> {
                 KeyboardUtils.hideSoftInput(tvTxbh)
                 if (isLoaded) {
@@ -121,31 +125,48 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
     }
 
 
+    fun choiceType() {
+        XPopup.Builder(this).hasShadowBg(false).offsetY(50).atView(tvType)
+//            .popupWidth(500)
+            .asAttachList(arrayOf("FG", "SW"),
+                null,
+                { position, text -> tvType.text = text+"-" }).show()
+    }
 
     fun sub() {
         KeyboardUtils.hideSoftInput(tvTxbh)
 
         val toString = tvTxbh.text.toString()
         val substring = toString.substring(0, 1)
-        if ("0"!=substring){
+//        if ("0" != substring) {
-            showToast("通行证编号需 0 开头")
+//            showToast("通行证编号需 0 开头")
-            return
+//            return
-        }
+//        }
-        val toDouble = tvTxbh.text.toString().toDouble()
+//        val toDouble = tvTxbh.text.toString().toDouble()
-        if (toDouble<1101){
+//        if (toDouble < 1101) {
-            showToast("通行证编号不能小于1101")
+//            showToast("通行证编号不能小于1101")
-            return
+//            return
-        }
+//        }
+//
+//        if (toDouble > 2455) {
+//            showToast("通行证编号不能大于2455")
+//            return
+//        }
 
-        if (toDouble>2455){
+
-            showToast("通行证编号不能大于2455")
+        DataManager.getInstance().getPassNoInfo("""${tvType.text.toString()}${tvTxbh.text.toString()}""")
-            return
+            .compose(DataManager.setThread())
-        }
+            .subscribe(BaseObserver(mContext,object : RxHttpCallBack<Any>(){
+                override fun onSuccess(t: CommonResponseBean<Any>?) {
+                    super.onSuccess(t)
+                }
+            }))
 
         if (tvTxbh.text.toString().isNullOrEmpty() ||
             etCarNum.text.toString().isNullOrEmpty() || etName.text.toString().isNullOrEmpty() ||
             etPhone.text.toString().isNullOrEmpty() || etWpzl.text.toString().isNullOrEmpty() ||
-            etDs.text.toString().isNullOrEmpty() || etQd.text.toString().isNullOrEmpty()|| etCardId.text.toString().isNullOrEmpty()
+            etDs.text.toString().isNullOrEmpty() || etQd.text.toString()
+                .isNullOrEmpty() || etCardId.text.toString().isNullOrEmpty()
         ) {
             showToast("请完善信息")
             return
@@ -154,8 +175,9 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
 
 
 
+
         val passBean = PassBean()
-        passBean.passNo = """FG-${tvTxbh.text.toString()}"""
+        passBean.passNo = """${tvType.text.toString()}${tvTxbh.text.toString()}"""
         passBean.vehicle = etCarNum.text.toString()
         passBean.driverName = etName.text.toString()
         passBean.driverPhone = etPhone.text.toString()
@@ -178,8 +200,8 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
                     super.onSuccess(t)
                     showToast("车辆添加成功")
                     finish()
-                    SPUtils.put(mContext,AppConfig.START_TIME,passBean.useStartTime)
+                    SPUtils.put(mContext, AppConfig.START_TIME, passBean.useStartTime)
-                    SPUtils.put(mContext,AppConfig.END_TIME,passBean.useStartTime)
+                    SPUtils.put(mContext, AppConfig.END_TIME, passBean.useStartTime)
                 }
             }))
     }
@@ -212,8 +234,8 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
 //                Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show()
             }
             .build<CompanyBean>()
-        mutableListOf.add(CompanyBean("免费","0"))
+        mutableListOf.add(CompanyBean("免费", "0"))
-        mutableListOf.add(CompanyBean("收费","1"))
+        mutableListOf.add(CompanyBean("收费", "1"))
 
 
 
@@ -286,9 +308,9 @@ class AddGoActivity : BaseActivity(), View.OnClickListener {
                 ) options3Items.get(options1).get(options2).get(options3) else ""
             val tx = "$opt1tx-$opt2tx-$opt3tx"
 //            tvDz.text = tx
-            if (0== pointType){
+            if (0 == pointType) {
                 etQd.text = tx
-            }else{
+            } else {
                 etZd.text = tx
             }
         }

app/src/main/java/com/dahe/pass/ui/gone/activity/EditGoActivity.kt

@@ -105,7 +105,7 @@ class EditGoActivity : BaseActivity(), View.OnClickListener {
 
     fun sub() {
         KeyboardUtils.hideSoftInput(tvTxbh)
-        if (tvTxbh.text.toString().isNullOrEmpty() || tvSTime.text.toString().isNullOrEmpty() ||
+        if (tvTxbh.text.toString().isNullOrEmpty() ||
             etCarNum.text.toString().isNullOrEmpty() || etName.text.toString().isNullOrEmpty() ||
             etPhone.text.toString().isNullOrEmpty() || etWpzl.text.toString().isNullOrEmpty() ||
             etDs.text.toString().isNullOrEmpty() || etQd.text.toString().isNullOrEmpty()

app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt

@@ -21,8 +21,10 @@ import com.dahe.pass.utils.SPUtils
 import com.google.gson.Gson
 import com.lxj.xpopup.util.KeyboardUtils
 import kotlinx.android.synthetic.main.activity_apply.*
+import kotlinx.android.synthetic.main.activity_apply.etQymc
+import kotlinx.android.synthetic.main.activity_business_info.*
 import org.json.JSONArray
-import java.util.ArrayList
+import java.util.*
 
 /**
  * @ClassName ApplyActivity
@@ -34,6 +36,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
 
     lateinit var curCompanyBean: CompanyBean
     lateinit var curCompanyType: CompanyTypeBean
+    lateinit var childSign: String
     lateinit var jb: String
     lateinit var sheng: String
     lateinit var shi: String
@@ -53,7 +56,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
         tvSflx.setOnClickListener(this)
 
         val userInfo = SPUtils.getUserInfo(this).userInfo
-        if (null!=userInfo){
+        if (null != userInfo) {
             etLxr.text = userInfo.contacts
             etPhone.text = userInfo.contactsPhone
         }
@@ -173,25 +176,34 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
         build.show()
     }
 
-
+    private  var opt1: MutableList<CompanyBean> = mutableListOf()
+    private  var opt2: MutableList<MutableList<ComSecondBean>> = mutableListOf()
     fun spdw() {
         KeyboardUtils.hideSoftInput(etQymc)
-        DataManager.getInstance().companyLst()
+
+        opt1.clear()
+        opt2.clear()
+
+        DataManager.getInstance().pidAll()
             .compose(DataManager.setThread())
-            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<List<CompanyBean>>(this) {
+            .subscribe(BaseObserver(this, object : RxHttpCallBack<ArrayList<CompanyBean>>() {
-                override fun onSuccess(t: CommonResponseBean<List<CompanyBean>>) {
+                override fun onSuccess(t: CommonResponseBean<ArrayList<CompanyBean>>) {
                     super.onSuccess(t)
                     val data = t.data
+                    data.forEach {
+                        opt1.add(it)
+                        opt2.add(it.appleInfoVos)
+                    }
 
-
+                    val pvOptions: OptionsPickerView<*> = OptionsPickerBuilder(mContext
-                    val mutableListOf = mutableListOf<CompanyBean>()
-                    val build = OptionsPickerBuilder(mContext
                     ) { options1, options2, options3, v -> //返回的分别是三个级别的选中位置
-                        curCompanyBean = mutableListOf.get(options1)
+//                        var tx =(opt1[options1].pickerViewText
-                        tvSpdw.text = mutableListOf.get(options1).signName
+//                                + opt2[options1][options2].pickerViewText)
+                        tvSpdw.text = opt2[options1][options2].pickerViewText
+                        childSign = opt2[options1][options2].childSign
                     }
                         .setTitleText("审批单位")
-                        .setContentTextSize(20) //设置滚轮文字大小
+                        .setContentTextSize(16) //设置滚轮文字大小
                         .setDividerColor(Color.LTGRAY) //设置分割线的颜色
                         .setSelectOptions(0, 1) //默认选中项
                         .setTitleColor(Color.BLACK)
@@ -209,21 +221,62 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
                                 "options1: $options1\noptions2: $options2\noptions3: $options3"
 //                Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show()
                         }
-                        .build<CompanyBean>()
+                        .build<Any>()
 
-                    data.forEach {
+                    pvOptions.setPicker(opt1 as List<Nothing>?,opt2 as List<Nothing>?)
-                        mutableListOf.add(it)
-                    }
-
-
-
-                    build.setPicker(mutableListOf)
-
-                    build.show()
 
+                    pvOptions.show()
                 }
             }))
 
+//        DataManager.getInstance().companyLst("YJ0007")
+//            .compose(DataManager.setThread())
+//            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<List<CompanyBean>>(this) {
+//                override fun onSuccess(t: CommonResponseBean<List<CompanyBean>>) {
+//                    super.onSuccess(t)
+//                    val data = t.data
+//
+//
+//                    val mutableListOf = mutableListOf<CompanyBean>()
+//                    val build = OptionsPickerBuilder(mContext
+//                    ) { options1, options2, options3, v -> //返回的分别是三个级别的选中位置
+//                        curCompanyBean = mutableListOf.get(options1)
+//                        tvSpdw.text = mutableListOf.get(options1).signName
+//                    }
+//                        .setTitleText("审批单位")
+//                        .setContentTextSize(20) //设置滚轮文字大小
+//                        .setDividerColor(Color.LTGRAY) //设置分割线的颜色
+//                        .setSelectOptions(0, 1) //默认选中项
+//                        .setTitleColor(Color.BLACK)
+//                        .setSubmitColor(Color.parseColor("#F1474B")) //确定按钮文字颜色
+//                        .setCancelColor(Color.parseColor("#F1474B")) //取消按钮文字颜色
+//                        .setTitleBgColor(Color.parseColor("#FFFFFF"))
+//                        .setBgColor(Color.parseColor("#F5F5F5"))
+//                        .setTextColorCenter(Color.LTGRAY)
+//                        .isRestoreItem(true) //切换时是否还原，设置默认选中第一项。
+//                        .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
+//                        .setLabels("", "", "")
+////            .setOutSideColor(0x00000000) //设置外部遮罩颜色
+//                        .setOptionsSelectChangeListener { options1, options2, options3 ->
+//                            val str =
+//                                "options1: $options1\noptions2: $options2\noptions3: $options3"
+////                Toast.makeText(this@MainActivity, str, Toast.LENGTH_SHORT).show()
+//                        }
+//                        .build<CompanyBean>()
+//
+//                    data.forEach {
+//                        mutableListOf.add(it)
+//                    }
+//
+//
+//
+//                    build.setPicker(mutableListOf)
+//
+//                    build.show()
+//
+//                }
+//            }))
+
 
     }
 
@@ -286,7 +339,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
 
     fun sub() {
 
-        if (!::curCompanyBean.isInitialized || !::jb.isInitialized ||
+        if (!::childSign.isInitialized || !::jb.isInitialized ||
             !::shi.isInitialized || etQymc.text.toString().isNullOrEmpty() ||
             etLxr.text.toString().isNullOrEmpty() || etPhone.text.toString().isNullOrEmpty() ||
             etCl.text.toString().isNullOrEmpty() || etTxz.text.toString().isNullOrEmpty()
@@ -296,7 +349,7 @@ class ApplyActivity : BaseActivity(), View.OnClickListener {
         }
 
         val applySendBean = ApplySendBean()
-        applySendBean.sign = curCompanyBean.sign
+        applySendBean.sign = childSign
         applySendBean.enterpriseName = etQymc.text.toString()
 //        applySendBean.typeId = curCompanyType.typeId
         applySendBean.provinceName = sheng

app/src/main/res/drawable/shape_gray_bg20.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#007AFF" />
+    <solid android:color="#E5F6EA" />
+    <corners
+        android:radius="20dp" />
+</shape>

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

@@ -29,6 +29,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -36,6 +37,8 @@
                     android:textColor="@color/black"></TextView>
 
                 <TextView
+                    android:id="@+id/tvType"
+                    android:textSize="14dp"
                     android:background="@drawable/shape_gray_bg6"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -53,7 +56,7 @@
                     android:layout_height="wrap_content"
                     android:background="@null"
                     android:gravity="right"
-                    android:hint="01101-02455"
+                    android:hint="请输入通行证编号"
                     android:inputType="number"
                     android:maxLines="1"
                     android:maxLength="5"
@@ -79,6 +82,7 @@
                 android:visibility="gone">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -115,6 +119,7 @@
                 android:visibility="gone">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -151,6 +156,7 @@
                 android:visibility="gone">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -185,6 +191,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -219,6 +226,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -255,6 +263,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -293,6 +302,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -327,6 +337,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -363,6 +374,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -398,6 +410,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -432,6 +445,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -467,6 +481,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -502,6 +517,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -536,6 +552,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -570,6 +587,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -600,6 +618,7 @@
 
 
             <TextView
+                android:textSize="14dp"
                 android:id="@+id/tvSub"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"

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

@@ -30,10 +30,12 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="审批单位"
+                    android:textSize="14dp"
                     android:textColor="@color/black"></TextView>
 
                 <TextView
                     android:id="@+id/tvSpdw"
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawableRight="@drawable/right_black"
@@ -95,6 +97,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -165,6 +168,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -197,6 +201,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -204,6 +209,7 @@
                     android:textColor="@color/black"></TextView>
 
                 <TextView
+                    android:textSize="14dp"
                     android:id="@+id/tvJb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -229,6 +235,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -263,6 +270,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -299,6 +307,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -333,6 +342,7 @@
                 android:padding="6dp">
 
                 <TextView
+                    android:textSize="14dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"

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

@@ -150,6 +150,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginLeft="26dp"

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

@@ -276,6 +276,21 @@
         </LinearLayout>
     </LinearLayout>
 
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/tvNoUse"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:text="当天未使用"
+        android:textColor="@color/mine_top_bg"
+        android:gravity="center"
+        android:background="@drawable/shape_gray_bg20"
+        ></TextView>
+
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"

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

@@ -134,7 +134,7 @@
                         android:paddingLeft="7dp"
                         android:text="修改登录密码"
                         android:textColor="@color/color_3"
-                        android:textSize="@dimen/text_16sp" />
+                        android:textSize="16dp"/>
 
                 </RelativeLayout>
 
@@ -177,7 +177,7 @@
                         android:paddingLeft="7dp"
                         android:text="修改手机号"
                         android:textColor="@color/color_3"
-                        android:textSize="@dimen/text_16sp" />
+                        android:textSize="16dp" />
 
                 </RelativeLayout>
 
@@ -219,7 +219,7 @@
                         android:paddingLeft="7dp"
                         android:text="隐私协议"
                         android:textColor="@color/color_3"
-                        android:textSize="@dimen/text_16sp" />
+                        android:textSize="16dp"/>
 
                 </RelativeLayout>
 
@@ -236,6 +236,7 @@
                     android:gravity="bottom">
 
                     <Button
+                        android:textSize="14dp"
                         android:id="@+id/btnOut"
                         android:layout_width="match_parent"
                         android:layout_height="38dp"

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

@@ -51,12 +51,14 @@
             android:orientation="horizontal">
 
             <TextView
+                android:textSize="14dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="申请数:"
                 android:textColor="@color/color_9"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:id="@+id/tvSqs"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -66,12 +68,14 @@
                 tools:text="2000000"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="审批数:"
                 android:textColor="@color/color_9"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:id="@+id/tvSps"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -89,12 +93,14 @@
             android:orientation="horizontal">
 
             <TextView
+                android:textSize="14dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="填报人:"
                 android:textColor="@color/color_9"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:id="@+id/tvTbr"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -104,12 +110,14 @@
                 tools:text="2000000"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="电    话:"
                 android:textColor="@color/color_9"></TextView>
 
             <TextView
+                android:textSize="14dp"
                 android:id="@+id/tvDh"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -140,12 +148,14 @@
                     android:orientation="horizontal">
 
                     <TextView
+                        android:textSize="14dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="申请时间:"
                         android:textColor="@color/color_9"></TextView>
 
                     <TextView
+                        android:textSize="14dp"
                         android:id="@+id/tvSqsj"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -163,12 +173,14 @@
                     android:orientation="horizontal">
 
                     <TextView
+                        android:textSize="14dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="审批时间:"
                         android:textColor="@color/color_9"></TextView>
 
                     <TextView
+                        android:textSize="14dp"
                         android:id="@+id/tvSpsj"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"

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

@@ -154,12 +154,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="运输吨数:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvDs"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -169,12 +171,14 @@
             tools:text="2000000"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="物品种类:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvZl"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -191,12 +195,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="司        机:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvSjName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -206,12 +212,14 @@
             tools:text="2000000"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="电       话:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvDh"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -232,12 +240,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="身份证号:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvSfzh"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -252,12 +262,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="开始时间:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvStartSj"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -273,12 +285,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="到达时间:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvEndTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -294,12 +308,14 @@
         android:orientation="horizontal">
 
         <TextView
+            android:textSize="14dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="备注:"
             android:textColor="@color/color_9"></TextView>
 
         <TextView
+            android:textSize="14dp"
             android:id="@+id/tvBz"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

compile.gradle

@@ -40,8 +40,8 @@ project.ext {
             applicationId    : "com.dahe.pass",
             minSdkVersion    : 21,
             targetSdkVersion : 30,
-            versionCode      : 8,
+            versionCode      : 12,
-            versionName      : "1.0.8",
+            versionName      : "1.1.2",
     ]
     dependencies = [
             "appcompat-v7"         : "com.android.support:appcompat-v7:${SupportVersion}",

mylibrary/src/main/res/layout/common_toolbar.xml

@@ -18,7 +18,7 @@
         android:maxLength="12"
         android:maxLines="1"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_18sp"
+        android:textSize="18dp"
         android:textStyle="bold" />
 
     <TextView