This commit is contained in:
lijia 2022-04-04 12:48:07 +08:00
parent 7ecfeacef9
commit 52ad72ccf4
6 changed files with 75 additions and 65 deletions

View File

@ -10,9 +10,9 @@
{ {
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"versionCode": 4, "versionCode": 5,
"versionName": "1.0.4", "versionName": "1.0.5",
"outputFile": "管理端正式_release_1.0.4_202201240931.apk" "outputFile": "管理端正式_release_1.0.5_202204041240.apk"
} }
] ]
} }

View File

@ -51,6 +51,7 @@
tools:text="地区:郑州市"></TextView> tools:text="地区:郑州市"></TextView>
<TextView <TextView
android:visibility="gone"
android:id="@+id/tvLx" android:id="@+id/tvLx"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -155,7 +156,6 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:background="@null" android:background="@null"
android:ellipsize="end" android:ellipsize="end"
android:maxLength="11"
android:maxLines="1" android:maxLines="1"
android:text="通行证管理人:王宗亮" android:text="通行证管理人:王宗亮"
android:textColor="@color/black"></TextView> android:textColor="@color/black"></TextView>
@ -181,7 +181,6 @@
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:background="@null" android:background="@null"
android:ellipsize="end" android:ellipsize="end"
android:maxLength="11"
android:maxLines="1" android:maxLines="1"
android:text="管理人电话13000000005" android:text="管理人电话13000000005"
android:textColor="@color/black"></TextView> android:textColor="@color/black"></TextView>
@ -215,7 +214,6 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:visibility="gone"
android:id="@+id/tvZcdz" android:id="@+id/tvZcdz"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -40,8 +40,8 @@ project.ext {
applicationId : "com.dahe.examine", applicationId : "com.dahe.examine",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 30, targetSdkVersion : 30,
versionCode : 4, versionCode : 5,
versionName : "1.0.4", versionName : "1.0.5",
] ]
dependencies = [ dependencies = [
"appcompat-v7" : "com.android.support:appcompat-v7:${SupportVersion}", "appcompat-v7" : "com.android.support:appcompat-v7:${SupportVersion}",

View File

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

View File

@ -65,7 +65,7 @@ public class VersionUtils {
Type type = new TypeToken<CommonResponseBean<VersionBean>>() { Type type = new TypeToken<CommonResponseBean<VersionBean>>() {
}.getType(); }.getType();
CommonResponseBean<VersionBean> o = JsonUtils.getInstance().fromJson(result, type); CommonResponseBean<VersionBean> o = JsonUtils.getInstance().fromJson(result, type);
VersionBean data = o.getData(); VersionBean.ParamsDao data = o.getData().getData();
if ("1".equals(data.getUpdateType())) { if ("1".equals(data.getUpdateType())) {
downloadBuilder.setForceRedownload(true); downloadBuilder.setForceRedownload(true);
}else{ }else{
@ -73,9 +73,9 @@ public class VersionUtils {
} }
if (AppUtils.getAppVersionCode() < data.getVersion()) { if (AppUtils.getAppVersionCode() < data.getVersion()) {
UIData uiData = UIData.create(); UIData uiData = UIData.create();
uiData.setTitle(o.getData().getVersionName()); uiData.setTitle(data.getVersionName());
uiData.setDownloadUrl(o.getData().getApkUrl()); uiData.setDownloadUrl(data.getApkUrl());
uiData.setContent(o.getData().getIntroduce()); uiData.setContent(data.getIntroduce());
return uiData; return uiData;
} }
if (isShow){ if (isShow){