yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify app upgrade

Browse Source
This commit is contained in:
lixiaopeng
2022-06-22 11:09:21 +08:00
parent 33eee54719
commit dec5799449
8 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java
View File

@@ -1,15 +1,13 @@
package com.mogo.eagle.core.function.appupgrade.network;
import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Query;
/**
* @author lixiaopeng
@@ -19,11 +17,11 @@ import retrofit2.http.POST;
public interface UpgradeApiService {
/**
* 获取升级信息
*
* , @Query("resources") String i
* @return {@link UpgradeAppInfo}
*/
@Headers("Content-Type:application/json;charset=UTF-8")
@POST("pad/selectPadByMac")
Observable<UpgradeAppInfo> getUpgradeInfo(@Body RequestBody requestBody);
@POST("unify/selectResources")
Observable<UpgradeAppInfo> getUpgradeInfo(@Query("resources") String res, @Body RequestBody requestBody);
}

15
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java
View File

@@ -58,19 +58,19 @@ public class UpgradeAppNetWorkManager {
/**
* 获取app升级信息
*/
public void getAppUpgradeInfo(Context context, int screenType) {
public void getAppUpgradeInfo(Context context, String screenType) {
String sn = "X20202203105S688HZ";
String versionCode = "2070000";
int versionCode = 2070000;
String versionName = "2.7.0";
int screenType1 = 1;
String screenType1 = "1";
// String sn = MoGoAiCloudClientConfig.getInstance().getSn();
// String versionCode = AppUtils.getAppVersionCode();
// String versionName = AppUtils.getAppVersionName();
UpgradeAppRequest request = new UpgradeAppRequest("apps_control", sn, versionCode, versionName, screenType1);
UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType1);
RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
mUpgradeApiService.getUpgradeInfo(requestBody)
mUpgradeApiService.getUpgradeInfo("apps_control", requestBody)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<UpgradeAppInfo>() {
@@ -81,10 +81,13 @@ public class UpgradeAppNetWorkManager {
@Override
public void onNext(@NonNull UpgradeAppInfo info) {
Log.d("liyz", "onNext -------> " + info.code + "----msg =" + info.msg);
if (info != null && info.getData() != null) {
Log.d("liyz", "UpgradeAppInfo url = " + info.getData().getApp_url() + "----code = " + info.getData().getVersion_code());
//TODO 弹框
if (info.getData().getVersion_code() >= versionCode) {
CallerHmiManager.INSTANCE.showUpgradeDialog("appupgrade", info.getData().getApp_url());
}
}
}

33
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java
View File

@@ -6,27 +6,26 @@ package com.mogo.eagle.core.function.appupgrade.network;
* @since: 11/15/21
*/
public class UpgradeAppRequest {
private String resources;
// private String resources;
private String sn;
private String version_code;
private int version_code;
private String version_name;
private int screen_type;
private String screen_type;
public UpgradeAppRequest(String resources, String sn, String versionCode, String versionName, int type) {
this.resources = resources;
public UpgradeAppRequest(/*String resources,*/ String sn, int versionCode, String versionName, String type) {
this.sn = sn;
this.version_code = versionCode;
this.version_name = versionName;
this.screen_type = type;
}
public String getResources() {
return resources;
}
public void setResources(String resources) {
this.resources = resources;
}
// public String getResources() {
// return resources;
// }
//
// public void setResources(String resources) {
// this.resources = resources;
// }
public String getSn() {
return sn;
@@ -36,11 +35,11 @@ public class UpgradeAppRequest {
this.sn = sn;
}
public String getVersion_code() {
public int getVersion_code() {
return version_code;
}
public void setVersion_code(String version_code) {
public void setVersion_code(int version_code) {
this.version_code = version_code;
}
@@ -52,11 +51,11 @@ public class UpgradeAppRequest {
this.version_name = version_name;
}
public int getScreen_type() {
public String getScreen_type() {
return screen_type;
}
public void setScreen_type(int screen_type) {
public void setScreen_type(String screen_type) {
this.screen_type = screen_type;
}
@@ -64,7 +63,7 @@ public class UpgradeAppRequest {
public String toString() {
return "UpgradeAppRequest{" +
"sn='" + sn + '\'' +
", version_code='" + version_code + '\'' +
", version_code=" + version_code +
", version_name='" + version_name + '\'' +
", screen_type=" + screen_type +
'}';

2
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
View File

@@ -133,7 +133,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
*/
@Override
public void queryAppUpgrade() {
UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, getScreenType());
UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, String.valueOf(getScreenType()));
}
}