[mini bus3.0.0] 司机端二维码合并问题处理

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -1,10 +1,10 @@
 package com.mogo.och.bus.fragment;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
-
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -14,7 +14,9 @@ import androidx.constraintlayout.widget.Group;
 import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -37,6 +39,8 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst;
 import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.utils.BlinkAnimationUtil;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
+import com.mogo.och.common.module.utils.QRUtilsKt;
+import com.mogo.och.common.module.wigets.BindQRCodeDialog;
 import com.mogo.och.common.module.wigets.MarqueeTextView;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;
 
@@ -46,6 +50,8 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.List;
 import java.util.Objects;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 
 /**
  * 网约车小巴界面
@@ -125,6 +131,22 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
             CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
             mPresenter.logout();
+        }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码
+            CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode");
+            String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(),
+                    MoGoAiCloudClientConfig.getInstance().getSn());
+            Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture(
+                    BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo)
+                    ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f),
+                    AutoSizeUtils.dp2px(getContext(),340f),true);
+            if (bmQr != null){
+                BindQRCodeDialog.Builder builder = new BindQRCodeDialog.Builder();
+                builder.title(getString(R.string.bind_driver_qr_title))
+                        .cancelStr(getString(R.string.qr_cancel))
+                        .qrBm(bmQr).build(getContext()).show();
+            }else {
+                CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null ");
+            }
         }
     }
 
@@ -360,16 +382,16 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         }else {
             firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
             thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-             if (isArrived){ //到终点
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(0);
-                 thirdStationItem.setStationPointBg(1);
+            if (isArrived){ //到终点
+                firstStationItem.setStationPointBg(0);
+                firstStationItem.setStationArrowBg(0);
+                thirdStationItem.setStationPointBg(1);
 
-             }else { //到终点途中
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(1);
-                 thirdStationItem.setStationPointBg(1);
-             }
+            }else { //到终点途中
+                firstStationItem.setStationPointBg(0);
+                firstStationItem.setStationArrowBg(1);
+                thirdStationItem.setStationPointBg(1);
+            }
         }
     }
 

OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -1,557 +0,0 @@
-package com.mogo.och.bus.fragment;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Group;
-import androidx.annotation.Nullable;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
-import com.mogo.eagle.core.data.map.CenterLine;
-import com.mogo.eagle.core.data.temp.EventLogout;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
-import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.och.bus.R;
-import com.mogo.och.bus.bean.BusStationBean;
-import com.mogo.och.bus.constant.BusConst;
-import com.mogo.och.bus.net.login.LoginBusImpl;
-import com.mogo.och.bus.presenter.BusPresenter;
-import com.mogo.och.bus.ui.BusStationCommonItem;
-import com.mogo.och.bus.ui.BusSwitchLineActivity;
-import com.mogo.och.bus.view.SlidePanelView;
-import com.mogo.och.common.module.biz.constant.OchCommonConst;
-import com.mogo.och.common.module.biz.provider.LoginService;
-import com.mogo.och.common.module.utils.BlinkAnimationUtil;
-import com.mogo.och.common.module.utils.OCHThreadPoolManager;
-import com.mogo.och.common.module.utils.QRUtilsKt;
-import com.mogo.och.common.module.wigets.BindQRCodeDialog;
-import com.mogo.och.common.module.wigets.MarqueeTextView;
-import com.mogo.och.common.module.wigets.OCHCommitDialog;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.List;
-import java.util.Objects;
-
-import me.jessyan.autosize.utils.AutoSizeUtils;
-
-
-/**
- * 网约车小巴界面
- *
- * @author tongchenfei
- */
-public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
-        implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener {
-    public static final String TAG = "BusFragment";
-
-    private TextView mSwitchLine; //切换路线
-    private MarqueeTextView mLineName;
-    private TextView mTaskTime;
-    private Group groupStationsPanel;
-    private ConstraintLayout noDataView;
-
-    private BusStationBean startStation = null;
-    private BusStationBean endStation = null;
-    private BusStationCommonItem firstStationItem;
-    private BusStationCommonItem secondStationItem;
-    private BusStationCommonItem thirdStationItem;
-
-    private LoginService loginService;
-
-    @Override
-    public String getTagName() {
-        return "BusFragment";
-    }
-
-    @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        loginService = (LoginService) ARouter.getInstance().build(OchCommonConst.LOGINSERVICE).navigation();
-        if(loginService!=null){
-            loginService.registerFragment(this, getPresenter(),new LoginBusImpl());
-        }
-    }
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        loginService.unRegisterFragment();
-        loginService = null;
-    }
-
-    @Override
-    protected void initViews() {
-        super.initViews();
-
-        mSwitchLine = findViewById(R.id.switch_line_btn);
-        mSwitchLine.setTag(0);
-        mLineName = findViewById(R.id.module_och_bus_line_name);
-
-        firstStationItem = findViewById(R.id.bus_panel_first_station);
-        secondStationItem = findViewById(R.id.bus_panel_second_station);
-        thirdStationItem = findViewById(R.id.bus_panel_third_station);
-        mTaskTime = findViewById(R.id.bus_task_time_tv);
-        groupStationsPanel = findViewById(R.id.group_stations_panel);
-        noDataView = findViewById(R.id.no_line_data_view);
-
-        CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState());
-        // 初始化的时候设置 UI 按钮状态
-        showAutopilotBiz();
-
-        mSwitchLine.setOnClickListener(this);
-
-        mLineName.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                showHideTestBar();
-                return false;
-            }
-        });
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void changeOverview(EventLogout eventLogout){
-        if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
-            CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
-            mPresenter.logout();
-        }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码
-            CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode");
-            String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(),
-                    MoGoAiCloudClientConfig.getInstance().getSn());
-            Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture(
-                    BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo)
-                    ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f),
-                    AutoSizeUtils.dp2px(getContext(),340f),true);
-            if (bmQr != null){
-                BindQRCodeDialog.Builder builder = new BindQRCodeDialog.Builder();
-                builder.title(getString(R.string.bind_driver_qr_title))
-                        .cancelStr(getString(R.string.qr_cancel))
-                        .qrBm(bmQr).build(getContext()).show();
-            }else {
-                CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null ");
-            }
-        }
-    }
-
-    @Override
-    protected void onArriveStation() {
-        mPresenter.onAutopilotArriveAtStation(null);
-    }
-
-    @Override
-    protected void debugArrivedStation() {
-        mPresenter.onAutopilotArriveAtStation(null);
-    }
-
-    @NonNull
-    @Override
-    protected BusPresenter createPresenter() {
-        return new BusPresenter(this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    public void hideStationsPanel(){
-        groupStationsPanel.setVisibility(View.GONE);
-        noDataView.setVisibility(View.VISIBLE);
-    }
-
-    public void showStationsPanel(){
-        groupStationsPanel.setVisibility(View.VISIBLE);
-        noDataView.setVisibility(View.GONE);
-    }
-
-    public void updateLineEmptyUI(){
-        setArrivedClikable(false);
-        showOrHideSwitchLineBtn(true);
-        hideStationsPanel();
-        hideSlidePanel();
-        resetStationBlinkAnim();
-    }
-
-    private void resetStationBlinkAnim() {
-        BlinkAnimationUtil.clearAnimation(firstStationItem.getCircleImageView());
-        BlinkAnimationUtil.clearAnimation(secondStationItem.getCircleImageView());
-        BlinkAnimationUtil.clearAnimation(thirdStationItem.getCircleImageView());
-    }
-
-    public void updateBusTaskStatus(String lineName, String lineTime,
-                                    List<BusStationBean> stationList,
-                                    int arrivingOrArrivedIndex,
-                                    boolean isArrived){
-
-        if (getActivity() == null) {
-            return;
-        }
-
-        getActivity().runOnUiThread(() -> {
-            if (stationList == null) {
-                // 获取小巴数据失败
-                return;
-            }
-
-            showStationsPanel();
-            showOrHideSwitchLineBtn(false);
-
-            mLineName.setText(lineName);
-            mTaskTime.setText(getString(R.string.bus_line_time_tag)+ lineTime);
-            // 渲染小巴路线数据
-            updateBusStationStatus(stationList,arrivingOrArrivedIndex,isArrived);
-        });
-    }
-
-    private void updateBusStationStatus(List<BusStationBean> stationList,
-                                        int arrivingOrArrivedIndex,
-                                        boolean isArrived) {
-
-        startStation = stationList.get(0);
-        endStation = stationList.get(stationList.size() - 1);
-
-        if (arrivingOrArrivedIndex == stationList.size() - 1 && isArrived){
-            //切换路线和结束路线按钮切换
-            showSlidePanel("单程结束");
-
-            setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                    , endStation.getLon(),R.raw.end_marker);
-        }else if (arrivingOrArrivedIndex == 0 && isArrived){
-
-            showSlidePanel("滑动出发");
-
-            setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER,
-                    startStation.getLat(), startStation.getLon(),R.raw.star_marker);
-            setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER,
-                    endStation.getLat(), endStation.getLon(),R.raw.end_marker);
-        }else{
-            if (isArrived){
-                // 重置滑动按钮文字
-                showSlidePanel("滑动出发");
-            }
-
-            setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(),R.raw.star_marker);
-            setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                    , endStation.getLon(),R.raw.end_marker);
-        }
-
-        if (stationList.size() > 2){ //只有两个站点
-            updateMoreThanTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived);
-        }else {
-            updateTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived);
-        }
-
-        updateBusTestBarInfo();
-    }
-
-    /**
-     * 有两个以上站点的路线
-     * @param stationList
-     * @param arrivingOrArrivedIndex
-     * @param isArrived
-     */
-    private void updateMoreThanTwoStationsUI(List<BusStationBean> stationList,
-                                             int arrivingOrArrivedIndex,
-                                             boolean isArrived) {
-        secondStationItem.setStationTag("");
-        secondStationItem.showOrHideStationArrowBg(true);
-        thirdStationItem.setStationTag("");
-        secondStationItem.setVisibility(View.VISIBLE);
-        thirdStationItem.showOrHideStationArrowBg(false);
-
-        if (arrivingOrArrivedIndex == 0 || arrivingOrArrivedIndex -1 == 0
-                || (arrivingOrArrivedIndex -2 == 0 && stationList.size() == 3)){
-            firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start));
-        }else {
-            firstStationItem.setStationTag("");
-        }
-
-        if (arrivingOrArrivedIndex + 1 == stationList.size() - 1 || arrivingOrArrivedIndex == stationList.size() - 1
-                || (arrivingOrArrivedIndex == 0 && arrivingOrArrivedIndex + 2 == stationList.size() - 1)){ //确认是否显示 "终"
-            thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end));
-        }else {
-            thirdStationItem.setStationTag("");
-        }
-
-        //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站
-        if (arrivingOrArrivedIndex == 0 && isArrived){
-            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-            secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color));
-            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color));
-
-            firstStationItem.setStationName(stationList.get(0).getName());
-            secondStationItem.setStationName(stationList.get(1).getName());
-            thirdStationItem.setStationName(stationList.get(2).getName());
-
-            firstStationItem.setStationPointBg(1);
-            secondStationItem.setStationPointBg(2);
-            thirdStationItem.setStationPointBg(2);
-
-            firstStationItem.setStationArrowBg(2);
-            secondStationItem.setStationArrowBg(2);
-
-        }else if (arrivingOrArrivedIndex == stationList.size() - 1){
-            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
-            secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
-            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-
-            firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -2).getName());
-            secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName());
-            thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName());
-
-            firstStationItem.setStationPointBg(0);
-            secondStationItem.setStationPointBg(0);
-            thirdStationItem.setStationPointBg(1);
-
-            firstStationItem.setStationArrowBg(0);
-            if (isArrived){
-                secondStationItem.setStationArrowBg(0);
-            }else {
-                secondStationItem.setStationArrowBg(1);
-            }
-
-        }else {
-            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
-            secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color));
-
-            firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName());
-            secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName());
-            thirdStationItem.setStationName(stationList.get(arrivingOrArrivedIndex + 1).getName());
-
-            firstStationItem.setStationPointBg(0);
-            secondStationItem.setStationPointBg(1);
-            thirdStationItem.setStationPointBg(2);
-
-            secondStationItem.setStationArrowBg(2);
-            if (isArrived){
-                firstStationItem.setStationArrowBg(0);
-            }else {
-                firstStationItem.setStationArrowBg(1);
-            }
-        }
-
-    }
-
-    /**
-     * 只有两个站点的路线
-     * @param stationList
-     * @param arrivingOrArrivedIndex
-     * @param isArrived
-     */
-    private void updateTwoStationsUI(List<BusStationBean> stationList,
-                                     int arrivingOrArrivedIndex,
-                                     boolean isArrived) {
-
-        secondStationItem.setVisibility(View.GONE);
-        secondStationItem.showOrHideStationArrowBg(false);
-        thirdStationItem.showOrHideStationArrowBg(false);
-
-        firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start));
-        thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end));
-
-        firstStationItem.setStationName(stationList.get(0).getName());
-        thirdStationItem.setStationName(stationList.get(1).getName());
-
-        //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站
-        if (arrivingOrArrivedIndex == 0 && isArrived){//到站
-            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color));
-            firstStationItem.setStationPointBg(1);
-            firstStationItem.setStationArrowBg(2);
-            thirdStationItem.setStationPointBg(0);
-
-        }else {
-            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
-            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-             if (isArrived){ //到终点
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(0);
-                 thirdStationItem.setStationPointBg(1);
-
-             }else { //到终点途中
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(1);
-                 thirdStationItem.setStationPointBg(1);
-             }
-        }
-    }
-
-    private void showOrHideSwitchLineBtn(boolean isShow) {
-        if (isShow){//显示切换路线
-            mSwitchLine.setTag(0);
-            mSwitchLine.setText(getResources().getString(R.string.bus_switch_line_btn));
-        }else {//显示结束路线
-            mSwitchLine.setTag(1);
-            mSwitchLine.setText(getResources().getString(R.string.bus_close_line_btn));
-        }
-    }
-
-    public void hideOchBus() {
-//        tvNotice.setVisibility(View.GONE);
-    }
-
-    @Override
-    public int getStationPanelViewId() {
-        return R.layout.fragment_och_bus;
-    }
-
-    @Override
-    public void restartAutopilot() {
-        if (!isAnimateRunning) {
-            mPresenter.restartAutopilot();
-        }
-    }
-
-    @Override
-    public SlidePanelView.OnSlidePanelMoveToEndListener getSlidePanelOnEndListener() {
-        return this;
-    }
-
-    @Override
-    public void moveToEnd() {
-        // 开启自动驾驶到下一站
-        if (isAnimateRunning){
-            stopAutopilotAnimation();
-        }
-        mPresenter.autoDriveToNextStation();
-    }
-
-    /**
-     * 设置自动驾驶可用状态
-     */
-    public void onAutopilotEnableChange(boolean isEnable) {
-        if (isEnable) {
-            showAutopilotBiz();
-        } else {
-            hideAutopilotBiz();
-        }
-    }
-
-    public void clearBusStationsMarkers(){
-        CallerLogger.INSTANCE.d(M_BUS + TAG,"clearBusStationsMarkers()");
-        if (null != startStation) {
-            setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(),R.raw.star_marker);
-        }
-        if (null != endStation) {
-            setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                    , endStation.getLon(),R.raw.end_marker);
-        }
-
-        //清除鹰眼右下角小地图轨迹
-        CallerLogger.INSTANCE.d(SceneConstant.M_MAP, "clearBusStationsMarkers --------->");
-        smallMapView.clearPolyline();
-    }
-
-    /**
-     * VR模式切换
-     *
-     * @param isVRMode
-     */
-    public void onVRModeChanged(boolean isVRMode) {
-        if (mRootView != null) {
-            mRootView.setVisibility(isVRMode ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    /**
-     * 绘制地图起点终点
-     *
-     * @param isAdd
-     * @param uuid
-     */
-    private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi,int resourceId) {
-        if (isAdd) {
-            Runnable setMapMarkerRunnable = () -> {
-                CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(),
-                        uuid + "=latitude=" + lat + ",longitude=" + longi);
-
-                MogoMarkerOptions options = new MogoMarkerOptions()
-                        .owner(BusConst.TYPE_MARKER_BUS_ORDER)
-                        .anchor(0.5f, 0.5f)
-                        .set3DMode(true)
-                        .gps(true)
-                        .controlAngle(true)
-                        .icon3DRes(resourceId)
-                        .latitude(lat)
-                        .longitude(longi);
-                IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(
-                        longi,lat,-1);
-                if (null != centerLine && marker != null) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空
-                    marker.setRotateAngle(centerLine.getAngle().floatValue());
-                }
-            };
-
-            OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable);
-
-        }else {
-            Runnable removeMapMarkerRunnable = () -> {
-                CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(),
-                        uuid+"=latitude="+lat+",longitude="+longi);
-                Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid);
-            };
-            OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable);
-        }
-    }
-
-    @Override
-    public void debugAutoPilotStatus(int status) {
-        mPresenter.debugAutoPilotStatus(status);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.switch_line_btn) {//切换路线条件： 自动驾驶过程中，点击则toast提示：自动驾驶中，不可切换路线
-            //本次行程未结束，不支持切换路线。点击则toast提示：当前行程未完成，不可切换路线
-            if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
-                    == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
-                ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning1));
-                return;
-            }
-            if ((int)mSwitchLine.getTag() == 0){//切换路线
-                Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);
-                startActivity(intent);
-            }else {//结束任务
-                OCHCommitDialog.Builder builder = new OCHCommitDialog.Builder();
-                OCHCommitDialog closeLineConfirmDialog = builder
-                        .title(getString(R.string.bus_dialog_title))
-                        .tips(getString(R.string.bus_dialog_tips))
-                        .confirmStr(getString(R.string.bus_dialog_confirm))
-                        .cancelStr(getString(R.string.bus_dialog_cancel))
-                        .build(getContext());
-                closeLineConfirmDialog.setClickListener(new OCHCommitDialog.ClickListener() {
-                    @Override
-                    public void confirm() {
-                        mPresenter.abortTask();
-                    }
-
-                    @Override
-                    public void cancel() {
-                        closeLineConfirmDialog.dismiss();
-                    }
-                });
-                closeLineConfirmDialog.show();
-            }
-        }
-    }
-}

app/urlConfig.json

@@ -40,7 +40,7 @@
       "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
       "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
       "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s"
     },
     "online": {
       "och_url": "https://och-driver-eh.zhidaozhixing.com:18182",
@@ -50,7 +50,7 @@
       "socket_tech_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/",
       "eagle_mis_url": "https://och-hailing-eh.zhidaozhixing.com:18182/",
       "eagle_dns_url": "https://och-hailing-eh.zhidaozhixing.com:18182/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ehsafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s"
     },
     "demo": {
       "och_url": "https://och-a.zhidaozhixing.com",
@@ -60,7 +60,7 @@
       "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
       "eagle_mis_url": "http://och-hailing-eh.zhidaozhixing.com:18181/",
       "eagle_dns_url": "http://och-hailing-eh.zhidaozhixing.com:18181/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ehsafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s"
     }
   },
   "yantai": {
@@ -72,7 +72,7 @@
       "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
       "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
       "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s"
     },
     "online": {
       "och_url": "https://och-driver-yt.zhidaozhixing.com",
@@ -82,7 +82,7 @@
       "socket_tech_url": "https://och-driver-yt.zhidaozhixing.com/arch/",
       "eagle_mis_url": "https://och-hailing-yt.zhidaozhixing.com/",
       "eagle_dns_url": "https://och-hailing-yt.zhidaozhixing.com/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ytsafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s"
     },
     "demo": {
       "och_url": "https://och-a.zhidaozhixing.com",
@@ -92,7 +92,7 @@
       "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
       "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
       "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
-      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ytsafety&sn=%1$s"
+      "bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s"
     }
   }
 }