diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index 3d4ce0dfc6..a7ab0a0b4e 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -53,7 +53,7 @@ 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 Context mContext; private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus; private ImageView mImageView; //车模 @@ -85,7 +85,7 @@ public class CheckActivity extends AppCompatActivity { protected void onStart() { super.onStart(); animation(); - loadDetail(mContext, null); + loadDetail(this.getApplicationContext(), null); } /** * 列表View初始化 @@ -99,7 +99,7 @@ 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(); +// mContext = mImageView.getContext(); mImageView.setOnClickListener(v -> { finish(); }); @@ -109,7 +109,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 +118,20 @@ public class CheckActivity extends AppCompatActivity { */ public static void checkMonitor(Context context, ICheckResultCallBack checkResultCallBack) { Log.d(TAG, "checkMonitor"); - mContext = context; - loadDetail(mContext, checkResultCallBack); +// mContext = context; + loadDetail(context.getApplicationContext(), checkResultCallBack); } //网络请求,获取自车检测结果(工控机上报云端) public static void loadDetail(Context context, ICheckResultCallBack checkResultCallBack) { - mContext = context; +// mContext = context; final Map params = ParamsBuilder.of(false) .append("sn", MoGoAiCloudClientConfig.getInstance().getSn()) .build(); CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { + .subscribe(new SubscribeImpl(RequestOptions.create(context)) { @Override public void onSuccess(CheckResultData o) { super.onSuccess(o); diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java index 8f1388a0c2..92e582064d 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java @@ -85,6 +85,7 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang Log.d(TAG, "准备show fragment"); mActivity.getSupportFragmentManager().beginTransaction().show(mSmallMapFragment).commitAllowingStateLoss(); } catch (Exception e) { + Log.d(TAG, "add fragment 失败 ======"+e.getMessage()); e.printStackTrace(); } } diff --git a/gradle.properties b/gradle.properties index 6347b55d01..af0976c3e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -166,7 +166,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46 # 定位服务 MOGO_LOCATION_VERSION=1.1.46 # 自研地图 -MAP_SDK_VERSION=1.0.1-vr-1.0.9 +MAP_SDK_VERSION=1.0.1-vr-1.1.2 #################架构升级新的版本号 MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0 ## 产品库必备配置,产品库自动对versionCode和versionName版本进行升级