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

[dev_arch_opt_3.0] add log

Browse Source
This commit is contained in:
lixiaopeng
2023-03-14 18:01:03 +08:00
committed by zhongchao
parent b58a2f0c4e
commit fafa158de2
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
View File

@@ -72,7 +72,7 @@ class BindingCarNetWorkManager private constructor() {
override fun onSubscribe(d: Disposable) {} override fun onSubscribe(d: Disposable) {}
override fun onNext(info: BindingCarInfo) { override fun onNext(info: BindingCarInfo) {
if (info != null && info.getData() != null) { if (info != null && info.getData() != null) {
d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString()) d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString() + "---getDefaultId() : ${getDefaultId()}")
SharedPrefsMgr.getInstance(context).putString( SharedPrefsMgr.getInstance(context).putString(
SharedPrefsConstants.CAR_INFO, SharedPrefsConstants.CAR_INFO,
GsonUtils.toJson(info.getData()) GsonUtils.toJson(info.getData())
@@ -82,16 +82,16 @@ class BindingCarNetWorkManager private constructor() {
"3" -> showModifyBindingCarDialog() "3" -> showModifyBindingCarDialog()
"null" -> TipToast.shortTip("当前工控机没有入库") "null" -> TipToast.shortTip("当前工控机没有入库")
} }
updateCarVrIconRes(info.getData().brandId); updateCarVrIconRes(info.getData().brandId)
} else { } else {
SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ") e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ---getDefaultId() : ${getDefaultId()} ")
} }
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message) e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message + "---getDefaultId() : ${getDefaultId()}")
} }
override fun onComplete() {} override fun onComplete() {}
@@ -156,22 +156,27 @@ class BindingCarNetWorkManager private constructor() {
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId") d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId")
when (brandId) { when (brandId) {
"1" -> { //东风 "1" -> { //东风
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes -------1-------")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
} }
"2" -> { //红旗 "2" -> { //红旗
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes -------2-------")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.hq_h9) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.hq_h9)
HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9 HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9
} }
"3" -> { //金旅 "3" -> { //金旅
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes -------3-------")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
} }
"4" -> { //开沃 "4" -> { //开沃
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes -------4-------")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
} }
"5" -> { //福田 "5" -> { //福田
d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes -------5-------")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei)
HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
} }

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

@@ -68,6 +68,7 @@ import com.mogo.eagle.core.utilcode.kotlin.currentPadding
import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -534,9 +535,11 @@ internal class DebugSettingView @JvmOverloads constructor(
tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked -> tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked ->
if (!isChecked) { if (!isChecked) {
// 替换为出租车图标 // 替换为出租车图标
CallerLogger.d(SceneConstant.M_BINDING + TAG, " debugsettingview chuzuche ")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
} else { } else {
// 替换为小巴车图标 // 替换为小巴车图标
CallerLogger.d(SceneConstant.M_BINDING + TAG, " debugsettingview xiaobache ")
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache) CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
} }
} }

3
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -4,6 +4,7 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE
import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED; import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED;
import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT; import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT;
import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS;
import static com.mogo.eagle.core.utilcode.mogo.logger.Logger.d;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP;
import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300; import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300;
import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS; import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS;
@@ -40,6 +41,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.map.hdcache.IHdCacheListener;
@@ -679,6 +681,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override @Override
public void changeCurrentIcon(int iconId) { public void changeCurrentIcon(int iconId) {
if (checkAMapView()) { if (checkAMapView()) {
d(SceneConstant.M_BINDING + TAG, "changeCurrentIcon iconId = " + iconId);
mMapView.getMapAutoViewHelper().getMyLocationStyle().myLocationIcon(iconId, true); mMapView.getMapAutoViewHelper().getMyLocationStyle().myLocationIcon(iconId, true);
} }
} }