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

Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2

Browse Source
This commit is contained in:
tongchenfei
2020-08-18 13:13:29 +08:00
parent 7ebc0b0862 fd069d877c
commit 956330bf96
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
View File

@@ -60,11 +60,6 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
// 语音控制拨打电话
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,11 +115,18 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
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());
mNoveltyInfo = new MarkerExploreWay();
mNoveltyInfo.setLocation(markerLocation);
mNoveltyInfo.setUserInfo(mUserInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -151,12 +153,6 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
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) {
e.printStackTrace();

13
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
View File

@@ -73,6 +73,12 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
mOldScenarioData = viewData;
V2XPushMessageEntity xPushMessageEntity = GsonUtil.objectFromJson(viewData.getEventJsonData(), V2XPushMessageEntity.class);
mUserInfo.setSn(xPushMessageEntity.getSn());
mUserInfo.setUserHead(xPushMessageEntity.getHeadImgUrl());
mUserInfo.setUserName(xPushMessageEntity.getDisplayName());
mUserInfo.setGender(xPushMessageEntity.getSex());
mUserInfo.setAge(xPushMessageEntity.getAge());
mTvFaultHelpName.setText(xPushMessageEntity.getDisplayName());
if (!TextUtils.isEmpty(xPushMessageEntity.getHeadImgUrl())) {
@@ -106,6 +112,7 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
markerLocation.setLat(xPushMessageEntity.getLat());
mNoveltyInfo = new MarkerExploreWay();
mNoveltyInfo.setLocation(markerLocation);
mNoveltyInfo.setUserInfo(mUserInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -137,12 +144,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
if (!V2XUtils.isFastClick()) {
V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
try {
mUserInfo.setSn(xPushMessageEntity.getSn());
mUserInfo.setUserHead(xPushMessageEntity.getHeadImgUrl());
mUserInfo.setUserName(xPushMessageEntity.getDisplayName());
mUserInfo.setGender(xPushMessageEntity.getSex());
mUserInfo.setAge(xPushMessageEntity.getAge());
mNoveltyInfo.setUserInfo(mUserInfo);
triggerCallChart(mNoveltyInfo);
} catch (Exception e) {
e.printStackTrace();

6
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -31,15 +31,15 @@
<dimen name="module_v2x_surrounding_top_height">40px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
<dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">70px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">20px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>

6
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -32,15 +32,15 @@
<dimen name="module_v2x_surrounding_top_height">40px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
<dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">70px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">20px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>

6
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -34,15 +34,15 @@
<dimen name="module_v2x_surrounding_top_height">40px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">50px</dimen>
<dimen name="module_v2x_surrounding_empty_tv_margin_top">15px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">70px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_maigin_left">123px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">20px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>