yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source
This commit is contained in:
xinfengkun
2022-05-18 12:32:21 +08:00
parent f3001c2441 bf38c36780
commit fe27f454ea
8 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
View File

@@ -106,7 +106,7 @@ public class MoGoHandAdasMsgManager implements
@Override
public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
Log.d("liyz", "onAutopilotCarConfig ---------------------" + carConfigResp.getMacAddress() + "--lateNumber() = " + carConfigResp.getPlateNumber());
Log.d("liyz", "onAutopilotCarConfig ---------" + carConfigResp.getMacAddress() + "--lateNumber() = " + carConfigResp.getPlateNumber());
CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
}
}

15
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
View File

@@ -60,13 +60,13 @@ public class BindingcarNetWorkManager {
*
* @param macAddress mac地址
*/
public void getBindingcarInfo(Context context, String macAddress, int screenType) {
String sn = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp());
// String macAddress = "48:b0:2d:3a:bc:7";
// String sn = "X20202203105S688HZ";
// int screenType = 1;
public void getBindingcarInfo(Context context, String macAddress1, int screenType1) {
// String sn = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp());
String macAddress = "48:b0:2d:3a:bc:7";
String sn = "X20202203105S688HZ";
int screenType = 1;
Log.d("liyz", "getBindingcarInfo --- sn = " + sn + "--macAddress = " +macAddress + "--screenType = " + screenType);
Log.d("liyz", "getBindingcarInfo -- sn = " + sn + "--macAddress = " +macAddress + "--screenType = " + screenType);
BindingcarRequest request = new BindingcarRequest(macAddress, sn, screenType);
RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
mBindingcarApiService.getBindingcarInfo(token, requestBody)
@@ -100,7 +100,6 @@ public class BindingcarNetWorkManager {
@Override
public void onComplete() {
Log.d("liyz", "getBindingcarInfo onComplete -------- ");
}
});
@@ -130,8 +129,6 @@ public class BindingcarNetWorkManager {
callBack.callBackResult(info);
CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
Log.d("liyz", "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
} else {
Log.e("liyz", "modifyBindingcar info == null");
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt
View File

@@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.hmi.WaringConst
class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
private var mContext: Context? = null
//adb shell am broadcast -a com.hmi.v2x.trafficlight --ei trafficLightCheckType 1 --ei trafficLightCountDown 0 --ez trafficLightIsShow true
companion object {
private const val TAG = "V2XTrafficLightBroadcastReceiver"
}
@@ -57,9 +58,6 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
*/
private fun dispatchShowWaring(trafficLightCheckType: Int, trafficLightCountDown: Int) {
CallerHmiManager.showWarningTrafficLight(trafficLightCheckType)
if(trafficLightCountDown == 0 ){
CallerHmiManager.disableWarningTrafficLightCountDown()
}
when(trafficLightCheckType){
1 -> CallerHmiManager.changeCountdownRed(trafficLightCountDown)
2 -> CallerHmiManager.changeCountdownYellow(trafficLightCountDown)

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
View File

@@ -99,6 +99,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
)
mLightTimeTV!!.text = redNum.toString()
} else {
disableCountdown()
mLightTimeTV!!.text = ""
}
}
@@ -118,6 +119,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
)
mLightTimeTV!!.text = greenNum.toString()
} else {
disableCountdown()
mLightTimeTV!!.text = ""
}
}
@@ -137,6 +139,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
)
mLightTimeTV!!.text = yellowNum.toString()
} else {
disableCountdown()
mLightTimeTV!!.text = ""
}
}

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/collect/MoGoMapDataCollectProvider.kt
View File

@@ -51,7 +51,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
GatherApi.also { itx ->
itx.init(it,
GatherParams.init()
.setDebugMode(DebugConfig.isDebug())
.setDebugMode(false)
.setCoordinateType(GatherParams.COORDINATETYPE_GCJ02))
} })
executor.get()?.setOnTaskListener(this)