[Fix]

升级HdMap版本，1.修改bug 2. 增加初始回调监听
删除无用的个人ui

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

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);
 }

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<EntranceView, EntrancePresente
     private View mMsgContainer;
     private TextView mMsgCounter;
 
-    private ImageView mUserHeadImg;
     private View thresholdSetContainer;
     private EditText topEditC, frontLeftEditC, frontRightEditC, backLeftEditC, backRightEditC,
             bottomEditC;
@@ -204,7 +199,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     };
 
     private Group seekHelpGroup;
-    private Group groupUserHead;
 
     private UploadButtonAnimatorController mUploadButtonAnimatorController;
 
@@ -255,7 +249,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
         mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
         mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location);
-        mUserHeadImg = findViewById(R.id.ivUserHeadImg);
         groupFix = findViewById(R.id.groupFix);
 
         ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout);
@@ -287,7 +280,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mWeatherContainer = findViewById(R.id.module_ext_id_weather_container);
         mWeatherIcon = findViewById(R.id.module_ext_id_weather_icon);
         mWeatherTemp = findViewById(R.id.module_ext_id_weather_temp);
-        groupUserHead = findViewById(R.id.groupUserHead);
         mMsgContainer = findViewById(R.id.module_ext_id_msg);
         mMsgCounter = findViewById(R.id.module_ext_id_msg_counter);
         mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload,
@@ -298,13 +290,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         tvEnterVrMode.setOnClickListener(clickListener);
         tvExitVrMode.setOnClickListener(clickListener);
         mMsgContainer.setOnClickListener(clickListener);
-        mUserHeadImg.setOnClickListener(clickListener);
         mMove2CurrentLocation.setOnClickListener(clickListener);
         mDisplayOverview.setOnClickListener(clickListener);
         mExitNavi.setOnClickListener(clickListener);
         mCameraMode.setOnClickListener(clickListener);
 
-        groupUserHead.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE);
 
         if (DebugConfig.isDebug()) {
 
@@ -312,15 +302,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog();
                 return true;
             });
-
-            mUserHeadImg.setOnLongClickListener(view -> {
-                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<EntranceView, EntrancePresente
         mUploadRoadCondition.setVisibility(View.GONE);
         mWeatherContainer.setVisibility(View.GONE);
         mMsgContainer.setVisibility(View.GONE);
-        groupUserHead.setVisibility(View.GONE);
-        groupUserHead.setVisibility(View.GONE);
         //        tvExitVrMode.setVisibility(View.VISIBLE);
         TopViewAnimHelper.getInstance().enterVrMode();
         TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
@@ -384,7 +363,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         tvEnterVrMode.setVisibility(View.VISIBLE);
         mMove2CurrentLocation.setVisibility(View.VISIBLE);
         mUploadRoadCondition.setVisibility(View.VISIBLE);
-        groupUserHead.setVisibility(View.VISIBLE);
         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isSeekHelping()) {
             seekHelpGroup.setVisibility(View.VISIBLE);
         }
@@ -463,7 +441,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             mMove2CurrentLocation.setVisibility(View.GONE);
             mWeatherContainer.setVisibility(View.GONE);
             mMsgContainer.setVisibility(View.GONE);
-            groupUserHead.setVisibility(View.GONE);
         }
 
     }
@@ -809,19 +786,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 getString(R.string.module_ext_str_dots) : String.valueOf(amount));
     }
 
-    @Override
-    public void renderUserInfo(UserInfo userInfo) {
-        if (!DebugConfig.isMapBased()) {
-            return;
-        }
-        if (userInfo != null) {
-            Logger.d(TAG, "renderUserInfo: " + userInfo);
-            RequestOptions options =
-                    new RequestOptions().circleCrop().placeholder(R.drawable.model_ext_default_user_head).error(R.drawable.model_ext_default_user_head);
-            GlideApp.with(getContext()).asBitmap().apply(options).load(userInfo.getHeadImgurl()).into(new SkinAbleBitmapTarget(mUserHeadImg, options));
-        }
-    }
-
     private final int[] heights = new int[]{100, 200, 300};
     private int currentHeight;
 
@@ -1157,18 +1121,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            } else if (v.getId() == R.id.ivUserHeadImg) {
-                // 个人中心
-                try {
-                    LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal");
-                    // 埋点
-                    final Map<String, Object> 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);

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<EntranceView> 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<EntranceView> implements Weathe
                 });
     }
 
-
-    private UserInfo userInfo;
-
-    public void requestUserInfo() {
-        Map<String, String> 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<UserInfoResponse>() {
-            @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<String, String> map, String salt) {
-        try {
-            StringBuilder queryString = new StringBuilder();
-            for (Map.Entry<String, String> 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 "";
-        }
-    }
 }