Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents 9609067c 8ce409e8
Showing 7 changed files with 63 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/res/layout/fagment_collect_main.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
moudle_pedometer/src/main/res/values/colors.xml
moudle_pedometer/src/main/res/values/styles.xml
@@ -78,6 +78,25 @@ public class CommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runStepService", false);
     }
+    /**
+     * 设置赛事ID
+     *
+     * @param context
+     * @param streetId
+     */
+    public static void setStreetId(Context context, String streetId) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("streetId", streetId);
+    }
+
+    /**
+     * 设置赛事ID
+     *
+     * @param context
+     */
+    public static String getStreetId(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("streetId", "");
+    }
+
     /*重置
      * @param context
      */
@@ -87,4 +106,6 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
     }
+
+
 }
@@ -133,7 +133,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //        //初始化地图点位
         if (runRaceDetailInfo.getLatLongitude() != null) {
             Log.e(TAG, "initView: 长度:" + runRaceDetailInfo.getLatLongitude().length());
-            trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude(), LatLng.class);
+            trackPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude().trim(), LatLng.class);
             Log.e(TAG, "initView: trackPoints" + trackPoints.size());
             MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
             //自动计算地图缩放
@@ -40,6 +40,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     public static void startActivity(Activity activity, String eventId) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
         intent.putExtra("eventId", eventId);
+        CommonInfo.setStreetId(activity, eventId);
         activity.startActivity(intent);
     }
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.qmuiteam.qmui.widget.QMUITopBar
+        android:id="@+id/includeToolbar"
+        style="@style/toolbarTitle"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/qmui_topbar_height"
+        android:fitsSystemWindows="true"
+        app:qmui_layout_collapseMode="pin"
+        app:qmui_topbar_bg_color="@color/color_7cbd83"
+        app:qmui_topbar_need_separator="false" />
+
+    <com.baidu.mapapi.map.MapView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+</LinearLayout>
 \ No newline at end of file
@@ -39,10 +39,9 @@
         <ImageView
             android:id="@+id/iv_road_mao"
             android:layout_width="match_parent"
-            android:layout_height="500dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="60dp"
-            android:background="@drawable/map"
-            android:scaleType="center" />
+           android:scaleType="fitCenter" />
     </LinearLayout>
 </layout>
 \ No newline at end of file
@@ -32,4 +32,9 @@
     <color name="text_black">#333333</color>
     <color name="bottom_sheet_dialog_race_location_text">#999999</color>
+
+    <color name="color_7cbd83">#7cbd83</color>
+    <color name="s_topbar_btn_color">#333333</color>
+
+
 </resources>
@@ -24,7 +24,7 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
-    <style name="ShareDialogStyle" >
+    <style name="ShareDialogStyle">
         <item name="android:windowFrame">@null</item><!--边框-->
         <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
         <item name="android:windowIsTranslucent">false</item><!--半透明-->
@@ -40,4 +40,15 @@
         <item name="android:drawablePadding">5dp</item>
         <item name="android:textColor">@drawable/rb_text_drawable_selector</item>
     </style>
+
+    <!---->
+    <style name="toolbarTitle" parent="QMUI.TopBar">
+        <item name="qmui_topbar_separator_color">#c3c3c3</item>
+        <item name="qmui_topbar_bg_color">@color/color_7cbd83</item>
+        <item name="qmui_topbar_title_color">@color/qmui_config_color_white</item>
+        <item name="qmui_topbar_subtitle_color">@color/qmui_config_color_white</item>
+        <item name="qmui_topbar_text_btn_color_state_list">@color/s_topbar_btn_color</item>
+        <item name="qmui_topbar_height">48dp</item>
+        <item name="qmui_topbar_image_btn_height">48dp</item>
+    </style>
 </resources>