diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java index d147275d40..1a8e044cf8 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java @@ -7,6 +7,7 @@ import java.util.List; @SuppressWarnings("unused") public class MarkerCardResult implements Serializable { + private List dataType; // 要查询的类型 private List carChat; private List exploreWay; private List onlineCar; @@ -53,10 +54,19 @@ public class MarkerCardResult implements Serializable { this.noveltyInfo = noveltyInfo; } + public List getDataType() { + return dataType; + } + + public void setDataType(List dataType) { + this.dataType = dataType; + } + @Override public String toString() { return "MarkerCardResult{" + - "carChat=" + carChat + + "dataType=" + dataType + + ", carChat=" + carChat + ", exploreWay=" + exploreWay + ", onlineCar=" + onlineCar + ", shareMusic=" + shareMusic + diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 3235099c5f..54a5a23355 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -265,14 +265,25 @@ public class MarkerServiceHandler { */ public static void drawMapMarker(MarkerResponse response) { lastMarker = null; - getMarkerManager().removeMarkers(); JSONArray array = new JSONArray(); // 解析不同的Marker类型，然后对应的进行绘制 if (response != null && response.getResult() != null) { + MarkerCardResult markerCardResult = response.getResult(); + // 语音触发的在线车辆搜索，采用增量的形式绘制 + if (markerCardResult.getDataType() != null && + markerCardResult.getDataType().size() == 1 && + markerCardResult.getDataType().contains(ServiceConst.CARD_TYPE_USER_DATA)) { + getMarkerManager().removeMarkers(ServiceConst.CARD_TYPE_USER_DATA); + getMogoCardManager().switch2(ServiceConst.CARD_TYPE_USER_DATA); + } else { + // 清空所有地图上绘制的Marker + getMarkerManager().removeMarkers(); + } + List carChatList = markerCardResult.getCarChat(); List onlineCarList = markerCardResult.getOnlineCar(); List exploreWayList = markerCardResult.getExploreWay(); @@ -379,26 +390,26 @@ public class MarkerServiceHandler { break; } } - fillNumberTrackEventBody(array,2, num_gas_station); - fillNumberTrackEventBody(array,6, num_road_closed); - fillNumberTrackEventBody(array,5, num_traffic_check); - fillNumberTrackEventBody(array,7, num_shop_discount); - fillNumberTrackEventBody(array,8, num_fours_shop); + fillNumberTrackEventBody(array, 2, num_gas_station); + fillNumberTrackEventBody(array, 6, num_road_closed); + fillNumberTrackEventBody(array, 5, num_traffic_check); + fillNumberTrackEventBody(array, 7, num_shop_discount); + fillNumberTrackEventBody(array, 8, num_fours_shop); } analyticData(array); } } - private static void fillNumberTrackEventBody(JSONArray arr, int type, int size){ - JSONObject object = new JSONObject( ); + private static void fillNumberTrackEventBody(JSONArray arr, int type, int size) { + JSONObject object = new JSONObject(); try { - object.put( "type", type ); - object.put( "num", size); - if ( arr != null ) { - arr.put( object ); + object.put("type", type); + object.put("num", size); + if (arr != null) { + arr.put(object); } - } catch ( JSONException e ) { + } catch (JSONException e) { e.printStackTrace(); } } @@ -406,11 +417,11 @@ public class MarkerServiceHandler { /** * 统计地图内数据获取 * - * @param array 埋点数据 + * @param array 埋点数据 */ private static void analyticData(JSONArray array) { try { - if ( array == null || array.length() == 0 ) { + if (array == null || array.length() == 0) { return; } final Map properties = new HashMap<>(); @@ -432,8 +443,8 @@ public class MarkerServiceHandler { MogoMarkerOptions options = new MogoMarkerOptions() .owner(markerShowEntity.getMarkerType()) - .alpha( 0.7f ) - .object( markerShowEntity ) + .alpha(0.7f) + .object(markerShowEntity) .latitude(markerShowEntity.getMarkerLocation().getLat()) .longitude(markerShowEntity.getMarkerLocation().getLon()); options.icon(markerView); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index ea81073522..d5e7a79308 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -30,13 +30,13 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { public LaucherShareDialog(@NonNull Context context) { - super(context); + super(context, R.style.BottomDialog); this.mContext = context; getWindow().setBackgroundDrawableResource(android.R.color.transparent); } public LaucherShareDialog(@NonNull Context context, int themeResId) { - super(context, R.style.Theme_AppCompat_Dialog); + super(context, R.style.BottomDialog); } @Override diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png new file mode 100644 index 0000000000..ab5e22a384 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png new file mode 100644 index 0000000000..5ef357ce54 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png new file mode 100644 index 0000000000..0e20d530b5 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png new file mode 100644 index 0000000000..3fe74d1514 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml index 2d9b08d3c1..2e9efefec9 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml @@ -1,21 +1,21 @@ + android:textSize="@dimen/share_module_title_content" /> + android:layout_marginTop="@dimen/share_module_margin_top"> + android:layout_marginLeft="@dimen/share_module_first_margin_left"> @@ -54,25 +54,25 @@ android:id="@+id/oil_price_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/btn_block_layout"> @@ -80,25 +80,25 @@ android:id="@+id/traffic_check_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/oil_price_layout"> @@ -106,25 +106,25 @@ android:id="@+id/road_closure_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/traffic_check_layout"> @@ -133,11 +133,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/btn_block_layout" - android:layout_marginTop="@dimen/dp_55" + android:layout_marginTop="@dimen/share_module_bottom_margin_top" android:gravity="center" android:text="可以对小智说：分享拥堵、分享油价、分享查车、分享封路" android:textColor="@color/white_40" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/share_module_bottom_size" android:textStyle="bold" /> diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..da65c676db --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,19 @@ + + + + 693px + 320px + 34px + 43px + 80px + 64px + 15px + 85px + 28px + + + 22px + 18px + 15px + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..8e1edc4724 --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,20 @@ + + + 1300px + 600px + 64px + 80px + 150px + 120px + 30px + 160px + 55px + + + 40px + 32px + 28px + + + + diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml index ebf7824990..d6a88ad3d2 100644 --- a/modules/mogo-module-share/src/main/res/values/colors.xml +++ b/modules/mogo-module-share/src/main/res/values/colors.xml @@ -16,5 +16,6 @@ #666666 #999999 #000000 + #00FFFFFF diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..8e1edc4724 --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values/dimens.xml @@ -0,0 +1,20 @@ + + + 1300px + 600px + 64px + 80px + 150px + 120px + 30px + 160px + 55px + + + 40px + 32px + 28px + + + + diff --git a/modules/mogo-module-share/src/main/res/values/styles.xml b/modules/mogo-module-share/src/main/res/values/styles.xml new file mode 100644 index 0000000000..389862f71e --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values/styles.xml @@ -0,0 +1,16 @@ + + + + diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 305ddc41b4..d2a77a3653 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -244,7 +244,7 @@ public class TanluCardViewFragment extends MvpFragment> longit = latLon.getLongitude(); lat = latLon.getLatitude(); } - Log.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude" + lat); + Log.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat); getVoiceControlRoadData(mKeywords, lat, longit); } else { String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); @@ -258,7 +258,6 @@ public class TanluCardViewFragment extends MvpFragment> if (p0.getPois() != null && p0.getPois().size() != 0) { PoiItem poi = p0.getPois().get(0); LatLonPoint latLon = poi.getLatLonPoint(); - Double longit; //经度 Double lat; //维度 if (mKeywords.equals("附近")) { @@ -356,48 +355,56 @@ public class TanluCardViewFragment extends MvpFragment> mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { @Override public boolean onMarkerClicked(IMogoMarker marker) { - //点击marker以后，确认他的位置？然后点击下一个操作 mEmptyLayout.setVisibility(View.GONE); mRootLayout.setVisibility(View.VISIBLE); - - Log.d(TAG, "onMarkerClicked registerMogoMarkerClickListener --1---- "); MarkerExploreWay exploreWay = extractFromMarker(marker); - if (exploreWay == null) { - Log.e(TAG, "onMarkerClicked registerMogoMarkerClickListener --2---- "); - return false; - } - - //TODO 自己打的点，需要重新组装新数据，清理老的 - if (exploreWay.getFileType() == 0) { //图片 - refreshPhotoData(exploreWay); - } else if (exploreWay.getFileType() == 1) { //视频 - handleData(exploreWay); - } - - Log.d(TAG, "onMarkerClicked registerMogoMarkerClickListener --3----size() = " + markerExploreWayList.size()); - - //更新位置currentPosition - for (int i = 0; i < markerExploreWayList.size(); i++) { - if (markerExploreWayList.get(i) == exploreWay) { - currentPosition = i; - break; + if (exploreWay == null) { // 自己打点数据 + double lat = marker.getPosition().lat; + //更新当前位置 + for (int i = 0; i < markerExploreWayList.size(); i++) { + if (markerExploreWayList.get(i).getLocation().getLat() == lat) { + currentPosition = i; + break; + } } - Logger.d(TAG, "onMarkerClicked currentPosition = " + currentPosition); + Log.d(TAG, "onMarkerClicked 自己打点数据 currentPosition = " + currentPosition); + handleMarkerExploreWay(markerExploreWayList.get(currentPosition)); + } else { //大而全数据 + double lat = exploreWay.getLocation().getLat(); + for (int i = 0; i < markerExploreWayList.size(); i++) { + if (markerExploreWayList.get(i).getLocation().getLat() == lat) { + currentPosition = i; + break; + } + } + Log.d(TAG, "onMarkerClicked 大而全数据 currentPosition = " + currentPosition); + handleMarkerExploreWay(exploreWay); } - return false; } }); } + private void handleMarkerExploreWay(MarkerExploreWay markerExploreWay) { + if (markerExploreWay != null) { + if (markerExploreWay.getFileType() == 0) { //图片 + refreshPhotoData(markerExploreWay); + } else if (markerExploreWay.getFileType() == 1) { //视频 + handleData(markerExploreWay); + } + } else { + Log.e(TAG, "handleMarkerExploreWay == null"); + } + } + /** * 处理关键词搜索 * * @return */ private void handleActionFoo(String keywords) { - Logger.d(TAG, "handleActionFoo keywords = " + keywords); + Log.d(TAG, "handleActionFoo keywords = " + keywords); speakSearchingVoice(); GeocodeQuery geocodeQuery; String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode(); @@ -411,7 +418,6 @@ public class TanluCardViewFragment extends MvpFragment> * 注册listener监听 */ private void initListener() { - //唤醒 mogoIntentManager.registerIntentListener(TanluConstants.UPLOAD_ROAD_CONDITION, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.SPECIFIEDROAD_SEARCH, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.SHARE_ROAD_CLOSURE, mogoIntentListener); @@ -419,6 +425,7 @@ public class TanluCardViewFragment extends MvpFragment> mogoIntentManager.registerIntentListener(TanluConstants.GO_TO_SHARE, mogoIntentListener); } + /** * 唤醒语音 */ @@ -461,7 +468,6 @@ public class TanluCardViewFragment extends MvpFragment> private IMogoVoiceCmdCallBack mogoVoiceListener = new IMogoVoiceCmdCallBack() { @Override public void onCmdSelected(String cmd) { - Logger.d(TAG, "免唤醒 onCmdSelected mogoVoiceListener cmd =" + cmd); if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok FullMediaActivity.Companion.launch(getActivity(), mVideoUrl, mImageUrl, mTitle, mGenerateTime); } @@ -506,6 +512,7 @@ public class TanluCardViewFragment extends MvpFragment> return ((MarkerExploreWay) showEntity.getBindObj()); } } + return null; } @@ -518,28 +525,28 @@ public class TanluCardViewFragment extends MvpFragment> int id = view.getId(); if (id == R.id.tv_previous_res) { //上一个 //判断是图片还是视频，第一个时，上一个不可点击 - Logger.d(TAG, " tv_previous_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); if (currentPosition < 0) { - return; +// return; + currentPosition = markerExploreWayList.size(); } currentPosition--; - Logger.d(TAG, " tv_previous_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + Log.d(TAG, " tv_previous_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); if (markerExploreWayList.size() > currentPosition && currentPosition >= 0) { handleData(markerExploreWayList.get(currentPosition)); } - } else if (id == R.id.tv_next_res) { //下一个 //判断是图片还是视频，最后一个时，下一个不可点击 - Logger.d(TAG, " tv_next_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); - if (currentPosition > markerExploreWayList.size()) { - return; + Log.e(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); + if (currentPosition >= markerExploreWayList.size()) { +// return; + currentPosition = 0; } currentPosition++; - Logger.d(TAG, " tv_next_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + Log.d(TAG, " tv_next_res --2-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); if (markerExploreWayList.size() > currentPosition) { handleData(markerExploreWayList.get(currentPosition)); } - } else if (id == R.id.tv_main_empty) { //上报路况 sendShareReceiver("1"); } @@ -664,7 +671,7 @@ public class TanluCardViewFragment extends MvpFragment> } /** - * TODO + * TODO * C位事件,如何获取数据，需要有默认数据 * 如果只有一个数据，不显示上下切换按钮，没有数据显示空页面 */ @@ -801,13 +808,13 @@ public class TanluCardViewFragment extends MvpFragment> */ @Subscribe(threadMode = ThreadMode.MAIN) public void onMarkerInfo(final MarkerInfo event) { - Logger.d(TAG, "onMarkerInfo ------------>"); + Log.d(TAG, "onMarkerInfo ------------>"); if (event == null) { return; } String poiType = ""; - if (event.type.equals("1")) { //上报路况 TODO 修改探路 + if (event.type.equals("1")) { //上报路况 mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } else if (event.type.equals("2")) { //交通检查 10002 poiType = "10002"; @@ -819,13 +826,13 @@ public class TanluCardViewFragment extends MvpFragment> mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } - Logger.d(TAG, "onMarkerInfo share onCompleted ------>"); + Log.d(TAG, "onMarkerInfo share onCompleted ------>"); MogoMarkerOptions options = new MogoMarkerOptions() .icon(mMarkerIcon) .latitude(event.lat) .owner(TanluConstants.MODEL_NAME) .longitude(event.lon); - IMogoMarker marker = mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 + mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 //请求分享接口 MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); if (markerExploreWay.getUserInfo() != null) { @@ -989,7 +996,6 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onSuccess(VoiceSearchResult o) { String discription = o.getResult().getDescription(); - Logger.d(TAG, "getVoiceControlRoadData discription = " + discription); if (o.getResult().getInformations() != null && o.getResult().getInformations().size() > 0) { if (markerExploreWayList != null && markerExploreWayList.size() > 0) { markerExploreWayList.clear(); //刷新之前先删除之前的，然后再添加成请求的 @@ -1015,7 +1021,6 @@ public class TanluCardViewFragment extends MvpFragment> for (int i = 0; i < informationList.size(); i++) { //根据type确定添加的图片 String trafficType = informationList.get(i).trafficInfoType; - Log.e(TAG, "trafficType =" + trafficType); if (trafficType.equals("traffic_jam")) { //拥堵 multiMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } else if (trafficType.equals("car_checking")) { //查车 @@ -1059,7 +1064,7 @@ public class TanluCardViewFragment extends MvpFragment> * 将探路的数据结构转换成 MarkerExploreWay的列表 */ private void convertData(List informations) { - for (int i = 0 ; i < informations.size(); i++) { + for (int i = 0; i < informations.size(); i++) { MarkerExploreWay markerExploreWay = new MarkerExploreWay(); markerExploreWay.setAddr(informations.get(i).addr); markerExploreWay.setCityName(informations.get(i).cityName); @@ -1076,6 +1081,7 @@ public class TanluCardViewFragment extends MvpFragment> /** * 转换媒体数据 + * * @param items * @return */ diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt deleted file mode 100644 index 3899359ea2..0000000000 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.module.tanlu.receiver - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.util.Log -import com.mogo.module.tanlu.model.event.VoiceRoadInfo -import org.greenrobot.eventbus.EventBus - -/** - * xx堵不堵，接收关键字,应该在哪里接收关键字请求接口？ - */ -class RoadInfoReceiver : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - if (intent.action == "com.zhidao.roadcondition.roadinfo"){ - var keyWords = intent.getStringExtra("keywords") - var city = intent.getStringExtra("city") - Log.d("RoadInfoReceiver", "keyWords = $keyWords ---->city = $city") - EventBus.getDefault().post(VoiceRoadInfo(keyWords, city)) - } - } -} diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png deleted file mode 100755 index 66f73f4454..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png deleted file mode 100755 index b12b10c83f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png deleted file mode 100755 index 5503dc5a28..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png deleted file mode 100755 index 16842d5d12..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png deleted file mode 100755 index 2fa5633c59..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png deleted file mode 100755 index 21793fea2b..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png deleted file mode 100755 index d7d832857f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png deleted file mode 100755 index c1d019b4ae..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png deleted file mode 100755 index b3318ad436..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png deleted file mode 100755 index 038e63f485..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png deleted file mode 100755 index e15ce84e87..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png deleted file mode 100755 index 9f3540757a..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png deleted file mode 100755 index cef675f06f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png deleted file mode 100755 index c4d67d38a4..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png deleted file mode 100755 index 3c92f82f0d..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png deleted file mode 100755 index cd716c8840..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png deleted file mode 100755 index e636b446c1..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png deleted file mode 100755 index fec3f4ec69..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png deleted file mode 100755 index 34c2228f6c..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png deleted file mode 100755 index df9e8dc67c..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png deleted file mode 100755 index a4ba8c22cb..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png deleted file mode 100755 index 39ad870c5f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png deleted file mode 100755 index a3c1632562..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png deleted file mode 100755 index c99fb65b94..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png deleted file mode 100755 index 86898c2144..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png deleted file mode 100755 index 750b6fbb7e..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png deleted file mode 100755 index 8cbe886e81..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png deleted file mode 100755 index cfe7d6c0fb..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png deleted file mode 100755 index e465d5eec2..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png deleted file mode 100755 index 0d2f3c0360..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png deleted file mode 100755 index e53c9ff451..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png deleted file mode 100755 index edfdbe1df0..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png deleted file mode 100755 index a762d0b74a..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png deleted file mode 100755 index f3cb78aed4..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png deleted file mode 100755 index 4d2a797823..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png deleted file mode 100755 index 2ed622283b..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png new file mode 100644 index 0000000000..797a159dc6 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png new file mode 100644 index 0000000000..339d7731ec Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png new file mode 100644 index 0000000000..7c0e9618fb Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png new file mode 100644 index 0000000000..f868f58df0 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png index 9dd91f20d1..cfb640f6a3 100644 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png index 2b3c15b3d4..fe7bd3486c 100644 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml index dc765b7c94..40a085df42 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml @@ -94,11 +94,11 @@ android:layout_width="@dimen/tanlu_module_card_previous_width" android:layout_height="@dimen/tanlu_module_card_previous_height" android:layout_centerVertical="true" - android:paddingLeft="@dimen/dp_40" + android:paddingLeft="@dimen/tanlu_module_card_previous_margin_left" android:background="@drawable/shape_bg_222533" android:drawableLeft="@drawable/media_previous" android:gravity="center_vertical" - android:drawablePadding="@dimen/dp_40" + android:drawablePadding="@dimen/dp_20" android:text="@string/tanlu_previous" android:textColor="@color/white" android:textSize="@dimen/tanlu_module_card_next_size" /> @@ -110,11 +110,12 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:paddingRight="@dimen/dp_80" - android:paddingLeft="@dimen/dp_70" + android:paddingRight="@dimen/tanlu_module_card_next_margin_left" + android:paddingLeft="@dimen/tanlu_module_card_next_margin_left" android:background="@drawable/shape_bg_222533" android:drawableRight="@drawable/media_next" android:gravity="center_vertical" + android:drawablePadding="@dimen/dp_20" android:text="@string/tanlu_next" android:textColor="@color/white" android:textSize="@dimen/tanlu_module_card_next_size" /> @@ -138,7 +139,7 @@ android:layout_marginLeft="@dimen/tanlu_module_card_empty_maginleft" android:layout_marginRight="@dimen/tanlu_module_card_empty_maginleft" android:layout_marginTop="@dimen/tanlu_module_card_empty_magintop" - android:src="@mipmap/main_view_empty_bg" /> + android:src="@drawable/main_view_empty_bg" /> 65px 109px 28px + 45px + 45px 20px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index bc6de92c91..c6f46c0772 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -38,6 +38,8 @@ 75px 205px 25px + 90px + 80px 38px diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 78aa080e47..48a00d3b8d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -18,6 +18,7 @@ #A2A2A2 #5a979797 #80FFFFFF + #00FFFFFF #b3000000 #0DFFFFFF #000000 diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..c6f46c0772 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -0,0 +1,54 @@ + + + + + 106px + 106px + 48px + 48px + 72px + 5px + + 106px + 106px + 96px + 96px + 144px + 760px + 10px + + 135px + 50px + 50px + 30px + 92px + 40px + 800px + + 660px + 24px + 58px + 8px + 2px + 613px + 355px + 20px + 300px + 90px + 75px + 205px + 25px + 90px + 80px + + + 38px + 26px + 34px + 26px + 28px + + + + +