diff --git a/app/sign_product/release/output-metadata.json b/app/sign_product/release/output-metadata.json index ca2e9c8..088ee9d 100644 --- a/app/sign_product/release/output-metadata.json +++ b/app/sign_product/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "versionCode": 4, "versionName": "1.0.4", - "outputFile": "企业端正式_release_1.0.4_202201240930.apk" + "outputFile": "企业端正式_release_1.0.4_202204041207.apk" } ] } \ No newline at end of file diff --git a/app/sign_product/release/企业端正式_release_1.0.4_202201240930.apk b/app/sign_product/release/企业端正式_release_1.0.4_202201240930.apk deleted file mode 100644 index 880f77a..0000000 Binary files a/app/sign_product/release/企业端正式_release_1.0.4_202201240930.apk and /dev/null differ diff --git a/app/src/main/java/com/dahe/pass/adapter/GoneAdapter.kt b/app/src/main/java/com/dahe/pass/adapter/GoneAdapter.kt index 2a2a531..09d7713 100644 --- a/app/src/main/java/com/dahe/pass/adapter/GoneAdapter.kt +++ b/app/src/main/java/com/dahe/pass/adapter/GoneAdapter.kt @@ -25,6 +25,7 @@ class GoneAdapter(layoutResId: Int) : BaseQuickAdapter .setText(R.id.tvStartSj,item.startTime) .setText(R.id.tvEndTime,item.endTime) .setText(R.id.tvBz,item.remarks) + .setText(R.id.tvSfzh,item.driverIdcard) .setText(R.id.tvType,"""(${item.chargeType})""") .setTextColorRes(R.id.tvType,if (item.chargeType.contains("收费")) R.color.color_down_time else R.color.color_green) } diff --git a/app/src/main/java/com/dahe/pass/bean/UserBean.java b/app/src/main/java/com/dahe/pass/bean/UserBean.java index 6c4ad56..11e595e 100644 --- a/app/src/main/java/com/dahe/pass/bean/UserBean.java +++ b/app/src/main/java/com/dahe/pass/bean/UserBean.java @@ -87,6 +87,24 @@ public class UserBean implements Serializable { private String name; private String userId; private String phone; + private String contacts; + private String contactsPhone; + + public String getContacts() { + return contacts; + } + + public void setContacts(String contacts) { + this.contacts = contacts; + } + + public String getContactsPhone() { + return contactsPhone; + } + + public void setContactsPhone(String contactsPhone) { + this.contactsPhone = contactsPhone; + } public String getEnterpriseName() { return enterpriseName; diff --git a/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt b/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt index 50ad6f1..485ab0e 100644 --- a/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/account/activity/BusinessInfoActivity.kt @@ -232,6 +232,7 @@ class BusinessInfoActivity : BaseActivity(), View.OnClickListener { .setCancelColor(Color.parseColor("#F1474B")) //取消按钮文字颜色 .setTitleBgColor(Color.parseColor("#FFFFFF")) .setBgColor(Color.parseColor("#F5F5F5")) + .setSelectOptions(15, 0, 0) .setContentTextSize(20) .build() pvOptions.setPicker(options1Items as List?, diff --git a/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt b/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt index b006d8d..afed4e4 100644 --- a/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt +++ b/app/src/main/java/com/dahe/pass/ui/home/activity/ApplyActivity.kt @@ -17,6 +17,7 @@ import com.dahe.pass.net.BaseObserver import com.dahe.pass.net.DataManager import com.dahe.pass.net.RxHttpCallBack import com.dahe.pass.utils.GetJsonDataUtil +import com.dahe.pass.utils.SPUtils import com.google.gson.Gson import com.lxj.xpopup.util.KeyboardUtils import kotlinx.android.synthetic.main.activity_apply.* @@ -50,6 +51,14 @@ class ApplyActivity : BaseActivity(), View.OnClickListener { llQylx.setOnClickListener(this) tvJb.setOnClickListener(this) tvSflx.setOnClickListener(this) + + val userInfo = SPUtils.getUserInfo(this).userInfo + if (null!=userInfo){ + etLxr.text = userInfo.contacts + etPhone.text = userInfo.contactsPhone + } + + } override fun initDate() { diff --git a/app/src/main/res/layout/activity_apply.xml b/app/src/main/res/layout/activity_apply.xml index bbf05a4..00ef0d8 100644 --- a/app/src/main/res/layout/activity_apply.xml +++ b/app/src/main/res/layout/activity_apply.xml @@ -232,10 +232,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="联系人" + android:text="通行证管理人" android:textColor="@color/black"> - + android:textSize="14dp"> @@ -265,20 +266,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="电话" + android:text="管理人电话" android:textColor="@color/black"> - + android:textSize="14dp"> diff --git a/app/src/main/res/layout/activity_business_info.xml b/app/src/main/res/layout/activity_business_info.xml index e9f4316..d808bd8 100644 --- a/app/src/main/res/layout/activity_business_info.xml +++ b/app/src/main/res/layout/activity_business_info.xml @@ -116,7 +116,6 @@ android:background="@null" android:ellipsize="end" android:hint="统一社会信用代码" - android:maxLength="11" android:maxLines="1"> @@ -171,6 +170,7 @@ android:background="@drawable/spdw"> diff --git a/app/src/main/res/layout/item_gone.xml b/app/src/main/res/layout/item_gone.xml index 7b825a4..bc3ef6e 100644 --- a/app/src/main/res/layout/item_gone.xml +++ b/app/src/main/res/layout/item_gone.xml @@ -223,6 +223,26 @@ + + + + + + >() { }.getType(); CommonResponseBean o = JsonUtils.getInstance().fromJson(result, type); - VersionBean data = o.getData(); + VersionBean.ParamsDao data = o.getData().getData(); if ("1".equals(data.getUpdateType())) { downloadBuilder.setForceRedownload(true); }else{ @@ -74,9 +74,9 @@ public class VersionUtils { } if (AppUtils.getAppVersionCode() < data.getVersion()) { UIData uiData = UIData.create(); - uiData.setTitle(o.getData().getVersionName()); - uiData.setDownloadUrl(o.getData().getApkUrl()); - uiData.setContent(o.getData().getIntroduce()); + uiData.setTitle(data.getVersionName()); + uiData.setDownloadUrl(data.getApkUrl()); + uiData.setContent(data.getIntroduce()); return uiData; } if (isShow){