From 0dc62ca86f01cc7bd6f3705c8089953011232f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 7 Jan 2020 20:08:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dprotobuf=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/launcher/MogoApplication.java | 2 +- .../com/mogo/connection/socket/SocketManager.java | 2 +- .../mogo/module/service/MarkerServiceHandler.java | 2 +- .../mogo/module/service/entity/MarkerLocation.java | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b312edc244..99bc7c5980 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -27,8 +27,8 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) ); - MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR")); + MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); } @Override diff --git a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java index 783931c3ff..af6c7032a9 100644 --- a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java +++ b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java @@ -86,7 +86,7 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac Logger.d( TAG, "received msg type = %d", msgType ); IMogoOnMessageListener listener = mListeners.get( msgType ); if ( listener != null ) { - listener.onMsgReceived( GsonUtil.objectFromJson( payload.getPayload().toString(), listener.target() ) ); + listener.onMsgReceived( GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() ) ); } } catch ( InvalidProtocolBufferException e ) { Logger.e( TAG, "parse msg error.", e ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 275b78902d..0f9c08acef 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -41,7 +41,7 @@ public class MarkerServiceHandler { @Override public void onMsgReceived(MarkerResponse obj) { - Logger.e("",obj.toString()); + Logger.e("donghongyu", "===" + obj); } }); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java index e48747e67f..d9f1b04e22 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java @@ -11,9 +11,9 @@ public class MarkerLocation { @SerializedName("angle") private String mAngle; @SerializedName("lat") - private String mLat; + private double mLat; @SerializedName("lon") - private String mLon; + private double mLon; public String getAddress() { return mAddress; @@ -31,19 +31,19 @@ public class MarkerLocation { mAngle = angle; } - public String getLat() { + public double getLat() { return mLat; } - public void setLat(String lat) { + public void setLat(double lat) { mLat = lat; } - public String getLon() { + public double getLon() { return mLon; } - public void setLon(String lon) { + public void setLon(double lon) { mLon = lon; }