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

修改f/m 导航 周边事件 目的车友UI

Browse Source
This commit is contained in:
zhuangyan
2020-11-19 17:13:09 +08:00
parent 3019fcd7e4
commit 6a65e87be0
35 changed files with 123 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -47,6 +47,7 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher;
import com.mogo.module.service.marker.MapMarkerManager;
import com.mogo.module.service.network.RefreshCallback;
import com.mogo.module.service.network.RefreshModel;
import com.mogo.module.service.network.bean.TtsConfigEntity;
import com.mogo.module.service.ttsConfig.TtsConfigModleData;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse;
@@ -332,10 +333,8 @@ public class MogoServices implements IMogoMapListener,
}
mIsMainPageFirstResume = false;
LauncherCardRefresher.getInstance(mContext).stop();
mTtsModle.playTts();
// playAppTts();
playAppTts();
} else {
unregisterInternalUnWakeupWords();
@@ -390,7 +389,7 @@ public class MogoServices implements IMogoMapListener,
if (DebugConfig.isLauncher()) {
return;
}
mTtsModle.playTts();
}
/**

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
View File

@@ -22,7 +22,6 @@ import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.R;
import com.mogo.module.service.Utils;
import com.mogo.utils.ResourcesHelper;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
@@ -67,7 +66,6 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter<OnlineCarPanelAdapter.V
public void onBindViewHolder(@NonNull OnlineCarPanelAdapter.VH holder, int position) {
holder.bind(mDatums.get(position), mToLon, mToLat);
holder.call.setOnClickListener(view -> {
//TODO 拨打电话
Map<String, String> params = new HashMap<>();
MarkerUserInfo userInfo = mDatums.get(position).getUserInfo();
params.put(CallChattingProviderConstant.CCPROVIDER_SN, userInfo.getSn());
@@ -123,11 +121,6 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter<OnlineCarPanelAdapter.V
Logger.e(TAG, e, "detail.OnClick");
}
});
// call.setOnClickListener(view -> {
// //TODO 拨打电话
//
//
// });
}
private String getDistanceStr(MarkerLocation location, double lon, double lat) {

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

6
modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_call_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_call_nomal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_call_nomal" />
</selector>

6
modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_call_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_call_nomal_light" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_call_nomal_light" />
</selector>

6
modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_detials_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal" />
</selector>

6
modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_detials_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal_light" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal_light" />
</selector>

17
modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml
View File

@@ -57,12 +57,11 @@
<TextView
android:id="@+id/module_services_id_panel_item_call"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:background="@drawable/module_services_panel_item_detail_bkg"
android:layout_width="@dimen/modle_car_panel_call"
android:layout_height="@dimen/modle_car_panel_call"
android:layout_marginEnd="@dimen/modle_car_panel_call_margin"
android:background="@drawable/selector_service_car_pannel_call"
android:padding="@dimen/module_services_panel_item_detail_padding"
android:text="@string/module_services_panel_item_call"
android:textColor="@color/module_services_panel_item_detail_textColor"
android:textSize="@dimen/module_services_panel_item_detail_textSize"
android:textStyle="bold"
@@ -74,14 +73,14 @@
<TextView
android:id="@+id/module_services_id_panel_item_detail"
android:layout_width="wrap_content"
android:background="@drawable/module_services_panel_item_detail_bkg"
android:layout_height="wrap_content"
android:layout_width="@dimen/modle_car_panel_call"
android:background="@drawable/selector_service_car_pannel_detials"
android:layout_height="@dimen/modle_car_panel_call"
android:padding="@dimen/module_services_panel_item_detail_padding"
android:text="@string/module_services_panel_item_detail_text"
android:textStyle="bold"
android:textColor="@color/module_services_panel_item_detail_textColor"
android:textSize="@dimen/module_services_panel_item_detail_textSize"
android:layout_marginEnd="@dimen/dp_46"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

7
modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
View File

@@ -22,6 +22,13 @@
<dimen name="module_service_content_minWidth">64px</dimen>
<dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
<dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
<dimen name="modle_car_panel_call">54px</dimen>
<dimen name="modle_car_panel_call_margin">20px</dimen>
<dimen name="modle_car_panel_call_margin_left">22px</dimen>
<dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
<dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
<dimen name="module_services_online_car_panel_marginTop">2px</dimen>
<dimen name="module_services_online_car_panel_marginBottom">2px</dimen>

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

@@ -22,6 +22,12 @@
<dimen name="module_service_content_minWidth">64px</dimen>
<dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
<dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
<dimen name="modle_car_panel_call">54px</dimen>
<dimen name="modle_car_panel_call_margin">20px</dimen>
<dimen name="modle_car_panel_call_margin_left">22px</dimen>
<dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
<dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
<dimen name="module_services_online_car_panel_marginTop">2px</dimen>
<dimen name="module_services_online_car_panel_marginBottom">2px</dimen>

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

@@ -23,6 +23,11 @@
<dimen name="module_service_content_minWidth">120px</dimen>
<dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
<dimen name="modle_car_panel_call">98px</dimen>
<dimen name="modle_car_panel_call_margin">46px</dimen>
<dimen name="modle_car_panel_call_margin_left">40px</dimen>
<dimen name="module_services_online_car_panel_marginTop">20px</dimen>
<dimen name="module_services_online_car_panel_marginBottom">20px</dimen>
<dimen name="module_services_online_car_panel_marginRight">20px</dimen>

5
modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
View File

@@ -29,6 +29,11 @@
<dimen name="module_services_online_car_panel_paddingLeft">50px</dimen>
<dimen name="module_services_online_car_panel_paddingBottom">28px</dimen>
<dimen name="modle_car_panel_call">98px</dimen>
<dimen name="modle_car_panel_call_margin">46px</dimen>
<dimen name="modle_car_panel_call_margin_left">40px</dimen>
<dimen name="module_services_online_car_panel_close_margin_top">36px</dimen>
<dimen name="module_services_online_car_panel_title_margin_top">50px</dimen>
<dimen name="module_services_online_car_panel_title_text_size">36px</dimen>

5
modules/mogo-module-service/src/main/res/values/dimens.xml
View File

@@ -23,6 +23,11 @@
<dimen name="module_service_content_minWidth">120px</dimen>
<dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
<dimen name="modle_car_panel_call">98px</dimen>
<dimen name="modle_car_panel_call_margin">46px</dimen>
<dimen name="modle_car_panel_call_margin_left">40px</dimen>
<dimen name="module_services_online_car_panel_marginTop">2px</dimen>
<dimen name="module_services_online_car_panel_marginBottom">2px</dimen>
<dimen name="module_services_online_car_panel_marginRight">0px</dimen>