From 245bde74d22e55b9d91d3b3f4048a25340132547 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Sat, 14 Jan 2023 14:24:23 +0800 Subject: [PATCH] [2.13.0-arch-opt] add note --- .../incApCache/debug/classpath-structure.bin | Bin 2945125 -> 2945226 bytes .../function/main/MainMoGoApplication.java | 14 +- .../eagle/core/function/map/MapFragment.kt | 28 +-- .../receiver/TestPanelBroadcastReceiver.java | 22 --- .../v2x/events/utils/V2XSQLiteUtils.java | 185 ------------------ .../mogo/eagle/core/function/v2x/socket.txt | 70 ------- 6 files changed, 9 insertions(+), 310 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/V2XSQLiteUtils.java delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/socket.txt diff --git a/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/core/function-impl/mogo-core-function-devatools/build/tmp/kapt3/incApCache/debug/classpath-structure.bin index 507055d89946e1af335034f6c5b67ff830a2c987..6bb7595bb00a977d587166dcdd4f4189e42f6eb9 100644 GIT binary patch delta 6773 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 T4!-oH=y(OEIbIRCf9C%I7@SfP delta 6683 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 { @@ -203,10 +197,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { private void initModules() { CallerLogger.INSTANCE.d(M_HMI + TAG, "initModules"); - //och模块 -// MogoModulePaths.addModuleFunction(new MogoModule("/driver/api", "IMoGoFunctionProvider")); -// MogoModulePaths.addModuleFunction(new MogoModule("/passenger/api", "IMoGoFunctionProvider")); - // OBU 模块 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider")); // BIZ @@ -215,13 +205,11 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addModuleFunctionServer(new MogoModule(ChatConsts.CHAT_PROVIDER_PATH, ChatConsts.CHAT_MODULE_NAME)); // V2X 模块 MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider")); - // 司机身份专属模块 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { // 地图数据收集模块 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); } - CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt index ff18af63ac..4f2890603b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt @@ -47,9 +47,7 @@ import mogo.telematics.pad.MessagePad * @author donghongyu * @since 2021-11-09 * 高精度地图层UI - * - * - * 地图图层，地图操作都在这个图层完成 + * 地图图层，地图操作都在这个图层完成 //todo 以view方式进行提供 */ @Route(path = MoGoFragmentPaths.PATH_FRAGMENT_MAP) class MapFragment : MvpFragment(), @@ -65,7 +63,7 @@ class MapFragment : MvpFragment(), private val mIsControllerByOthersStatus = false companion object { - val functionName = "MapFragment" + const val functionName = "MapFragment" /** * sight mode @@ -128,7 +126,7 @@ class MapFragment : MvpFragment(), override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) initMapView() - queryInfStructure() + initMapBiz() } override fun onSaveInstanceState(outState: Bundle) { @@ -201,31 +199,20 @@ class MapFragment : MvpFragment(), //设置双指缩放手势是否可用。 uiSettings.setZoomGesturesEnabled(true) } + } + private fun initMapBiz() { // TODO 临时初始化地图监听工控机、OBU等数据监听器，用于感知元素绘制 MapIdentifySubscriber.instance MogoRouteOverlayManager.getInstance().init() MapPointCloudSubscriber.instance + // TODO GD地图业务需要与高精地图业务拆开 --- 扶风 + queryInfStructure() } private fun queryInfStructure() { val viewModel = this.obtainViewModel(OverViewModel::class.java) - // viewModel.getInfStructures().observe(this.getViewLifecycleOwner(), infrastructures -> { -// if (isFirst) { -// for (Infrastructure entity : infrastructures) { -// Double lat = Double.parseDouble(entity.getLat()); -// Double lon = Double.parseDouble(entity.getLon()); -// if (lat < 0 || lat > 90 || lon < 0 || lon > 180) { -// continue; -// } -// String geoHash = GeoHash.withCharacterPrecision(lat, lon, 7).toBase32(); -// viewModel.updateGeoHash(entity.getId(), geoHash); -// } -// isFirst = false; -// } -// }); viewModel.infStructuresMap.observe(this.viewLifecycleOwner) { t -> InfStructureManager.saveData(t) } - viewModel.fetchInfStructures() } @@ -352,6 +339,7 @@ class MapFragment : MvpFragment(), override val functionName: String get() = functionName + // TODO 全览模式需要自己监听 --- 扶风 override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) { UiThreadHandler.post { savePlanningData(globalPathResp!!.wayPointsList) } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java index 641abd35ef..59d5471e0f 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java @@ -6,18 +6,13 @@ import android.content.Intent; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes; -import com.mogo.eagle.core.function.call.chat.CallerChatManager; import com.mogo.eagle.core.function.call.map.CallerSmpManager; import com.mogo.eagle.core.function.v2x.events.consts.V2XConst; import com.mogo.eagle.core.function.v2x.events.utils.TestOnLineCarUtils; -import com.mogo.eagle.core.function.v2x.events.utils.V2XSQLiteUtils; -import com.mogo.eagle.core.utilcode.util.Utils; import java.util.List; @@ -57,10 +52,6 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver { Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); - - // 存储本地，出行动态作展示 - saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, - v2XMessageEntity.getContent().getNoveltyInfo()); } else if (sceneType == 10) {//触发事件UGC V2XMessageEntity v2XMessageEntity = TestOnLineCarUtils.getV2XScenarioRoadEventUGCData(); @@ -102,17 +93,4 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver { } } - - /** - * 存储本地数据 - * - * @param v2XRoadEventEntity 要存储的场景 - */ - public void saveLocalStory(int scenarioType, MarkerExploreWay v2XRoadEventEntity) { - try { - V2XSQLiteUtils.saveLocalStory(scenarioType, v2XRoadEventEntity, v2XRoadEventEntity.hashCode()); - } catch (Exception e) { - e.printStackTrace(); - } - } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/V2XSQLiteUtils.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/V2XSQLiteUtils.java deleted file mode 100644 index 19e697b0e1..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/V2XSQLiteUtils.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.mogo.eagle.core.function.v2x.events.utils; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; - -import com.mogo.eagle.core.data.map.entity.V2XEventZanData; -import com.mogo.eagle.core.data.map.entity.V2XHistoryScenarioData; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.network.utils.GsonUtil; -import com.mogo.eagle.core.utilcode.mogo.sqlite.SQLIDao; -import com.mogo.eagle.core.utilcode.util.TimeUtils; -import com.mogo.eagle.core.utilcode.util.Utils; -import com.mogo.utils.sqlite.SQLDaoFactory; - -import java.util.List; - -/** - * 数据库操作工具类 - * - * @author donghongyu - */ -public class V2XSQLiteUtils { - - /** - * 场景数据管理 - */ - private static SQLIDao mScenarioHistoryDao; - - /** - * 点赞数据管理 - */ - private static SQLIDao mV2XEventZanDao; - - /** - * 点赞数据管理 - */ - public static SQLIDao getV2XEventZanDao() { - if (mV2XEventZanDao == null) { - synchronized (V2XSQLiteUtils.class) { - if (mV2XEventZanDao == null) { - mV2XEventZanDao = SQLDaoFactory.Companion.getInstance() - .getBaseDao(Utils.getApp(), V2XEventZanData.class); - } - } - } - return mV2XEventZanDao; - } - - /** - * 存储本地数据 - * - * @param v2XEventZanData 要存储的场景 - */ - public static void saveEventZanLocalStory(V2XEventZanData v2XEventZanData) { - try { - if (!isZanEvent(v2XEventZanData.eventId)) { - // 进行数据库存储 - V2XSQLiteUtils.getV2XEventZanDao().insert(v2XEventZanData); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 判断是否已经存在 - * - * @param eventId 要判断的事件ID - * @return true-已存在，false-没存在 - */ - public static boolean isZanEvent(String eventId) { - try { - // 查询数据库，判断是否存在 - for (V2XEventZanData eventZanDatum : getEventZanData()) { - if (eventZanDatum.eventId.equals(eventId)) { - return true; - } - } - } catch (Exception e) { - e.printStackTrace(); - } - return false; - } - - /** - * 查询当天的V2X数据 - */ - public static List getEventZanData() { - return getV2XEventZanDao().query(new V2XEventZanData()); - } - - /** - * 修改指定的数据 - */ - public static void updateScenarioHistoryData(V2XHistoryScenarioData oldScenarioData, V2XHistoryScenarioData newScenarioData) { - try { - int result = getScenarioHistoryDao().update(oldScenarioData, newScenarioData); - //V2XEventPanelFragment.Companion.getInstance().changeEventCount(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 场景数据管理 - */ - public static SQLIDao getScenarioHistoryDao() { - if (mScenarioHistoryDao == null) { - synchronized (V2XSQLiteUtils.class) { - if (mScenarioHistoryDao == null) { - mScenarioHistoryDao = SQLDaoFactory.Companion.getInstance() - .getBaseDao(Utils.getApp(), V2XHistoryScenarioData.class); - } - } - } - return mScenarioHistoryDao; - } - - /** - * 查询当天的V2X数据 - */ - public static List getScenarioHistoryData() { - return getScenarioHistoryDao().query(new V2XHistoryScenarioData(), "triggerTime", true); - } - - /** - * 删除数据库中存储的昨天的数据 - */ - public static void clearYesterdayScenarioHistoryData() { - try { - List historyScenarioData = getScenarioHistoryDao().query(new V2XHistoryScenarioData()); - for (V2XHistoryScenarioData historyScenarioDatum : historyScenarioData) { - Long triggerTime = historyScenarioDatum.getTriggerTime(); - if (!TimeUtils.isToday(triggerTime)) { - int result = getScenarioHistoryDao().delete(historyScenarioDatum); - if (result > 0) { - CallerLogger.INSTANCE.d(M_V2X + "V2XSQLiteUtils", "删除过期数据成功"); - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 存储本地数据，每个数据只能存在一次，所以存储之前先查询数据库如果已经存在则修改触碰时间 - * - * @param markerExploreWay 要存储的场景 - */ - public static void saveLocalStory(int scenarioType, Object markerExploreWay, int hashCode) { - try { - - CallerLogger.INSTANCE.d(M_V2X + "V2XSQLiteUtils", "saveLocalStory：" + markerExploreWay); - - // 进行数据库存储 - V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData(); - v2XHistoryScenarioData.setScenarioType(scenarioType); - v2XHistoryScenarioData.setEventJsonDataHashCode(hashCode); - - List historyScenarioData = getTargetScenarioHistoryData(v2XHistoryScenarioData); - - v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(markerExploreWay)); - v2XHistoryScenarioData.setTriggerTime(TimeUtils.getNowMills()); - v2XHistoryScenarioData.setDispose(false); - - if (historyScenarioData != null && historyScenarioData.size() > 0) { - // 更新数据 - V2XSQLiteUtils.getScenarioHistoryDao().update(historyScenarioData.get(0), v2XHistoryScenarioData); - } else { - // 存储新数据 - V2XSQLiteUtils.getScenarioHistoryDao().insert(v2XHistoryScenarioData); - } - //V2XEventPanelFragment.Companion.getInstance().changeEventCount(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 查询当天的指定的V2X数据 - */ - public static List getTargetScenarioHistoryData(V2XHistoryScenarioData scenarioData) { - return getScenarioHistoryDao().query(scenarioData, "triggerTime", true); - } -} diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/socket.txt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/socket.txt deleted file mode 100644 index fd90c72dab..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/socket.txt +++ /dev/null @@ -1,70 +0,0 @@ -2023-01-14 12:03:02.263 24403-24598/com.mogo.launcher.f D/com.zhidao.socket--->: start socket -2023-01-14 12:03:02.754 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: requestSocketAddress onGetSocketAddressSuccess 0:OK -2023-01-14 12:03:02.754 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: internalStart-->host: 119.45.249.167 & port: 11000 -2023-01-14 12:03:02.773 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: start connect 119.45.249.167:11000 -2023-01-14 12:03:02.773 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: doConnection -2023-01-14 12:03:03.934 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client---connecting server succeeds -2023-01-14 12:03:03.937 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: call login -2023-01-14 12:03:03.938 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:03:03.938 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:03:03.944 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 531 -2023-01-14 12:03:03.960 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: login -2023-01-14 12:03:03.960 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: ---onConnectSuccess -2023-01-14 12:03:03.962 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: channel is active -2023-01-14 12:03:03.994 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=270, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 270, widx: 270, cap: 1024)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 259, cap: 259/259, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 270, widx: 270, cap: 1024))} -2023-01-14 12:03:03.995 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAuthMidRsp -2023-01-14 12:03:04.001 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: call checkAuth -2023-01-14 12:03:04.001 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:03:04.001 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:03:04.002 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 533 -2023-01-14 12:03:04.004 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: checkAuth -2023-01-14 12:03:04.038 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=11, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 11, widx: 11, cap: 1024)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 0, cap: 0/0, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 11, widx: 11, cap: 1024))} -2023-01-14 12:03:04.038 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAuthRsp -2023-01-14 12:03:04.040 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client authority check succeeded -2023-01-14 12:03:04.044 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: setExact(...) -2023-01-14 12:03:04.044 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: call send user info -2023-01-14 12:03:04.044 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:03:04.044 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:03:04.048 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 529 -2023-01-14 12:03:04.050 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: send user info -2023-01-14 12:03:04.082 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=13, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 13, widx: 13, cap: 512)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 2, cap: 2/2, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 13, widx: 13, cap: 512))} -2023-01-14 12:03:04.082 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAgentInfoRsp -2023-01-14 12:03:04.084 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: Client receives server's user info response, result is true. -2023-01-14 12:04:44.088 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: channel is inactive, it depends on client's choice whether to reconnect or not. -2023-01-14 12:04:44.089 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: close allowReconnect=true -2023-01-14 12:04:44.089 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: channel is null -2023-01-14 12:04:44.090 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: heartbeat alarm is cancelled -2023-01-14 12:04:44.090 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: ---onConnectLost -2023-01-14 12:04:44.092 24403-24641/com.mogo.launcher.f D/com.zhidao.socket--->: retryGetAddress 1000 -2023-01-14 12:04:45.092 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: get socket address -2023-01-14 12:04:50.321 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: requestSocketAddress onGetSocketAddressSuccess 0:OK -2023-01-14 12:04:50.321 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: internalStart-->host: 119.45.249.167 & port: 11000 -2023-01-14 12:04:50.324 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: start connect 119.45.249.167:11000 -2023-01-14 12:04:50.324 24403-24403/com.mogo.launcher.f D/com.zhidao.socket--->: doConnection -2023-01-14 12:04:51.413 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client---connecting server succeeds -2023-01-14 12:04:51.414 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: call login -2023-01-14 12:04:51.416 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:04:51.416 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:04:51.416 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 531 -2023-01-14 12:04:51.419 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: login -2023-01-14 12:04:51.419 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: ---onConnectSuccess -2023-01-14 12:04:51.420 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: channel is active -2023-01-14 12:04:51.443 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=270, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 270, widx: 270, cap: 1024)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 259, cap: 259/259, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 270, widx: 270, cap: 1024))} -2023-01-14 12:04:51.443 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAuthMidRsp -2023-01-14 12:04:51.445 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: call checkAuth -2023-01-14 12:04:51.445 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:04:51.445 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:04:51.446 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 533 -2023-01-14 12:04:51.451 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: checkAuth -2023-01-14 12:04:51.477 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=11, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 11, widx: 11, cap: 1024)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 0, cap: 0/0, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 11, widx: 11, cap: 1024))} -2023-01-14 12:04:51.477 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAuthRsp -2023-01-14 12:04:51.477 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client authority check succeeded -2023-01-14 12:04:51.480 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: setExact(...) -2023-01-14 12:04:51.480 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: call send user info -2023-01-14 12:04:51.480 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: checkNotNull(channel), channel is not null. -2023-01-14 12:04:51.480 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket connected is :false -2023-01-14 12:04:51.481 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: socket app id is dataCrawler, msg type is 529 -2023-01-14 12:04:51.482 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: send user info -2023-01-14 12:04:51.509 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client---client receive server---MogoConnsvrPacket{magicCode=28007, payloadOffset=11, packetLength=13, header=UnpooledSlicedByteBuf(ridx: 0, widx: 3, cap: 3/3, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 13, widx: 13, cap: 512)), payload=UnpooledSlicedByteBuf(ridx: 0, widx: 2, cap: 2/2, unwrapped: UnpooledByteBufAllocator$InstrumentedUnpooledHeapByteBuf(ridx: 13, widx: 13, cap: 512))} -2023-01-14 12:04:51.509 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: receive server---msgTypemogoMsgTypeConnSvrAgentInfoRsp -2023-01-14 12:04:51.509 24403-24852/com.mogo.launcher.f D/com.zhidao.socket--->: Client receives server's user info response, result is true.