From 9d7c31557b07435dcf256bcd3fe2d56d23e59d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 15 Jan 2020 10:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86String=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E4=B8=BAnull=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=BF=94=E5=9B=9E""=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/connection/socket/SocketManager.java | 1 + .../com/mogo/module/common/entity/MarkerCarInfo.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerDynamicData.java | 5 +++++ .../com/mogo/module/common/entity/MarkerExploreWay.java | 5 +++++ .../mogo/module/common/entity/MarkerExploreWayItem.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerHobbyDatum.java | 5 +++++ .../com/mogo/module/common/entity/MarkerLocation.java | 5 +++++ .../com/mogo/module/common/entity/MarkerShareMusic.java | 8 ++++++++ .../com/mogo/module/common/entity/MarkerShowEntity.java | 5 +++++ .../com/mogo/module/common/entity/MarkerUserInfo.java | 9 +++++++++ .../com/mogo/module/main/cards/MogoModulesManager.java | 1 + 11 files changed, 60 insertions(+) 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 aab919bc38..6aad984e2c 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 @@ -93,6 +93,7 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac while ( iterator.hasNext() ) { IMogoOnMessageListener listener = iterator.next(); if ( listener != null ) { + Logger.d(TAG, "received msg ==" + payload.getPayload().toStringUtf8()); listener.onMsgReceived( GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() ) ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java index 817e4f31ab..250f5ee2a1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -11,6 +13,9 @@ public class MarkerCarInfo implements Serializable { private String carTypeName; public String getCarBrandLogoUrl() { + if (TextUtils.isEmpty(carBrandLogoUrl)) { + return ""; + } return carBrandLogoUrl; } @@ -19,6 +24,9 @@ public class MarkerCarInfo implements Serializable { } public String getCarTypeName() { + if (TextUtils.isEmpty(carTypeName)) { + return "未知"; + } return carTypeName; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java index a345206b2e..0d94fae475 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -20,6 +22,9 @@ public class MarkerDynamicData implements Serializable { } public String getName() { + if (TextUtils.isEmpty(name)) { + return "未知"; + } return name; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java index df0972cfb3..e5214dcfd0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java @@ -1,6 +1,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; import java.util.List; @@ -21,6 +23,9 @@ public class MarkerExploreWay implements Serializable { private List items;//视频地址和图片地址 public String getAddr() { + if (TextUtils.isEmpty(addr)) { + return "未知"; + } return addr; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java index 9f367ee7fe..efc6a88649 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -11,6 +13,9 @@ public class MarkerExploreWayItem implements Serializable { private String url; public String getThumbnail() { + if (TextUtils.isEmpty(thumbnail)) { + return ""; + } return thumbnail; } @@ -19,6 +24,9 @@ public class MarkerExploreWayItem implements Serializable { } public String getUrl() { + if (TextUtils.isEmpty(url)) { + return ""; + } return url; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java index 4cf8e1504c..5d69c78ec0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -12,6 +14,9 @@ public class MarkerHobbyDatum implements Serializable { private int isCheck; public String getContent() { + if (TextUtils.isEmpty(content)) { + return "未知"; + } return content; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java index 9895187033..16ccc2cf36 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -37,6 +39,9 @@ public class MarkerLocation implements Serializable { } public String getAddress() { + if (TextUtils.isEmpty(address)) { + return "未知"; + } return address; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java index 2f9feeff19..4af69a02dd 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java @@ -2,6 +2,8 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; @SuppressWarnings("unused") @@ -54,6 +56,9 @@ public class MarkerShareMusic implements Serializable { } public String getMediaImg() { + if (TextUtils.isEmpty(mediaImg)) { + return ""; + } return mediaImg; } @@ -62,6 +67,9 @@ public class MarkerShareMusic implements Serializable { } public String getMediaName() { + if (TextUtils.isEmpty(mediaName)) { + return "未知"; + } return mediaName; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java index a1ade853ad..60b7a9437c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java @@ -1,5 +1,7 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.util.Objects; /** @@ -51,6 +53,9 @@ public class MarkerShowEntity { } public String getTextContent() { + if (TextUtils.isEmpty(textContent)) { + return "未知"; + } return textContent; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index 5c29773053..ec6271c154 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -90,6 +90,9 @@ public class MarkerUserInfo implements Serializable { } public String getSn() { + if (TextUtils.isEmpty(sn)) { + return ""; + } return sn; } @@ -98,6 +101,9 @@ public class MarkerUserInfo implements Serializable { } public String getUserHead() { + if (TextUtils.isEmpty(userHead)) { + return ""; + } return userHead; } @@ -114,6 +120,9 @@ public class MarkerUserInfo implements Serializable { } public String getUserName() { + if (TextUtils.isEmpty(userName)) { + return ""; + } return userName; } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 02d40b7a4c..dec3600f87 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -358,6 +358,7 @@ public class MogoModulesManager implements MogoModulesHandler, try { getApplicationContext().unregisterReceiver( mReceiver ); } catch ( Exception e ) { + e.printStackTrace(); } } mReceiver = null;