From b03a31358c5514f4e6417f35373e82eda0af0fd5 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 13 Feb 2020 16:01:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/impl/amap/utils/MapStyleUtils.java | 2 +- .../com/mogo/map/navi/MogoCalculatePath.java | 6 ++++++ .../module_map_layout_navi_info_panel.xml | 1 - .../navi/ui/adapter/CalculatePathAdapter.java | 12 +++++++++--- .../navi/ui/search/ChoosePathFragment.kt | 3 +++ .../main/res/drawable/shape_round_blue.xml | 6 ++++++ .../src/main/res/layout/fragment_search.xml | 1 + .../res/layout/item_calculate_path_map.xml | 8 ++++++-- .../res/mipmap-ldpi/icon_choose_position2.png | Bin 2093 -> 1249 bytes 9 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 modules/mogo-module-search/src/main/res/drawable/shape_round_blue.xml diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java index 1184654b03..f53f99221e 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java @@ -40,7 +40,7 @@ public class MapStyleUtils { public static RouteOverlayOptions getRouteOverlayOptions() { RouteOverlayOptions options = new RouteOverlayOptions(); // 设置导航线路的宽度 - options.setLineWidth( 16 ); + options.setLineWidth( 10 ); // 设置交通状况情况良好下的纹理位图 options.setSmoothTraffic( colorToBitmap( ColorEnum.route_overlay_line_normal.getColor() ) ); // 设置路线的图标 diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java index e3d8b3be98..394772abaa 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java @@ -1,5 +1,6 @@ package com.mogo.map.navi; +import android.text.TextUtils; import com.mogo.map.MogoLatLng; import java.util.List; @@ -56,6 +57,11 @@ public class MogoCalculatePath { } public String getStrategyName() { + if (!TextUtils.isEmpty(mStrategyName)&&mStrategyName.contains(",")) { + String[] split = mStrategyName.split(","); + return split[0]; + } + return mStrategyName; } diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml index d9de30169c..72c31ddb81 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml @@ -19,7 +19,6 @@ android:id="@+id/module_map_id_navi_next_info_distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignTop="@+id/module_map_id_navi_next_info_road_turn_icon" android:layout_marginTop="@dimen/module_ext_navi_info_panel_next_info_distance_marginTop" android:layout_toRightOf="@+id/module_map_id_navi_next_info_road_turn_icon" android:textColor="#282828" diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java index 28233d49d6..a1dd22669a 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java @@ -16,8 +16,8 @@ import java.util.List; */ public class CalculatePathAdapter extends RecycleBaseAdapter { - private String selectTag; + /** * */ @@ -35,18 +35,24 @@ public class CalculatePathAdapter extends RecycleBaseAdapter holder.itemView.setTag(R.id.tag_item, item); holder.itemView.setOnClickListener(onClickListener); - holder.itemView.setSelected(TextUtils.equals(item.getTagId(),selectTag)); + holder.itemView.setSelected(TextUtils.equals(item.getTagId(), selectTag)); View mName = holder.getView(R.id.amap_calculate_item_strategy_name); holder.setText(R.id.amap_calculate_item_strategy_name, item.getStrategyName()); mName.setBackgroundResource(getStrategyNameBkgResId(holder.getLayoutPosition())); - if (holder.getLayoutPosition()>=2) { + if (holder.getLayoutPosition() >= 2) { mName.setVisibility(View.GONE); } holder.setText(R.id.amap_calculate_item_strategy_time, item.getTime()); holder.setText(R.id.amap_calculate_item_strategy_distance, item.getDistance()); holder.setText(R.id.amap_calculate_item_strategy_desc, item.getDesc()); + + if (TextUtils.isEmpty(item.getDesc())) { + holder.getView(R.id.amap_calculate_item_strategy_desc).setVisibility(View.GONE); + } else { + holder.getView(R.id.amap_calculate_item_strategy_desc).setVisibility(View.VISIBLE); + } } public void setOnClickListener(View.OnClickListener onClickListener) { diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index faf0f44ac4..ed6910f43c 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -175,6 +175,9 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB mAdapter.setOnClickListener { var item = it.getTag(R.id.tag_item) as MogoCalculatePath selectPath(item) + +// rv_search_result.scroto + } SearchServiceHolder.getMarkerManger() diff --git a/modules/mogo-module-search/src/main/res/drawable/shape_round_blue.xml b/modules/mogo-module-search/src/main/res/drawable/shape_round_blue.xml new file mode 100644 index 0000000000..f98caac9b0 --- /dev/null +++ b/modules/mogo-module-search/src/main/res/drawable/shape_round_blue.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml index 9a9f1b6b1e..9193db299c 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml @@ -205,6 +205,7 @@ app:layout_constraintTop_toBottomOf="@id/tv_navi_park" app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas" android:text="@string/navi_setting" + android:background="@drawable/shape_round_blue" android:layout_marginTop="@dimen/dp_32" style="@style/txt_navi_style" /> diff --git a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml index 1de2a6cf45..e33bc904af 100644 --- a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml +++ b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml @@ -12,12 +12,13 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_48" android:layout_marginLeft="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_26" android:background="@drawable/amap_calculate_navi_strategy_name_bkg" android:gravity="center" android:paddingLeft="8.5dp" android:paddingRight="8.5dp" android:textColor="#ccffffff" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_time" android:textSize="@dimen/sp_30" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -32,7 +33,8 @@ android:textSize="@dimen/dp_50" app:layout_constraintLeft_toLeftOf="parent" android:layout_marginLeft="@dimen/dp_40" - + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_desc" app:layout_constraintTop_toBottomOf="@+id/amap_calculate_item_strategy_name" tools:text="40小时55分" /> @@ -70,6 +72,8 @@ android:layout_height="@dimen/dp_42" android:layout_marginTop="2dp" android:gravity="center" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintBottom_toBottomOf="parent" android:textColor="@color/white_80" android:textSize="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="@+id/amap_calculate_item_strategy_time" diff --git a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_choose_position2.png b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_choose_position2.png index 917d15deccec79330b8563d79991b4c0f18b1b1e..75b012a9d8f7dd202fab18c6c4557cbd3da78024 100755 GIT binary patch literal 1249 zcmV<71Rnc|P)Px(n@L1LR9FeUS6yfvRTMtw&YGBnw769?n`lcF0)lIk7gI${i-;&1P$Hr)3Q7w~ z{h{_nnwCN`u=puq%9n~gTvd;QKNo6OA4 z?9A5H%g)|=e!qL}J@?EVrWmc$HVMOYKO5bp$+R(X6Ur5N`SiujI}tS`vLe`kU=FpfES4Aja0?L)Z=Mr1r*9mq`7fMZ4YgOeddE)L2*KMD}e8#XS|N z1_fDOccgxsJ&jBc-@UUEez}{*OQlJ&THZ8~P4+aZwZ;m8P(?W|s>){?9<~z?sKKXjOCTz_AygI2iwc@H;wu5;xDSwhb&aE@XX} zQPuYwAjfi<#AiiN=}QVQvYR{m^l{X+w=qt*l`9=1h*d;-WGIt34AtoDCKdm`Vql3H-vUm( zb%3uS+D*GMlkD#9wnj%sZ%0)7@uaY~H$lD5s@dIm>(f6RHCI>iGhZA$1KAq*Yv}V@ zYgvu?+S=Nw>FMc<;05k`U~;9?>4v4HrAOi5Af9?WC2h~Wz3KHoW>!`vKAkBMZZQD5 zjAy8$qvN~5!9mZhEfBc5x%o}l-WKLi_?&34%*Lw6S(rY+N9N|{JYS-Ldkn?PVNQzt zxS*mRLl(M5@8~FL?m61{yB~UIaa#OeUwt$H!MO4s8Dbu=1hxG{|g100000 LNkvXXu0mjf7*bki literal 2093 zcmV+|2-5e7P)Px+=Sf6CRCod1TU%^YMHrr$ZOf$=xt2B-s7VPFyiyZigjNCsh(V)5)L^^>)F;s* zFPOkKDltI_7$49W!vpaG!3a?>2(*P4eQ4FFr3y%q8rni>pdeV-Gk)Kpr<}IC=bSw| zyKSAM%`@}Jye29y z`|0r|2y(?*SbJf?yZwY^vK({s7b(;dkZkhO>q(I0EMfhC;gRnpWWdU#Y*Ru#=tVN& z9OSU1PAeC&wko1%-2Nuno(2B#5yaYuwQomtaMe_4c4yP~x%bn}@~E z#@sg_zx%Pa_c?9_Loi4cS=@J@>}5fEDE1~k1j!LHv6F)velLP_zfdc)9*P@Hs%c=i zIk@EX3{l&0zGNN8q)n@D>C&B+Bz@QXQEIB=p!Zmir-GqQjy*;W_6euE`)mvHJoo!q z>nsY59(mGYq5wj9)S6bP3VEKiEy%;_|Aid+lM6X9oyC7*I`%B%bc9)V3NiOCDej#j z#d!O|LWuLYtoZq~7KeY;qW)Amv#_~o8V$JF<04aPQYeRIGUOcHY{RyOLn$QcX{Lm7LGhb& zUb@(pGRy@%4Fv5=StByJTBaII$hd_;PU4v8Uc7H*hfQ%SNHv&{;lhxooa=N~X6U4| z&xIC%h9+b<`pHe9&r`l0cLWZ$nA~W=HdDapp`;p2$Z#-_8&^?d1nGXI8cfKzg+aG* zh#DhE-!j!;LWYBZ+_+7&IvJ_Pbe!p1h7D|M*7=sL3fE5cVFAT!N5{GIYVsu6hHXs- zSg=lMr4E`D%2UDG&ypiaa%^MzL}5kLA&?YePBeBJr$nRv{6HUDjJ5FBhS z-8Fj%9#|u^27%@LmLYpN~(%&tZ}p zeNN@lm$oD^6T9u+Ku z=6Lwx65Ri){1;C&7Ggd&#A`ID^7sM@Scy3vuDAqQ5#~NWOsM%F`DeU_gCY;uh>=(m z;lZlv9r#uTPc@F>D!j9D2kc`r#2~zl?_w}$V9o8#20j&km^uA-mdo*0DY{(s>wk29Ay$FXQ=m=b} zQRiO!$9~eh3PdM3`9@+X&w<$1;Um=+w{MxO?34&P%IvSi$HW{w#CZaFkArNXQG<$${$zmFd(=8^P*z zvKAY1jiV@G4C`UT_OF*vfOkRK2vThjE2h(WHU@A0sg?R#G0oOXJ3(84$6QRe^)f;* zp%pV=y^Ih{WW`KaFJlDzSusP_BSHJy1QV%*l9G~PmSs)s>gp1xK|ND@rLqb z%F4>JTUuIX0>E^TDSXLdD z;tR?Rq`0`a;QICJ3(?#6qnC%f%YvlyN**gD!OJJVqEnr8fZl7+`(t)?_P0$Ays6jLuRVPoLTo#MPUO*ilbVCj8t_zKqyE+wcmO$g9HI^rmtWmLbI=iz>MH8U2^)u5MUx`v0OLN`-rhbF zt7=mFpwm8ym?I{0`(Pqq2|SrmSOoIW>-1=H5N9Fg_QF4UFgNhq?a6fF_azKHqn^xv X_N6J5gXyOQ00000NkvXXu0mjf{4V(&