From 0fb76529fce6575ef61a8e51f0b8835079b46446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 15:05:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=B1=82=E5=8A=A9=20=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XOtherSeekHelpVH.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 537f4f2b45..c3d8ad9a00 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -60,11 +60,6 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { // 语音控制拨打电话 private V2XVoiceCallbackListener mCallChartingCb = (command, intent) -> { try { - mUserInfo.setSn(mV2XPushMessageEntity.getSn()); - mUserInfo.setUserHead(mV2XPushMessageEntity.getHeadImgUrl()); - mUserInfo.setUserName(mV2XPushMessageEntity.getDisplayName()); - mUserInfo.setGender(mV2XPushMessageEntity.getSex()); - mUserInfo.setAge(30); mNoveltyInfo.setUserInfo(mUserInfo); triggerCallChart(mNoveltyInfo); } catch (Exception e) { @@ -120,6 +115,12 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { public void initView(V2XEventShowEntity v2XEventShowEntity) { mV2XPushMessageEntity = v2XEventShowEntity.getV2XPushMessageEntity(); try { + mUserInfo.setSn(mV2XPushMessageEntity.getSn()); + mUserInfo.setUserHead(mV2XPushMessageEntity.getHeadImgUrl()); + mUserInfo.setUserName(mV2XPushMessageEntity.getDisplayName()); + mUserInfo.setGender(mV2XPushMessageEntity.getSex()); + mUserInfo.setAge(30); + MarkerLocation markerLocation = new MarkerLocation(); markerLocation.setLon(mV2XPushMessageEntity.getLon()); markerLocation.setLat(mV2XPushMessageEntity.getLat()); @@ -151,11 +152,6 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); if (!V2XUtils.isFastClick()) { try { - mUserInfo.setSn(mV2XPushMessageEntity.getSn()); - mUserInfo.setUserHead(mV2XPushMessageEntity.getHeadImgUrl()); - mUserInfo.setUserName(mV2XPushMessageEntity.getDisplayName()); - mUserInfo.setGender(mV2XPushMessageEntity.getSex()); - mUserInfo.setAge(mV2XPushMessageEntity.getAge()); mNoveltyInfo.setUserInfo(mUserInfo); triggerCallChart(mNoveltyInfo); } catch (Exception e) { From 80a3d83cec0398121d9c6b983293d5ee978e218b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 15:11:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=B1=82=E5=8A=A9=20=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/v2x/network/V2XRefreshModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java index 947cdffe39..10fd5089d6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java @@ -528,9 +528,9 @@ public class V2XRefreshModel { final Map map = new ParamsProvider.Builder(mContext).build(); String json = new StringBuilder() .append("{") - .append("\"seekHelpSn\":").append(seekHelpSn) + .append("\"seekHelpSn\":").append("\"" + seekHelpSn + "\"") .append(",") - .append("\"enthusiasticSn\":").append(Utils.getSn()) + .append("\"enthusiasticSn\":").append("\"" + Utils.getSn() + "\"") .append("}").toString(); map.put("data", json); mV2XApiService.respondingToHelp(map).subscribeOn(Schedulers.io()) From 49c5fdb624575beaefcbc3c9ba9a557877ba49f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 Aug 2020 15:23:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=B1=82=E5=8A=A9=20=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/v2x/network/V2XRefreshModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java index 10fd5089d6..947cdffe39 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java @@ -528,9 +528,9 @@ public class V2XRefreshModel { final Map map = new ParamsProvider.Builder(mContext).build(); String json = new StringBuilder() .append("{") - .append("\"seekHelpSn\":").append("\"" + seekHelpSn + "\"") + .append("\"seekHelpSn\":").append(seekHelpSn) .append(",") - .append("\"enthusiasticSn\":").append("\"" + Utils.getSn() + "\"") + .append("\"enthusiasticSn\":").append(Utils.getSn()) .append("}").toString(); map.put("data", json); mV2XApiService.respondingToHelp(map).subscribeOn(Schedulers.io())