diff --git a/app/build.gradle b/app/build.gradle index 97f2c4cbc1..66a4af0052 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,13 +15,13 @@ if (!isAndroidTestBuild()) { logLevel "DEBUG" } } -//if (!isAndroidTestBuild()) { -// apply plugin: 'chain.log.hook' -// hooklog{ -// enableLoggerToServer false -// enableLoggerToLocal false -// } -//} +if (!isAndroidTestBuild()) { + apply plugin: 'chain.log.hook' + hooklog{ + enableTraceToServer false + enableLoggerToLocal true + } +} //if (!isAndroidTestBuild()) { // apply plugin: 'apm-plugin' @@ -233,8 +233,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.boostmultidex - compileOnly rootProject.ext.dependencies.adasapi - compileOnly rootProject.ext.dependencies.adasconfigapi debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index 9bb528f9a9..e688cb6413 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -58,5 +58,5 @@ dependencies { // api "com.zhidao.support.adas:high:1.2.1.2_bate21" implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.mogo.cloud:telematic:1.3.31' + implementation 'com.mogo.cloud:telematic:1.3.50' } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 532a214d64..13d7dac84d 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.telematic.MogoProtocolMsg import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA +import com.mogo.telematic.MogoProtocolMsg.SYNC_MODE_STATUS import com.mogo.telematic.NSDNettyManager import com.mogo.telematic.client.listener.NettyClientListener import com.mogo.telematic.client.status.ConnectState @@ -90,13 +91,9 @@ class MoGoAutopilotProvider : override fun onChannelConnect(channel: Channel?) { val socketAddress = channel?.remoteAddress().toString() CallerLogger.d("$M_ADAS_IMPL$TAG", "Client ip is:${socketAddress}") - synchronized(this@MoGoAutopilotProvider) { - NSDNettyManager.getInstance().selectChannel(channel) - var byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) - NSDNettyManager.getInstance().sendMogoProtocolMsgToClient(MogoProtocolMsg(3, byteArray.size, byteArray) - ) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") - } + val byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) + NSDNettyManager.getInstance().sendMsgToSpecifiedClient(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray), channel) { + CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") } } @@ -210,6 +207,13 @@ class MoGoAutopilotProvider : }, 1000, TimeUnit.MILLISECONDS) } + /** + * 断开与工控机的连接 + */ + override fun disconnectIpc() { + AdasManager.getInstance().disconnect() + } + override fun onMapCollectStart(cmdId: Int, cmdTime: Long) { val result = recordPackage(2, cmdId) CallerLogger.d("$M_ADAS_IMPL$TAG", "开始记录包: [$cmdId, $result]") @@ -328,7 +332,7 @@ class MoGoAutopilotProvider : var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0) if (NSDNettyManager.getInstance().isServerStart) { NSDNettyManager.getInstance() - .sendMsgToAllClients(MogoProtocolMsg(3, byteArray.size, byteArray)) + .sendMsgToAllClients(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray)) } else { CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！") } 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 25c28d16c0..f55d0ebf11 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 @@ -2,18 +2,24 @@ 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 com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener; 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.CallerAutopilotIdentifyListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.module.common.drawer.IdentifyDataDrawer; +import com.zhidao.support.adas.high.OnAdasConnectStatusListener; +import com.zhidao.support.adas.high.common.Constants; + import org.jetbrains.annotations.NotNull; import java.util.List; @@ -34,6 +40,7 @@ public class MoGoHandAdasMsgManager implements private MoGoHandAdasMsgManager() { CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this); + CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this); } public static MoGoHandAdasMsgManager getInstance() { @@ -123,12 +130,15 @@ public class MoGoHandAdasMsgManager implements } + private volatile boolean isIPCConnect = false; + @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { -// if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { + if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { +// Log.d("liyz", " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); // CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); -// } - + } } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 0bfee198e3..997b493866 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -1,26 +1,30 @@ package com.mogo.eagle.core.function.bindingcar; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; /** - * @author Jing - * @description 云公告公告 - * @since: 10/27/21 + * @author lixiaopeng + * @description 绑定sn + * @since: 3/26/22 */ @Route(path = MogoServicePaths.PATH_BINDING_CAR) public class BindingcarProvider implements IMoGoBindingcarProvider { private Context mContext; + private volatile String mAddress; @NotNull @Override @@ -30,6 +34,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void onDestroy() { + } @Override @@ -38,21 +43,21 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { } /** - * TODO 获取,每次连接请求一次 + * 获取macaddress,每次连接请求一次 + * * @param macAddress */ @Override public void getBindingcarInfo(String macAddress) { -// Log.d("liyz", "macAddress = " + macAddress); -// BindingcarNetWorkManager.getInstance().getBindingcarInfo(macAddress); + mAddress = macAddress; + BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress); } @Override public void modifyCarInfo(BindingcarCallBack callBack) { - BindingcarNetWorkManager.getInstance().modifyBindingcar("",callBack); + Log.d("liyz", "BindingcarProvider modifyCarInfo mAddress = " + mAddress); + BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack); } - - } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java index d9e4a80a59..b6549f9b57 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java @@ -2,11 +2,11 @@ package com.mogo.eagle.core.function.bindingcar.network; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; -import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; import io.reactivex.Observable; import okhttp3.RequestBody; import retrofit2.http.Body; +import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.POST; @@ -22,8 +22,8 @@ public interface BindingcarApiService { * @return {@link BindingcarInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("/pad/selectPadByMac") - Observable getBindingcarInfo(@Body RequestBody requestBody); + @POST("pad/selectPadByMac") + Observable getBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); /** * 绑定和修改绑定车机 @@ -31,7 +31,7 @@ public interface BindingcarApiService { * @return {@link ModifyBindingcarInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("/pad/updatePadByMac") - Observable modifyBindingcarInfo(@Body RequestBody requestBody); + @POST("pad/updatePadByMac") + Observable modifyBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index 4d2873bdc4..4a25019f50 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -1,14 +1,18 @@ package com.mogo.eagle.core.function.bindingcar.network; -import android.util.Log; +import android.content.Context; -import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.utils.GsonUtil; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.module.common.constants.HostConst; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -19,19 +23,18 @@ import okhttp3.MediaType; import okhttp3.RequestBody; /** - * @author Jing - * @description 云公告网络请求类 - * @since: 10/28/21 + * @author lixiaopeng + * @description 绑定车机网络请求 + * @since: 3/25/22 */ public class BindingcarNetWorkManager { private static volatile BindingcarNetWorkManager requestNoticeManager; private final BindingcarApiService mBindingcarApiService; + private String token = "c4a2f30cebf64972bcd11577e1c07f86"; //中台做了接口适配，需要这个token + private static final String TAG = "BindingcarNetWorkManager"; - private BindingcarNetWorkManager() { //TODO -// mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST) -// .create(BindingcarApiService.class); - - mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance("http://cmdb.ee-private-dev.myghost.zhidaoauto.com/") + private BindingcarNetWorkManager() { + mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.BINDING_SN_HOST) .create(BindingcarApiService.class); } @@ -46,85 +49,84 @@ public class BindingcarNetWorkManager { return requestNoticeManager; } + /** * 获取绑定的车辆信息 * - * @param macAddress mac地址 TODO - * + * @param macAddress mac地址 */ - public void getBindingcarInfo(String macAddress) { + public void getBindingcarInfo(Context context, String macAddress) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn); + BindingcarRequest request = new BindingcarRequest(macAddress, sn); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.getBindingcarInfo(requestBody) + mBindingcarApiService.getBindingcarInfo(token, requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.d("liyz", "getBindingcarInfo onSubscribe -----> "); } @Override public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { - Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); + CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare() == 0) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare() == 3) { CallerHmiManager.INSTANCE.showModifyBindingcarDialog(); } + + SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_MODE_TYPE, info.data.getSeries()); } } @Override public void onError(@NonNull Throwable e) { - Log.d("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override public void onComplete() { - Log.d("liyz", "getBindingcarInfo onComplete"); } }); } /** - * 绑定和修改绑定车辆 TODO + * 绑定和修改绑定车辆 + * mac: 48:b0:2d:3a:9c:19 */ public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn); + BindingcarRequest request = new BindingcarRequest(macAddress, sn); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.modifyBindingcarInfo(requestBody) + mBindingcarApiService.modifyBindingcarInfo(token, requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.d("liyz", "modifyBindingcar onSubscribe -----> "); } @Override public void onNext(@NonNull ModifyBindingcarInfo info) { - if (info.getData() != null) { + if (info != null) { callBack.callBackResult(info); + CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); } - Log.d("liyz", "modifyBindingcar onNext info " + info.toString()); } @Override public void onError(@NonNull Throwable e) { - Log.d("liyz", "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override public void onComplete() { - Log.d("liyz", "modifyBindingcar onComplete "); } }); + } - } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt index cf25d9c3af..a62b8fecd6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt @@ -104,7 +104,11 @@ internal fun Context.pop(content: View, width: Int, height: Int, key: String, fi } } } - return@setTouchInterceptor true + try { + return@setTouchInterceptor true + } finally { + activity.window.decorView.dispatchTouchEvent(event) + } } it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 23694c81a2..c2b0e1262e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -33,9 +33,9 @@ class TraceManager { // Trace过程中进行日志抓取，对日志进行配置 fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = - FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT, 5_000) + FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA] = - FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_MSG, 500) + FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_MSG) traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt index 12912d60fe..84f070921c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.bindingcar import android.content.Context +import android.util.Log import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt index db27456c94..6d38ac8373 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt @@ -46,7 +46,7 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle } /** - * 修改绑定车机 TODO + * 修改绑定车机 */ fun toBindingcar() { CallerBindingcarManager.getBindingcarProvider().modifyCarInfo { 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 cd25df7a14..0bf25f12fd 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 @@ -396,9 +396,6 @@ class DebugSettingView @JvmOverloads constructor( //日志中心事件点击监听 setLogCheckedChangeListener() - - - //OBU配置信息 tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString() @@ -527,6 +524,10 @@ class DebugSettingView @JvmOverloads constructor( } } + //断开与工控机的连接 + btnDisconnectIpc.setOnClickListener { + CallerAutoPilotManager.disconnectIpc() + } updateSpeedSettingViews() @@ -966,7 +967,7 @@ class DebugSettingView @JvmOverloads constructor( } override fun upgradeVersionUrls(urls: Map?) { - //todo 版本信息更新 + } }) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 99f5b52ca4..74d7a2f745 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -120,6 +120,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor( } } updateSpeedSettingViews() + CallerAutoPilotManager.getCarConfig() // // 比如需要设置默认速度 // val speed = "30" // etInputSpeed.setText(speed) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt index a5c9f77a40..5324d03e61 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt @@ -39,6 +39,7 @@ class BrakeViewStatus @JvmOverloads constructor( fun setBrakeLight(brakeLight: Int) { if (brakeLight == 1) { //刹车灯亮 if (!isBrake) { + isBrake = true GlobalScope.launch(Dispatchers.Main) { var appearAnimation = AlphaAnimation(0f, 1f) appearAnimation.duration = 300 @@ -48,7 +49,6 @@ class BrakeViewStatus @JvmOverloads constructor( layout_brake.visibility = View.VISIBLE image_brake.visibility = View.VISIBLE tv_brake.visibility = View.VISIBLE - isBrake = true } } } else { //不踩刹车，就消失 @@ -56,7 +56,6 @@ class BrakeViewStatus @JvmOverloads constructor( isBrake = false GlobalScope.launch(Dispatchers.Main) { scaleImageAndTv() - var disappearAnimation = AlphaAnimation(1f, 0f) disappearAnimation.duration = 1200 layout_brake.startAnimation(disappearAnimation) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt index 8e84e22142..394e463161 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt @@ -47,10 +47,10 @@ class TurnLightViewStatus @JvmOverloads constructor( */ fun setTurnLight(directionLight: Int) { if (!isShowNormalBg && (directionLight == 1 || directionLight == 2)) { + isShowNormalBg = true GlobalScope.launch(Dispatchers.Main) { showNormalAnimation() } - isShowNormalBg = true } if (directionLight == 1 || directionLight == 2) { @@ -63,27 +63,28 @@ class TurnLightViewStatus @JvmOverloads constructor( //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 if (directionLight == 1) { //左转向 if (!isLeftLight) { + isLeftLight = true + isRightLight = false + isDisappare = false GlobalScope.launch(Dispatchers.Main) { left_select_image.visibility = View.VISIBLE right_select_image.visibility = View.GONE right_select_image.clearAnimation() setAnimation(left_select_image) } - isLeftLight = true - isRightLight = false - isDisappare = false + } } else if (directionLight == 2) { //右转向 if (!isRightLight) { + isRightLight = true + isLeftLight = false + isDisappare = false GlobalScope.launch(Dispatchers.Main) { left_select_image.visibility = View.GONE right_select_image.visibility = View.VISIBLE left_select_image.clearAnimation() setAnimation(right_select_image) } - isRightLight = true - isLeftLight = false - isDisappare = false } } else { //消失 @@ -92,13 +93,13 @@ class TurnLightViewStatus @JvmOverloads constructor( CallerVisualAngleManager.changeVisualAngle(Default()) } if (!isDisappare) { - GlobalScope.launch(Dispatchers.Main) { - animationDisappear() - } isDisappare = true isShowNormalBg = false isLeftLight = false isRightLight = false + GlobalScope.launch(Dispatchers.Main) { + animationDisappear() + } } } } 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 d74b47cd8a..e6e28ae6db 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 @@ -604,13 +604,28 @@ app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP" app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP" app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotIP" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintRight_toLeftOf="@id/btnDisconnectIpc" android:layout_marginStart="@dimen/dp_30" - android:layout_marginEnd="@dimen/dp_30" + android:layout_marginEnd="@dimen/dp_20" android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" /> +