denghuan/pass
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.1.2

Browse Source
This commit is contained in:
lijia 2022-04-04 12:17:21 +08:00
parent 8d549ed082
commit 51c9f0e187
11 changed files with 130 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/sign_product/release/output-metadata.json
View File

@ -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"
}
]
}

BIN
app/sign_product/release/企业端正式_release_1.0.4_202201240930.apk
View File

Binary file not shown.

1
app/src/main/java/com/dahe/pass/adapter/GoneAdapter.kt
View File

@ -25,6 +25,7 @@ class GoneAdapter(layoutResId: Int) : BaseQuickAdapter<PassBean, BaseViewHolder>
.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)
}

18
app/src/main/java/com/dahe/pass/bean/UserBean.java
View File

@ -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;

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

@ -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<Any>()
pvOptions.setPicker(options1Items as List<Nothing>?,

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

@ -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() {

16
app/src/main/res/layout/activity_apply.xml
View File

@ -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"></TextView>
<EditText
<TextView
android:textColor="@color/black"
android:id="@+id/etLxr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -243,7 +244,7 @@
android:gravity="right"
android:hint="请输入联系人"
android:paddingRight="6dp"
android:textSize="14dp"></EditText>
android:textSize="14dp"></TextView>
</LinearLayout>
@ -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"></TextView>
<EditText
<TextView
android:textColor="@color/black"
android:id="@+id/etPhone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="right"
android:hint="请输入电话"
android:hint="管理人电话"
android:maxLength="11"
android:inputType="phone"
android:paddingRight="6dp"
android:textSize="14dp"></EditText>
android:textSize="14dp"></TextView>
</LinearLayout>

3
app/src/main/res/layout/activity_business_info.xml
View File

@ -116,7 +116,6 @@
android:background="@null"
android:ellipsize="end"
android:hint="统一社会信用代码"
android:maxLength="11"
android:maxLines="1"></EditText>
@ -171,6 +170,7 @@
android:background="@drawable/spdw"></ImageView>
<TextView
android:textColor="@color/black"
android:textSize="16dp"
android:gravity="center_vertical"
android:id="@+id/etSpdw"
@ -212,6 +212,7 @@
android:ellipsize="end"
android:hint="管理人电话"
android:maxLength="11"
android:inputType="phone"
android:maxLines="1"></EditText>

20
app/src/main/res/layout/item_gone.xml
View File

@ -223,6 +223,26 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="身份证号:"
android:textColor="@color/color_9"></TextView>
<TextView
android:id="@+id/tvSfzh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:textColor="@color/black"></TextView>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"

118
mylibrary/src/main/java/com/dahe/mylibrary/bean/VersionBean.java
View File

@ -6,76 +6,88 @@ public class VersionBean implements Serializable {
private int versionId;
private int version;
private String versionName;
private String introduce;
private String updateType;
private String createTime;
private String remark;
private String apkUrl;
private ParamsDao data;
public String getApkUrl() {
return apkUrl;
public ParamsDao getData() {
return data;
}
public void setApkUrl(String apkUrl) {
this.apkUrl = apkUrl;
public void setData(ParamsDao data) {
this.data = data;
}
public int getVersionId() {
return versionId;
}
public static class ParamsDao implements Serializable{
private int versionId;
private int version;
private String versionName;
private String introduce;
private String updateType;
private String createTime;
private String remark;
private String apkUrl;
public void setVersionId(int versionId) {
this.versionId = versionId;
}
public String getApkUrl() {
return apkUrl;
}
public int getVersion() {
return version;
}
public void setApkUrl(String apkUrl) {
this.apkUrl = apkUrl;
}
public void setVersion(int version) {
this.version = version;
}
public int getVersionId() {
return versionId;
}
public String getVersionName() {
return versionName;
}
public void setVersionId(int versionId) {
this.versionId = versionId;
}
public void setVersionName(String versionName) {
this.versionName = versionName;
}
public int getVersion() {
return version;
}
public String getIntroduce() {
return introduce;
}
public void setVersion(int version) {
this.version = version;
}
public void setIntroduce(String introduce) {
this.introduce = introduce;
}
public String getVersionName() {
return versionName;
}
public String getUpdateType() {
return updateType;
}
public void setVersionName(String versionName) {
this.versionName = versionName;
}
public void setUpdateType(String updateType) {
this.updateType = updateType;
}
public String getIntroduce() {
return introduce;
}
public String getCreateTime() {
return createTime;
}
public void setIntroduce(String introduce) {
this.introduce = introduce;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUpdateType() {
return updateType;
}
public String getRemark() {
return remark;
}
public void setUpdateType(String updateType) {
this.updateType = updateType;
}
public void setRemark(String remark) {
this.remark = remark;
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
}

8
mylibrary/src/main/java/com/dahe/mylibrary/utils/VersionUtils.java
View File

@ -66,7 +66,7 @@ public class VersionUtils {
Type type = new TypeToken<CommonResponseBean<VersionBean>>() {
}.getType();
CommonResponseBean<VersionBean> 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){