diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java index 849925cefb..65df5450fa 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java @@ -39,6 +39,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.och.bus.R; +import com.mogo.och.bus.ui.BusTrafficLightView; import com.mogo.och.bus.view.BusArcView; import com.mogo.och.bus.view.SlidePanelView; @@ -69,6 +70,7 @@ public abstract class BaseOchBusTabFragment { // 如果能自动驾驶，就自动驾驶，不能就提示 -// if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){ +// if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){ // return; // } // if (autopilotLoadingAnimator != null){ @@ -420,7 +425,7 @@ public abstract class BaseOchBusTabFragment callback) { - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } //获取当前高德坐标 mService.querySiteByCoordinate(MoGoAiCloudClientConfig.getInstance().getServiceAppId() @@ -76,9 +72,6 @@ public class OCHBusServiceManager { * @param callback */ public void resetStationStatus(Context context, int lineId, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.resetStationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new OchBusResetDrivingLineRequest(lineId)) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -93,9 +86,6 @@ public class OCHBusServiceManager { * @param callback */ public void leaveStation(Context context,int seq,int siteId,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.leaveStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusUpdateSiteStatusRequest(seq,siteId,OchBusOrderModel.getInstance().mLongitude @@ -113,9 +103,6 @@ public class OCHBusServiceManager { * @param callback */ public void arriveSiteStation(Context context,int seq,int siteId,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.arriveSiteStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusUpdateSiteStatusRequest(seq,siteId @@ -134,9 +121,6 @@ public class OCHBusServiceManager { */ public void queryStationLeaveAwayPassengers(Context context,int seq,int siteId ,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryStationLeaveAwayPassengers( MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new QueryLeaveAwayPassengersRequest(seq,siteId)) .subscribeOn( Schedulers.io() ) @@ -150,9 +134,6 @@ public class OCHBusServiceManager { * @param callback */ public void stopTakeOrder(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.stopTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude @@ -168,9 +149,6 @@ public class OCHBusServiceManager { * @param callback */ public void startTakeOrder(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.startTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude @@ -186,9 +164,6 @@ public class OCHBusServiceManager { * @param callback */ public void queryOperationStatus(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryOperationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn( Schedulers.io() ) @@ -202,9 +177,6 @@ public class OCHBusServiceManager { * @param callback */ public void queryBusOrders(Context context, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryBusOrders(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -213,9 +185,6 @@ public class OCHBusServiceManager { } public void queryBusLines(Context context, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(IOchBusApiService.class,baseUrl); - } mService.queryBusLines(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -232,10 +201,6 @@ public class OCHBusServiceManager { */ public void runCarHeartbeat(Context context, double lon, double lat, OCHServiceCallback callback) { - if ( mService == null ) { - mService = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(IOchBusApiService.class, baseUrl); - } mService.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new CarHeartbeatReqBean( MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat)) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index ea97ad4f27..b191a1e1eb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -15,7 +15,6 @@ import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -41,7 +40,6 @@ import com.mogo.och.bus.net.OCHBusServiceManager; import com.mogo.och.bus.net.OCHServiceCallback; import com.mogo.och.bus.util.OchBusAnalyticsUtil; import com.mogo.och.bus.util.PinYinUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -289,27 +287,8 @@ public class OchBusOrderModel { @Override public void onCarLocationChanged2( Location location ) { // CallerLogger.INSTANCE.d(M_BUS + TAG,"location = "+location.getLongitude()+","+location.getLatitude()); - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固化值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - /** - * TODO: 2021/10/20 - * 因ALocationClient实际无坐标返回，所以此处从custom map中AMapViewWrapper获取坐标并反馈回用于坐标上传 - * {@link com.mogo.map.impl.custom.location.ALocationClient} - */ - apis.getLocationInfoApi().provideLocation(mogoLocation); - mLongitude = location.getLongitude(); mLatitude = location.getLatitude(); - if (mControllerStatusCallback != null) { mControllerStatusCallback.onCarLocationChanged(location); } @@ -431,7 +410,7 @@ public class OchBusOrderModel { OchBusStation nextStation = stationList.get( currentStationIndex); // if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -// == Integer.parseInt(DebugConfig.getAutoPilotStatus())) { +// == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { // TipToast.shortTip("自动驾驶状态为不可用！"); // } AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusTrafficLightView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusTrafficLightView.java new file mode 100644 index 0000000000..561ba5e3ee --- /dev/null +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusTrafficLightView.java @@ -0,0 +1,165 @@ +package com.mogo.och.bus.ui; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.ImageView; + +import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.och.bus.R; + +import org.jetbrains.annotations.Nullable; + +/** + * Bus司机端：红绿灯view + * + * Created on 2022/3/29 + */ +public class BusTrafficLightView extends IViewTrafficLight { + + private ImageView mLightIconIV; + private GradientTextView mLightTimeTV; + private int mCurrentLightId; + + public BusTrafficLightView(@Nullable Context context) { + this(context, null, 0); + } + + public BusTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public BusTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + private void init(Context context) { + LayoutInflater.from(context).inflate(R.layout.bus_traffic_light_view, this, true); + mLightIconIV = findViewById(R.id.bus_traffic_light_iv); + mLightTimeTV = findViewById(R.id.bus_traffic_light_time_tv); + } + + /** + * 展示红绿灯预警 + * + * @param checkLightId 0-都是默认，1-红，2-黄，3-绿 + */ + @Override + public void showWarningTrafficLight(int checkLightId) { + super.showWarningTrafficLight(checkLightId); + mCurrentLightId = checkLightId; + updateTrafficLightIcon(checkLightId); + } + + /** + * 关闭红绿灯预警展示，并重制灯态 + */ + @Override + public void disableWarningTrafficLight() { + super.disableWarningTrafficLight(); + UiThreadHandler.post(() -> { + mCurrentLightId = 0; + BusTrafficLightView.this.setVisibility(GONE); + }); + } + + /** + * @param redNum 红灯倒计时 + * @param yellowNum 黄灯倒计时 + * @param greenNum 绿灯倒计时 + */ + @Override + public void changeCountdownTrafficLightNum(int redNum, int yellowNum, int greenNum) { + super.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum); + switch (mCurrentLightId) { + case 1: + changeCountdownRed(redNum); + break; + case 2: + changeCountdownYellow(yellowNum); + break; + case 3: + changeCountdownGreen(greenNum); + break; + default: + UiThreadHandler.post(() -> { + mLightTimeTV.setText(""); + }); + break; + } + } + + @Override + public void changeCountdownRed(int redNum) { + super.changeCountdownRed(redNum); + UiThreadHandler.post(() -> { + if (redNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.bus_traffic_light_red_color_up), + getResources().getColor(R.color.bus_traffic_light_red_color_down)}); + mLightTimeTV.setText(String.valueOf(redNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + @Override + public void changeCountdownGreen(int greenNum) { + super.changeCountdownGreen(greenNum); + UiThreadHandler.post(() -> { + if (greenNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.bus_traffic_light_green_color_up), + getResources().getColor(R.color.bus_traffic_light_green_color_down)}); + mLightTimeTV.setText(String.valueOf(greenNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + @Override + public void changeCountdownYellow(int yellowNum) { + super.changeCountdownYellow(yellowNum); + UiThreadHandler.post(() -> { + if (yellowNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.bus_traffic_light_yellow_color_up), + getResources().getColor(R.color.bus_traffic_light_yellow_color_down)}); + mLightTimeTV.setText(String.valueOf(yellowNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + /** + * 更新红绿灯icon + * + * @param lightId 0-都是默认，1-红，2-黄，3-绿 + */ + private void updateTrafficLightIcon(int lightId) { + UiThreadHandler.post(() -> { + switch (lightId) { + case 1: + mLightIconIV.setBackgroundResource(R.drawable.bus_light_red_nor); + BusTrafficLightView.this.setVisibility(VISIBLE); + break; + case 2: + mLightIconIV.setBackgroundResource(R.drawable.bus_lightyellow_nor); + BusTrafficLightView.this.setVisibility(VISIBLE); + break; + case 3: + mLightIconIV.setBackgroundResource(R.drawable.bus_light_green_nor); + BusTrafficLightView.this.setVisibility(VISIBLE); + break; + default: + BusTrafficLightView.this.setVisibility(GONE); + break; + } + }); + } +} diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/GradientTextView.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/GradientTextView.java new file mode 100644 index 0000000000..c93f1c1475 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/GradientTextView.java @@ -0,0 +1,113 @@ +package com.mogo.och.bus.ui; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.LinearGradient; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.Shader; +import android.util.AttributeSet; + +import androidx.appcompat.widget.AppCompatTextView; + +/** + * @author: wangmingjun + * @date: 2022/3/22 + */ +public class GradientTextView extends AppCompatTextView { + + private LinearGradient mLinearGradient; + private Paint mPaint; + private int mViewWidth = 0;//文字的宽度 + private int mViewHeight = 0;//文字的高度 + private Rect mTextBound = new Rect(); + private int[] mColorList;//存放颜色的数组 + private boolean isVertrial;//默认是横向 + + private float mRadius; + private float mdx; + private float mdy; + private int mColor; + + public GradientTextView(Context context) { + this(context, null); + } + + public GradientTextView(Context context, + AttributeSet attrs) { + super(context, attrs); + //设置默认的颜色 + mColorList = new int[]{0xFFFFFFFF, 0xFFFFFFF}; + } + + + @Override + protected void onDraw(Canvas canvas) { + + if (isVertrial) { + mViewHeight = getMeasuredHeight(); + } else { + mViewWidth = getMeasuredWidth(); + } + mPaint = getPaint(); + String mTipText = getText().toString(); + + setStyle(); + + mPaint.getTextBounds(mTipText, 0, mTipText.length(), mTextBound); + + mPaint.setShadowLayer(mRadius, mdx, mdy, mColor); + + //画出文字 + canvas.drawText(mTipText, getMeasuredWidth() / 2 - mTextBound.width() / 2, getMeasuredHeight() / 2 + mTextBound.height() / 2, mPaint); + } + + /** + * true表示纵向渐变,false变身横向渐变 + * + * @param vertrial + */ + public void setVertrial(boolean vertrial) { + isVertrial = vertrial; + } + + /** + * 设置渐变的颜色 + * + * @param mColorList + */ + public void setmColorList(int[] mColorList) { + if (mColorList != null && mColorList.length < 2) { + throw new RuntimeException("ClorList's length must be > 2"); + } else { + + this.mColorList = mColorList; + } + } + + public void setStyle() { + mPaint.setAntiAlias(true); + mPaint.setDither(true); + mPaint.setFilterBitmap(true); + //前面4个参数分别表示渐变的开始x轴,开始y轴,结束的x轴,结束的y轴,mcolorList表示渐变的颜色数组 + mLinearGradient = new LinearGradient(0, 0, mViewWidth, mViewHeight, mColorList, null, Shader.TileMode.CLAMP); + mPaint.setShader(mLinearGradient); + mPaint.setStrokeJoin(Paint.Join.ROUND); + mPaint.setStrokeCap(Paint.Cap.ROUND); + mPaint.setStyle(Paint.Style.FILL_AND_STROKE); + } + + /** + * 设置投影层 + * @param radius + * @param dx + * @param dy + * @param color + */ + public void setShadowLayerCustom(float radius, float dx, float dy, int color) { + this.mRadius = radius; + this.mdx = dx; + this.mdy = dy; + this.mColor = color; + } +} diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_green_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_green_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_red_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_light_red_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_lightyellow_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_lightyellow_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_green_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_light_red_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_lightyellow_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_green_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_red_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/mogo-och-bus/src/main/res/drawable/bg_bus_traffic_light_background.xml new file mode 100644 index 0000000000..e0b90b9c55 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/drawable/bg_bus_traffic_light_background.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 7cf9966090..6d12e21ed6 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -230,4 +230,13 @@ app:constraint_referenced_ids="btnAutopilotArrive,btnAutopilotDisable,btnAutopilotEnable,btnAutopilotRunning" tools:visibility="visible" /> + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_traffic_light_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_traffic_light_view.xml new file mode 100644 index 0000000000..05f2d9c38b --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_traffic_light_view.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml index 3ef9d9d932..a27b69ae1d 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -124,4 +124,16 @@ 20px + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml index 8f068b0633..9c23585e71 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -121,4 +121,17 @@ 120px 86px 50px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/colors.xml b/OCH/mogo-och-bus/src/main/res/values/colors.xml index a702d05967..600e6c2c33 100644 --- a/OCH/mogo-och-bus/src/main/res/values/colors.xml +++ b/OCH/mogo-och-bus/src/main/res/values/colors.xml @@ -38,4 +38,10 @@ #19FFFFFF #FFFFFF + #FFFFA28B + #FFDA1100 + #FF60FFD3 + #FF006D43 + #FFFFE198 + #FFFF9B00 \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml index 49e258a5e0..51d39b3e5c 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -137,4 +137,17 @@ 72px 52px 20px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index 9629b59e80..e450440578 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -17,7 +17,6 @@ import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.v2x.LimitingVelocityListener; @@ -431,23 +430,10 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback }; // 自车定位 - private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { + private final IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { @Override public void onCarLocationChanged2( Location location ) { - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固话值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - - apis.getLocationInfoApi().provideLocation(mogoLocation); //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEndStation) { @@ -462,7 +448,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } }; - private IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ + private final IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ @Override public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java index a8d3c2cd88..b8c6eaa831 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java @@ -7,6 +7,7 @@ import android.content.Context; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.RequestOptions; import com.mogo.eagle.core.network.SubscribeImpl; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; @@ -35,13 +36,11 @@ public class TaxiPassengerServiceManager { return SingletonHolder.INSTANCE; } - private String baseUrl = TaxiPassengerConst.getBaseUrl(); private TaxiPassengerServiceApi mOCHTaxiServiceApi; private TaxiPassengerServiceManager() { if (mOCHTaxiServiceApi == null){ - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); + mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(TaxiPassengerConst.getBaseUrl()).create(TaxiPassengerServiceApi.class); } } @@ -61,10 +60,6 @@ public class TaxiPassengerServiceManager { */ public void queryOrdersInAndWaitService(Context context, TaxiPassengerServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,getDriverAppSn()) //获取到司机端的sn @@ -80,10 +75,6 @@ public class TaxiPassengerServiceManager { * @param callback */ public void queryOrderRemaining(Context context, String orderNo, TaxiPassengerServiceCallback callback){ - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderRemaining(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,orderNo) @@ -114,10 +105,6 @@ public class TaxiPassengerServiceManager { */ public void queryOrderById(Context context, String orderNo, TaxiPassengerServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new TaxiPassengerOrderQueryReqBean(getDriverAppSn(), orderNo)) diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml index 86fec7678b..5055eaa928 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml @@ -28,7 +28,6 @@ android:layout_height="match_parent" android:textSize="@dimen/taxi_p_traffic_light_time_size" android:textStyle="bold" - android:text="300" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:gravity="center" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml index 702aa40369..7e4f321016 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml @@ -37,7 +37,7 @@ 15px 17px 154px - 127px + 130px 60px 31px diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml index 88aec68c97..4979821f90 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -106,7 +106,7 @@ 15px 17px 154px - 127px + 130px 60px 31px diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java index d08638bacf..2df145c0ac 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java @@ -1,7 +1,6 @@ package com.mogo.och.taxi.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; import android.content.Context; import android.content.Intent; @@ -19,7 +18,6 @@ import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; @@ -58,7 +56,6 @@ import com.mogo.och.taxi.utils.CoordinateCalculateRouteUtil; import com.mogo.och.taxi.utils.OchTaxiAnalyticsUtil; import com.mogo.och.taxi.utils.OrderUtil; import com.mogo.och.taxi.utils.PinYinUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; @@ -793,8 +790,9 @@ public class MogoOCHTaxiModelNew { return; } + if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE - == Integer.parseInt(DebugConfig.getAutoPilotStatus())) { + == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { // TODO: 2021/11/28 工控机存在刚开始状态为0，但是可以开启变为2，工控机解决前不显示此toast // TipToast.shortTip("自动驾驶状态为不可用！"); } @@ -856,6 +854,12 @@ public class MogoOCHTaxiModelNew { // mOrderStatusCallback.onCurrentOrderDistToStartChanged((long) distance, 0); // } + if (distance > OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { + distance = CoordinateUtils.calculateLineDistance(startLon, startLat, + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat()); + } + if (distance <= OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { updateOCHOrderStatus(OrderStatusEnum.ArriveAtStartStation); return; @@ -925,19 +929,6 @@ public class MogoOCHTaxiModelNew { @Override public void onCarLocationChanged2(Location location) { - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固话值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - - apis.getLocationInfoApi().provideLocation(mogoLocation); //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToStartStation) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java index a36d7576b7..164219f3ea 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java @@ -6,10 +6,10 @@ import android.content.Context; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.BaseData; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.RequestOptions; import com.mogo.eagle.core.network.SubscribeImpl; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.module.common.MogoApisHandler; import com.mogo.och.taxi.bean.CarHeartbeatReqBean; import com.mogo.och.taxi.bean.DriverServiceDataRespBean; import com.mogo.och.taxi.bean.DriverStatusQueryRespBean; @@ -51,13 +51,11 @@ public class OCHTaxiServiceManagerNew { return SingletonHolder.INSTANCE; } - private String baseUrl = OCHTaxiConst.getBaseUrl(); private OCHTaxiServiceApiNew mOCHTaxiServiceApi; private OCHTaxiServiceManagerNew() { if (mOCHTaxiServiceApi == null){ - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); + mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(OCHTaxiConst.getBaseUrl()).create(OCHTaxiServiceApiNew.class); } } @@ -68,10 +66,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrdersInAndWaitService(Context context, OCHTaxiServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -87,10 +81,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryNewBookingOrder(Context context, OCHTaxiServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryNewBookingOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -107,10 +97,6 @@ public class OCHTaxiServiceManagerNew { */ public void grabOrder(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.grabOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -128,10 +114,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderGrabStatus(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderGrabStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -149,10 +131,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderRouteInfo(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderRouteInfo(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryRouteInfoReqBean( @@ -171,10 +149,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderById(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryReqBean( @@ -193,10 +167,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderInService(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -215,10 +185,6 @@ public class OCHTaxiServiceManagerNew { */ public void cancelOrder(Context context, String orderNo, int cancelType, String cancelReason, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.cancelOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderCancelReqBean( @@ -237,10 +203,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrdersList(Context context, int page, int size, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersList(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrdersListQueryReqBean( @@ -259,10 +221,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateOrderStatus(Context context, String orderNo, int orderStatus, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateOrderStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderStatusUpdateReqBean( @@ -280,10 +238,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateDriverServiceStatus(Context context, int status, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new DriverStatusUpdateReqBean( @@ -300,10 +254,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryDriverServiceStatus(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -321,10 +271,6 @@ public class OCHTaxiServiceManagerNew { */ public void runCarHeartbeat(Context context, double lon, double lat, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new CarHeartbeatReqBean( @@ -341,10 +287,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryDriverServiceData(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryServiceData(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -361,10 +303,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateOrderRoute(Context context, String orderNo, List points, OCHTaxiServiceCallback callback){ - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderRouteUpdateReqBean(orderNo,points)) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java index df823a11d3..000bbc5051 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java @@ -77,6 +77,7 @@ public abstract class BaseOchTaxiTabFragment 2"); + } else { + + this.mColorList = mColorList; + } + } + + public void setStyle() { + mPaint.setAntiAlias(true); + mPaint.setDither(true); + mPaint.setFilterBitmap(true); + //前面4个参数分别表示渐变的开始x轴,开始y轴,结束的x轴,结束的y轴,mcolorList表示渐变的颜色数组 + mLinearGradient = new LinearGradient(0, 0, mViewWidth, mViewHeight, mColorList, null, Shader.TileMode.CLAMP); + mPaint.setShader(mLinearGradient); + mPaint.setStrokeJoin(Paint.Join.ROUND); + mPaint.setStrokeCap(Paint.Cap.ROUND); + mPaint.setStyle(Paint.Style.FILL_AND_STROKE); + } + + /** + * 设置投影层 + * @param radius + * @param dx + * @param dy + * @param color + */ + public void setShadowLayerCustom(float radius, float dx, float dy, int color) { + this.mRadius = radius; + this.mdx = dx; + this.mdy = dy; + this.mColor = color; + } +} + diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiTrafficLightView.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiTrafficLightView.java new file mode 100644 index 0000000000..1567404022 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiTrafficLightView.java @@ -0,0 +1,165 @@ +package com.mogo.och.taxi.ui; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.ImageView; + +import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.och.taxi.R; + +import org.jetbrains.annotations.Nullable; + +/** + * Taxi司机端：红绿灯view + * + * Created on 2022/3/29 + */ +public class TaxiTrafficLightView extends IViewTrafficLight { + + private ImageView mLightIconIV; + private GradientTextView mLightTimeTV; + private int mCurrentLightId; + + public TaxiTrafficLightView(@Nullable Context context) { + this(context, null, 0); + } + + public TaxiTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public TaxiTrafficLightView(@Nullable Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + private void init(Context context) { + LayoutInflater.from(context).inflate(R.layout.taxi_traffic_light_view, this, true); + mLightIconIV = findViewById(R.id.taxi_traffic_light_iv); + mLightTimeTV = findViewById(R.id.taxi_traffic_light_time_tv); + } + + /** + * 展示红绿灯预警 + * + * @param checkLightId 0-都是默认，1-红，2-黄，3-绿 + */ + @Override + public void showWarningTrafficLight(int checkLightId) { + super.showWarningTrafficLight(checkLightId); + mCurrentLightId = checkLightId; + updateTrafficLightIcon(checkLightId); + } + + /** + * 关闭红绿灯预警展示，并重制灯态 + */ + @Override + public void disableWarningTrafficLight() { + super.disableWarningTrafficLight(); + UiThreadHandler.post(() -> { + mCurrentLightId = 0; + TaxiTrafficLightView.this.setVisibility(GONE); + }); + } + + /** + * @param redNum 红灯倒计时 + * @param yellowNum 黄灯倒计时 + * @param greenNum 绿灯倒计时 + */ + @Override + public void changeCountdownTrafficLightNum(int redNum, int yellowNum, int greenNum) { + super.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum); + switch (mCurrentLightId) { + case 1: + changeCountdownRed(redNum); + break; + case 2: + changeCountdownYellow(yellowNum); + break; + case 3: + changeCountdownGreen(greenNum); + break; + default: + UiThreadHandler.post(() -> { + mLightTimeTV.setText(""); + }); + break; + } + } + + @Override + public void changeCountdownRed(int redNum) { + super.changeCountdownRed(redNum); + UiThreadHandler.post(() -> { + if (redNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.taxi_traffic_light_red_color_up), + getResources().getColor(R.color.taxi_traffic_light_red_color_down)}); + mLightTimeTV.setText(String.valueOf(redNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + @Override + public void changeCountdownGreen(int greenNum) { + super.changeCountdownGreen(greenNum); + UiThreadHandler.post(() -> { + if (greenNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.taxi_traffic_light_green_color_up), + getResources().getColor(R.color.taxi_traffic_light_green_color_down)}); + mLightTimeTV.setText(String.valueOf(greenNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + @Override + public void changeCountdownYellow(int yellowNum) { + super.changeCountdownYellow(yellowNum); + UiThreadHandler.post(() -> { + if (yellowNum > 0) { + mLightTimeTV.setVertrial(true); + mLightTimeTV.setmColorList(new int[]{getResources().getColor(R.color.taxi_traffic_light_yellow_color_up), + getResources().getColor(R.color.taxi_traffic_light_yellow_color_down)}); + mLightTimeTV.setText(String.valueOf(yellowNum)); + } else { + mLightTimeTV.setText(""); + } + }); + } + + /** + * 更新红绿灯icon + * + * @param lightId 0-都是默认，1-红，2-黄，3-绿 + */ + private void updateTrafficLightIcon(int lightId) { + UiThreadHandler.post(() -> { + switch (lightId) { + case 1: + mLightIconIV.setBackgroundResource(R.drawable.taxi_light_red_nor); + TaxiTrafficLightView.this.setVisibility(VISIBLE); + break; + case 2: + mLightIconIV.setBackgroundResource(R.drawable.taxi_lightyellow_nor); + TaxiTrafficLightView.this.setVisibility(VISIBLE); + break; + case 3: + mLightIconIV.setBackgroundResource(R.drawable.taxi_light_green_nor); + TaxiTrafficLightView.this.setVisibility(VISIBLE); + break; + default: + TaxiTrafficLightView.this.setVisibility(GONE); + break; + } + }); + } +} diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_green_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_light_red_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_lightyellow_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_green_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_light_red_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_lightyellow_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png new file mode 100644 index 0000000000..bc9fed952d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png new file mode 100644 index 0000000000..8732508ded Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png new file mode 100644 index 0000000000..bae01408fd Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml new file mode 100644 index 0000000000..d93d55da56 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index 71532e41b4..26963bb31d 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml @@ -269,4 +269,14 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:src="@drawable/taxi_close_navi_icon"/> + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml new file mode 100644 index 0000000000..badf0a393e --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml index bc5aa49d07..c58602dcd2 100644 --- a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml @@ -88,4 +88,17 @@ 220px 16px + + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml index 57d4a93749..7dd0bd4e6b 100644 --- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -89,4 +89,16 @@ 16px + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/colors.xml b/OCH/mogo-och-taxi/src/main/res/values/colors.xml index da629efd4c..6cec08f793 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/colors.xml @@ -15,4 +15,11 @@ #FF52BBFF #4DFFFFFF + + #FFFFA28B + #FFDA1100 + #FF60FFD3 + #FF006D43 + #FFFFE198 + #FFFF9B00 \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml index bfbb7d9072..ae72969ee1 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml @@ -87,4 +87,16 @@ 16px + 225px + 154px + 60px + 40px + 23px + 210px + 120px + 15px + 17px + 154px + 130px + 60px \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 209b9e5144..7528c86e94 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ android:resizeableActivity="false" android:usesCleartextTraffic="true" android:supportsRtl="true" - android:theme="@style/AppTheme.App" + android:theme="@style/Main" tools:replace="android:label"> diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 2302ddf666..73921d2321 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -107,9 +107,13 @@ public class MogoApplication extends MainMoGoApplication { if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxi") || DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxiPassenger")) { HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche; + //是否显示 红绿等 + HmiBuildConfig.isShowTrafficLightView = false; } else if (DebugConfig.getProductFlavor().equals("fPadLenovoOchBus") || DebugConfig.getProductFlavor().equals("fPadLenovoOchBusPassenger")) { HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache; + //是否显示 红绿等 + HmiBuildConfig.isShowTrafficLightView = false; HmiBuildConfig.isShowBrakeLightView = false; HmiBuildConfig.isShowTurnLightView = false; } @@ -117,8 +121,6 @@ public class MogoApplication extends MainMoGoApplication { if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxiPassenger")) { //是否显示 限速UI HmiBuildConfig.isShowLimitingVelocityView = false; - //是否显示 红绿等 - HmiBuildConfig.isShowTrafficLightView = false; //是否显示 路侧监控 HmiBuildConfig.isShowCameraView = false; } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bd09796588..7e091a2301 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,5 +5,4 @@ #D81B60 - #1C1C1C diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0973015c8f..cc42d0d0c2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,31 +8,5 @@ @color/colorAccent - - - diff --git a/config.gradle b/config.gradle index bc53544d66..a3a3365cb6 100644 --- a/config.gradle +++ b/config.gradle @@ -12,8 +12,8 @@ ext { commonIndependentAmapApiValue : "1c3fbc5f5e183619ffb1e7bc01e6751f", compileSdkVersion : 29, buildToolsVersion : "29.0.2", - minSdkVersion : 19, - targetSdkVersion : 19, + minSdkVersion : 21, + targetSdkVersion : 21, minSdkVersionPadLenovo : 23, targetSdkVersionPadLenovo : 23, ] diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 92fcd2e26d..17c995a697 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -11,7 +11,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS @@ -19,6 +18,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LO import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.invokeArriveAtStation @@ -37,8 +37,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showAdUpgradeStatu import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showDockerRebootResult import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.module.common.MogoApisHandler -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasListener import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo @@ -125,21 +123,13 @@ class MoGoAdasListenerImpl : OnAdasListener { ) override fun onGnssInfo(header: MessagePad.Header, gnssInfo: MessagePad.GnssInfo?) { invokeAutopilotCarStateData(gnssInfo) - // 同步给MAP地图 if (gnssInfo != null) { - MogoApisHandler.getInstance().apis.adasControllerApi.lastLat = gnssInfo.latitude - MogoApisHandler.getInstance().apis.adasControllerApi.lastLon = gnssInfo.longitude - MogoApisHandler.getInstance().apis.adasControllerApi.satelliteTime = - java.lang.Double.valueOf(gnssInfo.satelliteTime).toLong() - if (1 == FunctionBuildConfig.gpsProvider) { - CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map( - gnssInfo - ) - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(gnssInfo) + // 同步给MAP地图 + CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(gnssInfo) + // 同步更新经纬度和系统时间至 AutoPilotStatusListener + CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(gnssInfo.satelliteTime.toLong(),gnssInfo.longitude, gnssInfo.latitude) } - //根据加速度判断 是否刹车 - CallerAutopilotVehicleStateListenerManager.invokeAutopilotBrakeLightByAcceleration(gnssInfo.acceleration) } } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 784f21cfb5..c80a2da935 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -1,13 +1,18 @@ package com.mogo.eagle.core.function.autopilot.adapter; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.text.TextUtils; -import android.util.Log; + +import androidx.annotation.Nullable; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; @@ -24,12 +29,11 @@ import chassis.Chassis; import mogo.telematics.pad.MessagePad; import record_cache.RecordPanelOuterClass; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; - public class MoGoHandAdasMsgManager implements IMoGoAutopilotIdentifyListener, IMoGoAutopilotVehicleStateListener, - IMoGoAutopilotCarConfigListener{ + IMoGoAutopilotCarConfigListener, + IMoGoAutopilotCarStateListener { private final String TAG = "AdasEventManager"; @@ -39,6 +43,7 @@ public class MoGoHandAdasMsgManager implements CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this); + CallerAutopilotCarStatusListenerManager.INSTANCE.addListener(TAG, this); } public static MoGoHandAdasMsgManager getInstance() { @@ -91,17 +96,13 @@ public class MoGoHandAdasMsgManager implements } else { isShowTurnLight = false; } -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotLightSwitchData -- newState:" + state + ",oldState:" + lightSwitch.getNumber()); CallerHmiManager.INSTANCE.showTurnLight(state); } } @Override public void onAutopilotBrakeLightData(boolean brakeLight) { -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightData -- brakeLight = $brakeLight ---$isShowTurnLight"); -// if (!isShowTurnLight) { -// CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0); -// } + } @Override @@ -137,22 +138,20 @@ public class MoGoHandAdasMsgManager implements } } - /** - * 根据加速度判断是否刹车 - * @param acceleration - */ @Override - public void onAutopilotBrakeLightByAcceleration(double acceleration) { - //设置刹车信息 - if (acceleration < -2.5) { - brakeLight = 1; - } else { - brakeLight = 0; + public void onAutopilotCarStateData(@Nullable MessagePad.GnssInfo gnssInfo) { + //根据加速度判断 是否刹车 + if (gnssInfo != null) { + //设置刹车信息 + if (gnssInfo.getAcceleration() < -2.5) { + brakeLight = 1; + } else { + brakeLight = 0; + } + if (!isShowTurnLight) { + ThreadUtils.runOnUiThread(() -> CallerHmiManager.INSTANCE.showBrakeLight(brakeLight)); + } } -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightByAcceleration -- acceleration = " + acceleration); - if (!isShowTurnLight) { - CallerHmiManager.INSTANCE.showBrakeLight(brakeLight); - } - } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt index d76c9cc63b..c547500c50 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseView.kt @@ -61,7 +61,7 @@ internal class BadCaseView: ConstraintLayout { close?.onClick { onDismiss?.invoke() } - fitsSystemWindows = true + //fitsSystemWindows = true cancel?.also { it.background = shape(solid = Color.parseColor("#3B4577"), radius = 16) it.onClick { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index 5baadf1dc3..641b77d024 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_NETWORK import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X @@ -35,6 +36,7 @@ class SceneManager { private const val BUS = "BUS" private const val TAXI = "TAXI" private const val TAXI_P = "TAXI-P" + private const val OTHER = "OTHER" val sceneManager: SceneManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { SceneManager() @@ -57,6 +59,7 @@ class SceneManager { sceneModuleTAG.map[BUS] = SceneModule(false, M_BUS) sceneModuleTAG.map[TAXI] = SceneModule(false, M_TAXI) sceneModuleTAG.map[TAXI_P] = SceneModule(false, M_TAXI_P) + sceneModuleTAG.map[OTHER] = SceneModule(false, M_OTHER) sceneLogTAG.map[TAXI] = SceneTAG(false) sceneLogTAG.map[BUS] = SceneTAG(false) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 5ffa84b7e7..b9cb896454 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -195,14 +195,23 @@ class MoGoHmiFragment : MvpFragment } } + /** + * 设置 V2X 通知 代理View + */ override fun setProxyNotificationView(view: IViewNotification) { mViewNotification = view } + /** + * 设置 红绿灯 代理View + */ override fun setProxyTrafficLightView(view: IViewTrafficLight) { mViewTrafficLight = view } + /** + * 设置 限速 代理View + */ override fun setProxyLimitingSpeedView(view: IViewLimitingVelocity) { mViewLimitingVelocity = view } @@ -237,7 +246,7 @@ class MoGoHmiFragment : MvpFragment .setTag("ToolsViewFloat") .setLayout(toolsView!!) .setSidePattern(SidePattern.LEFT) - .setGravity(Gravity.LEFT, offsetY = 72) + .setGravity(Gravity.LEFT) .setImmersionStatusBar(true) .setWindowHeight(WindowManager.LayoutParams.MATCH_PARENT) .setAnimator(object : DefaultAnimator() { @@ -756,7 +765,7 @@ class MoGoHmiFragment : MvpFragment .setTag("CameraListFloat") .setLayout(cameraListView!!) .setSidePattern(SidePattern.RIGHT) - .setGravity(Gravity.RIGHT, -40, 280) + .setGravity(Gravity.RIGHT, -40, 255) .setImmersionStatusBar(true) .setAnimator(object : DefaultAnimator() { override fun enterAnim( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index ba343cca12..d381f12080 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -21,6 +21,7 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.data.notice.NoticeValue; import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.call.notice.CallerNoticeManager; import com.mogo.eagle.core.function.hmi.R; @@ -173,13 +174,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs parameters.vehicleType = 10; //云平台使用的是火星坐标,自动驾驶需要wgs84 double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon()); - AutopilotControlParameters.AutoPilotLonLat startLocation = new AutopilotControlParameters.AutoPilotLonLat - (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat()); - parameters.startLatLon = startLocation; - AutopilotControlParameters.AutoPilotLonLat endLocation = new AutopilotControlParameters.AutoPilotLonLat + parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat + (CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); + parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat (gcj02[0], gcj02[1]); - parameters.endLatLon = endLocation; CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 21a25409f3..66a9dda270 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -845,6 +845,8 @@ class DebugSettingView @JvmOverloads constructor( SceneConstant.M_TAXI -> cbTaxiLog.isChecked = log //TAXI_P日志标签 SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log + //其他模块日志(暂未区分具体模块) + SceneConstant.M_OTHER -> cbOtherLog.isChecked = log } } } @@ -942,6 +944,12 @@ class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_TAXI_P] = taxiPModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } + //其他未分类模块日志 + cbOtherLog.setOnCheckedChangeListener { _, isChecked -> + val otherModule = SceneModule(isChecked, SceneConstant.M_OTHER) + sceneMap[SceneConstant.M_OTHER] = otherModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } //开始停止抓取全量日志 tbLogCatch.isChecked = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 545ae2765b..c689d665ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -10,6 +10,8 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lat +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lon import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -84,10 +86,7 @@ class AutoPilotStatusView @JvmOverloads constructor( currentAutopilot.endName = "HYJC" currentAutopilot.isSpeakVoice = false currentAutopilot.startLatLon = - AutopilotControlParameters.AutoPilotLonLat( - MogoApisHandler.getInstance().apis.adasControllerApi.lastLat, - MogoApisHandler.getInstance().apis.adasControllerApi.lastLon - ) + AutopilotControlParameters.AutoPilotLonLat(getCurWgs84Lat(),getCurWgs84Lon()) currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(26.819716071924688, 112.57715442110867) currentAutopilot.vehicleType = 10 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 33fb48ffc0..4cb2702ebb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -53,6 +53,18 @@ app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart" app:layout_goneMarginStart="@dimen/module_mogo_autopilot_status_margin_left" /> + + + - - - - - - - - - + + app:layout_goneMarginStart="50px" /> + app:layout_constraintCircle="@id/ivToolsIcon" + app:layout_constraintCircleAngle="45" + app:layout_constraintCircleRadius="60px" + tools:ignore="MissingConstraints" /> - - @@ -159,23 +151,23 @@ android:id="@+id/turnLightView" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="parent" + android:layout_marginTop="42px" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - android:layout_marginTop="42px" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> - - - + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index a0f9958855..fe5719b2b0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1368,7 +1368,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="false" - android:text="TAXI_P日志" /> + android:text="乘客屏日志" /> + + diff --git a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml index 9ed171e1dc..da2988996a 100644 --- a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml @@ -38,7 +38,6 @@ android:resumeWhilePausing="true" android:screenOrientation="landscape" android:stateNotNeeded="true" - android:theme="@style/Main" android:windowSoftInputMode="adjustPan|stateHidden"> diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 0858fe21b9..18aabb3be3 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -33,6 +33,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils; import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; +import com.mogo.eagle.core.utilcode.util.BarUtils; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.listener.IMogoHosListenerRegister; diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index d8b205af5c..201eac3af4 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -305,7 +305,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 开启Socket长链服务 double lat = location.getLatitude(); double lon = location.getLongitude(); - CallerLogger.INSTANCE.d(M_MAIN + TAG,"emArrow lat : " + lat + " , lon : " + lon); apis.getSocketManagerApi(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(),lat,lon); } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java index af38fd178b..70d175f446 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java @@ -51,7 +51,6 @@ class MogoMainService extends Service implements IMogoLocationListener { UiThreadHandler.postDelayed(() -> { CallerLogger.INSTANCE.d(M_MAIN + TAG, "5秒已过，启动基础服务……"); loadBaseModules(); - initADAS(); initGpsSimulatorListener(); HdMapBuildConfig.isMapLoaded = true; }, 5_000L @@ -97,12 +96,6 @@ class MogoMainService extends Service implements IMogoLocationListener { MogoModulesManager.getInstance().loadBaseModule(); } - private void initADAS() { - if (mServiceApis != null) { - mServiceApis.getAdasControllerApi().init(AbsMogoApplication.getApp()); - } - } - @Override public void onLocationChanged(MogoLocation location) { EventDispatchCenter.getInstance().onLocationChanged(location); diff --git a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml index 38566ba5c3..20a27b4066 100644 --- a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml +++ b/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/module_main_window_background_color" + android:background="@drawable/main_splash_bg" android:orientation="vertical"> @@ -13,109 +13,104 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:fitsSystemWindows="true" + android:paddingTop="25dp"> - + android:visibility="gone" + tools:visibility="visible"> - + + + + + + + + + - + android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" + android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" + android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> - - + + - - + + - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_fragement_placeholder.xml b/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_fragement_placeholder.xml deleted file mode 100644 index 1b6457df1f..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_fragement_placeholder.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml index 639b257173..44ce84bc8c 100644 --- a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml +++ b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml @@ -1,4 +1,5 @@ #212831 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml index 1ed337e530..2f604869b6 100644 --- a/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml +++ b/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml @@ -2,8 +2,12 @@