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

Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade

Browse Source 
# Conflicts:
#	.idea/misc.xml
#	core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
#	core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
This commit is contained in:
董宏宇
2021-10-09 14:20:01 +08:00
parent 0e995818a3 19d2fd45a6
commit a84c5cdbd6
9 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
View File

@@ -53,7 +53,6 @@ public class CheckActivity extends AppCompatActivity {
private static final String TAG = "CheckActivity";
private static RecyclerView mRecyclerView;
private static CheckResultData sCheckResultData;
private static Context mContext;
private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus;
private ImageView mImageView;
//车模
@@ -85,7 +84,7 @@ public class CheckActivity extends AppCompatActivity {
protected void onStart() {
super.onStart();
animation();
loadDetail(mContext, null);
loadDetail(this.getApplicationContext(), null);
}
/**
* 列表View初始化
@@ -99,7 +98,6 @@ public class CheckActivity extends AppCompatActivity {
scanTopImageView = findViewById(R.id.scan_car_top_image);
tipsImageView = findViewById(R.id.scan_car_tips);
mProgressBar = findViewById(R.id.check_progress);
mContext = mImageView.getContext();
mImageView.setOnClickListener(v -> {
finish();
});
@@ -109,7 +107,7 @@ public class CheckActivity extends AppCompatActivity {
new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false);
mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr)));
mRecyclerView.setLayoutManager(linearLayoutManager);
mCheckAdapter = new CheckAdapter(mContext, sCheckResultData);
mCheckAdapter = new CheckAdapter(this, sCheckResultData);
mRecyclerView.setAdapter(mCheckAdapter);
}
@@ -118,20 +116,18 @@ public class CheckActivity extends AppCompatActivity {
*/
public static void checkMonitor(Context context, ICheckResultCallBack checkResultCallBack) {
Log.d(TAG, "checkMonitor");
mContext = context;
loadDetail(mContext, checkResultCallBack);
loadDetail(context.getApplicationContext(), checkResultCallBack);
}
//网络请求,获取自车检测结果(工控机上报云端)
public static void loadDetail(Context context, ICheckResultCallBack checkResultCallBack) {
mContext = context;
final Map<String, Object> params = ParamsBuilder.of(false)
.append("sn", MoGoAiCloudClientConfig.getInstance().getSn())
.build();
CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new SubscribeImpl<CheckResultData>(RequestOptions.create(mContext)) {
.subscribe(new SubscribeImpl<CheckResultData>(RequestOptions.create(context)) {
@Override
public void onSuccess(CheckResultData o) {
super.onSuccess(o);