diff --git a/gradle.properties b/gradle.properties index 7d98fce6af..56f62611a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.15 MOGO_LOCATION_VERSION=1.3.15 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.0.0.18 +MAP_SDK_VERSION=2.0.0.19 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置,产品库自动对versionCode和versionName版本进行升级 diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index ed3533eff1..9ec2490445 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -763,7 +763,7 @@ public class AMapViewWrapper implements IMogoMapView, sysLocation.setProvider(location.getProvider()); sysLocation.setAccuracy(location.getAcceleration()); sysLocation.setTime(location.getDuration()); - sysLocation.setBearing(location.getHeading()); + sysLocation.setBearing((float) location.getHeading()); sysLocation.setSpeed(location.getSpeed()); // 将有效经纬度暂存本地,提供给下一次的Http-DNS使用,防止首次请求位置获取不到 @@ -884,12 +884,18 @@ public class AMapViewWrapper implements IMogoMapView, MogoMapListenerHandler.getInstance().onMapClick(ObjectUtils.fromAMap(lonLatPoint)); } + + @Override + public void onMapInit() { + Logger.i(TAG, "autoop--onMapInit: "); + MogoMapListenerHandler.getInstance().onMapLoaded(); + } + @Override public void onMapLoaded() { Logger.i(TAG, "autoop--onMapLoaded: "); MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型,未来需区分车的类型 //mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率 - MogoMapListenerHandler.getInstance().onMapLoaded(); mMapLoaded = true; CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); Trace.beginSection("timer.onCameraChangeFinish"); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java index a3ee8fe5f6..cf99b24eb1 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java @@ -154,7 +154,7 @@ public class ObjectUtils { location.setLatitude(aLocation.getLat()); location.setLongitude(aLocation.getLon()); location.setAltitude(aLocation.getAltitude()); - location.setBearing(aLocation.getHeading()); + location.setBearing((float) aLocation.getHeading()); location.setCityCode(aLocation.getCityCode()); location.setCityName(aLocation.getCity()); location.setProvider(aLocation.getProvider()); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java index 873761780f..f7f601a81a 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsView.java @@ -29,9 +29,4 @@ public interface ExtensionsView extends IView { */ void renderMsgInfo( boolean hasMsg, int amount ); - /** - * 刷新个人信息 - * @param userInfo 个人信息 - */ - void renderUserInfo(UserInfo userInfo); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index a8fa4cf17e..246a64dd06 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -33,7 +33,6 @@ import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.Group; import com.alibaba.android.arouter.launcher.ARouter; -import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; @@ -57,7 +56,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.dialog.WMDialog; -import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; @@ -66,7 +64,6 @@ import com.mogo.module.extensions.R; import com.mogo.module.extensions.navi.AnimNavInfoView; import com.mogo.module.extensions.navi.BaseNaviInfoView; import com.mogo.module.extensions.navi.VrModeNavInfoView; -import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.utils.AdasNoticeHelper; import com.mogo.module.extensions.utils.CameraLiveNoticeHelper; import com.mogo.module.extensions.utils.EntranceViewHolder; @@ -89,7 +86,6 @@ import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.windowview.IMogoTopViewStatusListener; import com.mogo.utils.LaunchUtils; import com.mogo.utils.UiThreadHandler; -import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.manager.ts.TsThreshold; @@ -154,7 +150,6 @@ public class EntranceFragment extends MvpFragment { - if (groupFix.getVisibility() == View.VISIBLE) { - groupFix.setVisibility(View.GONE); - } else { - groupFix.setVisibility(View.VISIBLE); - } - return true; - }); } dealWeatherContainer(); @@ -363,8 +344,6 @@ public class EntranceFragment extends MvpFragment properties = new HashMap<>(); - properties.put("type", 3); - ServiceApisManager.serviceApis.getAnalyticsApi().track("Launcher_APP_Icon", - properties); - } catch (Exception e) { - Logger.e(TAG, e, "打开个人中心Exception"); - } } else if (v.getId() == R.id.module_ext_enter_vr_mode) { // 进入vr模式 mMApUIController.changeMapMode(EnumMapUI.Type_VR); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 8e9005f11c..78d4ea42e0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -1,5 +1,7 @@ package com.mogo.module.extensions.entrance; +import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; + import android.content.Context; import android.util.ArrayMap; @@ -8,23 +10,18 @@ import androidx.lifecycle.LifecycleOwner; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.network.utils.digest.DigestUtils; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; import com.mogo.module.extensions.R; import com.mogo.module.extensions.bean.CommonConfig; import com.mogo.module.extensions.bean.CommonConfigResponse; import com.mogo.module.extensions.net.GetConfigApiServices; -import com.mogo.module.extensions.net.UserInfoNetApiServices; -import com.mogo.module.extensions.userinfo.UserInfo; -import com.mogo.module.extensions.userinfo.UserInfoResponse; import com.mogo.module.extensions.weather.Phenomena; import com.mogo.module.extensions.weather.WeatherCallback; import com.mogo.module.extensions.weather.WeatherInfo; import com.mogo.module.extensions.weather.WeatherModel; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; @@ -38,8 +35,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; - /** * @author congtaowang * @since 2020-01-07 @@ -105,13 +100,6 @@ public class EntrancePresenter extends Presenter implements Weathe public void onResume(@NonNull LifecycleOwner owner) { super.onResume(owner); isResumed = true; - if (userInfo != null) { - mView.renderUserInfo(userInfo); - } - if (DebugConfig.isNeedRequestUserInfo()) { - // 相当于每次onResume都会请求一下个人信息,目的是能够相对及时的同步手机端的个人信息修改 - requestUserInfo(); - } getCommonConfig(); } @@ -179,56 +167,4 @@ public class EntrancePresenter extends Presenter implements Weathe }); } - - private UserInfo userInfo; - - public void requestUserInfo() { - Map params = new ArrayMap<>(); - params.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); - params.put("source", "2"); - String sign = createSign(params, "JGqZw9"); - params.put("sig", sign); - mNetWork.create(UserInfoNetApiServices.class, HostConst.CARLIFE_HOST).requestUserInfo(params).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - } - - @Override - public void onSuccess(UserInfoResponse userInfoBaseResponse) { - userInfo = userInfoBaseResponse.getResult(); - if (isResumed) { - if (userInfo != null) { - Logger.d(TAG, "获取个人信息成功: " + userInfo); - mView.renderUserInfo(userInfo); - } else { - Logger.e(TAG, "获取个人信息失败"); - } - } - } - - @Override - public void onError(Throwable e) { - e.printStackTrace(); - Logger.e(TAG, e, "获取个人信息失败=="); - } - }); - } - - private String createSign(Map map, String salt) { - try { - StringBuilder queryString = new StringBuilder(); - for (Map.Entry entry : map.entrySet()) { - queryString.append(entry.getKey()) - .append("=") - .append(entry.getValue()) - .append("&"); - } - queryString.append("key=").append(DigestUtils.shaHex(salt)); - return DigestUtils.shaHex(queryString.toString()).toUpperCase(); - } catch (Exception e) { - e.printStackTrace(); - Logger.e(TAG, e, "createSign()"); - return ""; - } - } } diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 5cb5722d03..10a7fb9e1e 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -69,33 +69,6 @@ tools:text="···" /> - - - - - -