1.新增GPS状态实时显示

杨帅
1 parent a72f39f5
Showing 54 changed files with 445 additions and 85 deletions
.idea/gradle.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/MyMapUtil.java
moudle_pedometer/src/main/res/drawable-hdpi/circle_white_shadow_bg.png
moudle_pedometer/src/main/res/drawable-hdpi/gps_tip_bg.png
moudle_pedometer/src/main/res/drawable-hdpi/gps_white_shadow.png
moudle_pedometer/src/main/res/drawable-hdpi/icon_end.png
moudle_pedometer/src/main/res/drawable-hdpi/icon_start.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_location.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_ic_location.webp
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_0.png
moudle_pedometer/src/main/res/drawable-hdpi/rt_training_gps_1.png
@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -54,8 +54,8 @@ public class CommonInfo {
     /**
      * @param context
      */
-    public static void getUserId(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("userId", "");
+    public static String getUserId(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("userId", "");
     }
     /**
@@ -75,7 +75,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsRunStepService(Context context) {
-       return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runStepService", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runStepService", false);
     }
     /*重置
@@ -10,7 +10,16 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Chronometer;
-
+import android.widget.Toast;
+
+import com.baidu.location.BDAbstractLocationListener;
+import com.baidu.location.BDLocation;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
+import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MyLocationData;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
@@ -24,9 +33,11 @@ import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.ButtonAnimUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -42,13 +53,14 @@ public class RunMainFragmentView implements MvpView {
     private Handler handler;
     private Runnable runnable;
     private Runnable animRunnable;
-
     private long mRecordTime;//计时时间
     private boolean firstTimeFlag;//是否是首次计时
     private int timeCountDown;//时间倒计时
-
     private String uid;
     private boolean needWriteDataFlag = true;//是否需要将计时器基值写入到数据库
+    // 定位相关
+    private LocationClient mLocClient;
+    public MyLocationListenner myListener = new MyLocationListenner();
     public RunMainFragmentView(RunMainFragment fragment) {
         this.fragment = fragment;
@@ -58,8 +70,44 @@ public class RunMainFragmentView implements MvpView {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void showStartTimeTip() {
-
+    private void initLocationClient() {
+        // 定位初始化
+        mLocClient = new LocationClient(getContext());
+        mLocClient.registerLocationListener(myListener);
+        LocationClientOption option = new LocationClientOption();
+        option.setOpenGps(true); // 打开gps
+        //可选，设置返回经纬度坐标类型，默认GCJ02
+        //GCJ02：国测局坐标；
+        //BD09ll：百度经纬度坐标；
+        //BD09：百度墨卡托坐标；
+        //海外地区定位，无需设置坐标类型，统一返回WGS84类型坐标
+        option.setCoorType("gcj02"); // 设置坐标类型
+        //可选，默认false，设置是否开启Gps定位
+        option.setOpenGps(true);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
+        option.setOpenAutoNotifyMode();
+        //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
+        //LocationMode.Hight_Accuracy：高精度；
+        //LocationMode. Battery_Saving：低功耗；
+        //LocationMode. Device_Sensors：仅使用设备；
+        option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
+        //可选，设置是否需要地址信息，默认不需要
+        option.setIsNeedAddress(false);
+        //可选，设置是否需要地址描述
+        option.setIsNeedLocationDescribe(false);
+        //可选，设置是否需要设备方向结果
+        option.setNeedDeviceDirect(false);
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        //minTimeInterval - 最短定位时间间隔，单位毫秒，最小值0，开发者可以在设置希望的位置回调最短时间间隔
+        //minDistance - 最短定位距离间隔，单位米，最小值0，开发者可以设置希望的位置回调距离间隔
+        //locSensitivity - 定位变化敏感程度,LOC_SENSITIVITY_HIGHT,LOC_SENSITIVITY_MIDDLE,LOC_SENSITIVITY_LOW
+        option.setOpenAutoNotifyMode(3000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
+        //可选，定位SDK内部是一个service，并放到了独立进程。
+        //设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
+        option.setIgnoreKillProcess(true);
+
+        mLocClient.setLocOption(option);
+        mLocClient.start();
     }
     /**
@@ -68,6 +116,7 @@ public class RunMainFragmentView implements MvpView {
     public void initView() {
         uid = "yangshuai";
         CommonInfo.setUserId(getContext(), uid);
+        initLocationClient();
         fragment.binding.llRunMainRoot.setVisibility(View.GONE);
         ButtonAnimUtil.startAnimation(fragment.binding.llStartTimeTip, false);
         firstTimeFlag = true;
@@ -438,6 +487,81 @@ public class RunMainFragmentView implements MvpView {
     }
+    /**
+     * //设置定位监听器，获取到用户当前位置 杨帅
+     * 定位SDK监听函数
+     */
+    public class MyLocationListenner extends BDAbstractLocationListener {
+
+
+        @Override
+        public void onReceiveLocation(BDLocation location) {
+            if (location == null) {
+                return;
+            }
+            //正在搜索GPS信号
+            if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_UNKNOWN) {
+                if (!getContext().getString(R.string.loc_gps_accuracy_unknown).equals(fragment.binding.tvLookTrace.getText().toString())) {
+                    fragment.binding.tvLookTrace.setText(getContext().getString(R.string.loc_gps_accuracy_unknown));
+                    fragment.binding.tvLookTrace.setTextColor(getContext().getResources().getColor(R.color.red));
+                }
+                if (fragment.binding.tvLookTrace.getVisibility()!=View.VISIBLE){
+                    fragment.binding.tvLookTrace.setVisibility(View.VISIBLE);
+                }
+                if (fragment.binding.ivGps.getTag()==null||!fragment.binding.ivGps.getTag().toString().equals("rt_training_gps_0")) {
+                    fragment.binding.ivGps.setTag("rt_training_gps_0");
+                    //设置图标
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                }
+
+
+            }
+            //GPS 质量判断差
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_BAD) {
+                if (!getContext().getString(R.string.loc_gps_accuracy_bad).equals(fragment.binding.tvLookTrace.getText().toString())) {
+                    fragment.binding.tvLookTrace.setText(getContext().getString(R.string.loc_gps_accuracy_bad));
+                    fragment.binding.tvLookTrace.setTextColor(getContext().getResources().getColor(R.color.text_gray99));
+
+                }
+                if (fragment.binding.tvLookTrace.getVisibility()!=View.VISIBLE){
+                    fragment.binding.tvLookTrace.setVisibility(View.VISIBLE);
+                }
+                if (fragment.binding.ivGps.getTag()==null||!fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_BAD")) {
+                    fragment.binding.ivGps.setTag("GPS_ACCURACY_BAD");
+                    //设置图标
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                }
+            }
+            //GPS 质量判断中等
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_MID) {
+                if (fragment.binding.tvLookTrace.getVisibility() == View.VISIBLE) {
+                    fragment.binding.tvLookTrace.setVisibility(View.GONE);
+                }
+                if (fragment.binding.ivGps.getTag()==null||!fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_MID")) {
+                    fragment.binding.ivGps.setTag("GPS_ACCURACY_MID");
+                    //设置图标
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                }
+            }//GPS 质量判断好
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
+                if (fragment.binding.tvLookTrace.getVisibility() == View.VISIBLE) {
+                    fragment.binding.tvLookTrace.setVisibility(View.GONE);
+                }
+                if (fragment.binding.ivGps.getTag()==null||!fragment.binding.ivGps.getTag().toString().equals("GPS_ACCURACY_GOOD")) {
+                    fragment.binding.ivGps.setTag("GPS_ACCURACY_GOOD");
+                    //设置图标
+                    fragment.binding.ivGps.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                }
+            }
+        }
+    }
+
+    public void onDestroy() {
+        if (mLocClient != null) {
+            mLocClient.stop();
+        }
+    }
 }
+
@@ -283,7 +283,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置定位模式, 默认为 LocationMode.NORMAL 普通态
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
-        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 40, 40);
+        Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -245,6 +245,57 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             if (location == null || mMapView == null) {
                 return;
             }
+
+            //正在搜索GPS信号
+            if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_UNKNOWN) {
+                if (fragment.binding.tvGpsPopBg.getVisibility() != View.VISIBLE) {
+                    fragment.binding.tvGpsPopBg.setVisibility(View.VISIBLE);
+                }
+                if (!getContext().getResources().getString(R.string.loc_gps_accuracy_unknown).equals(fragment.binding.tvGpsPopBg.getText().toString())) {
+                    fragment.binding.tvGpsPopBg.setText(getContext().getResources().getString(R.string.loc_gps_accuracy_unknown));
+                }
+                //设置图标
+                if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_UNKNOWN".equals(fragment.binding.ivGpsState.getTag().toString())) {
+                    fragment.binding.ivGpsState.setTag("GPS_ACCURACY_UNKNOWN");
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_0));
+                }
+            }
+            //GPS 质量判断差
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_BAD) {
+                if (fragment.binding.tvGpsPopBg.getVisibility() != View.VISIBLE) {
+                    fragment.binding.tvGpsPopBg.setVisibility(View.VISIBLE);
+                }
+                if (!getContext().getResources().getString(R.string.loc_gps_accuracy_bad).equals(fragment.binding.tvGpsPopBg.getText().toString())) {
+                    fragment.binding.tvGpsPopBg.setText(getContext().getResources().getString(R.string.loc_gps_accuracy_bad));
+                }
+                //设置图标
+                if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_BAD".equals(fragment.binding.ivGpsState.getTag().toString())) {
+                    fragment.binding.ivGpsState.setTag("GPS_ACCURACY_BAD");
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_1));
+                }
+            }
+            //GPS 质量判断中等
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_MID) {
+                if (fragment.binding.tvGpsPopBg.getVisibility() != View.GONE) {
+                    fragment.binding.tvGpsPopBg.setVisibility(View.GONE);
+                }
+                //设置图标
+                if (fragment.binding.ivGpsState.getTag()== null || !"GPS_ACCURACY_MID".equals(fragment.binding.ivGpsState.getTag().toString())) {
+                    fragment.binding.ivGpsState.setTag("GPS_ACCURACY_MID");
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_2));
+                }
+            }//GPS 质量判断好
+            else if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_GOOD) {
+                if (fragment.binding.tvGpsPopBg.getVisibility() != View.GONE) {
+                    fragment.binding.tvGpsPopBg.setVisibility(View.GONE);
+                }
+                //设置图标
+                if (fragment.binding.ivGpsState.getTag() == null || !"GPS_ACCURACY_GOOD".equals(fragment.binding.ivGpsState.getTag().toString())) {
+                    fragment.binding.ivGpsState.setTag("GPS_ACCURACY_GOOD");
+                    fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
+                }
+            }
+
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > 20) {
@@ -356,11 +356,7 @@ public class StepService extends Service implements SensorEventListener {
     @SuppressLint("WrongConstant")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent.getStringExtra("userId") != null) {
-            userId = intent.getStringExtra("userId");
-            Log.e(TAG, "onStartCommand: 传入的用户:" + userId);
-        }
-//        userId = MySpHelper.getInstance(getApplicationContext(), Context.MODE_MULTI_PROCESS).getString("userId", "");
+        userId =CommonInfo.getUserId(getApplicationContext());
         if (userId != null && !TextUtils.isEmpty(userId)) {
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
@@ -246,4 +246,5 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     public void onBackPressed() {
         return;
     }
+
 }
@@ -35,6 +35,7 @@ import java.util.List;
  */
 @Route(path = "/moudle_pedometer/RunRaceDetailActivity")
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
+    private QMUIFragment fragment;
     @Override
     protected int getContextViewId() {
@@ -49,11 +50,14 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
         boolean isRunStep = CommonInfo.getIsRunStepService(this);
         //没有找到相关记录
         if (!isRunStep) {
-            addFragment(new RunRaceDetailFragment());
+            fragment = new RunRaceDetailFragment();
         }
         //找到记录
         else {
-            addFragment(new RunMainFragment());
+            fragment = new RunMainFragment();
+        }
+        if (fragment != null) {
+            addFragment(fragment);
         }
     }
@@ -71,4 +75,14 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        if (fragment != null) {
+            if (fragment instanceof RunMainFragment) {
+                return;
+            }
+        }
+    }
 }
@@ -68,6 +68,9 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
         if (EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().unregister(this);
         }
+        if (getMvpView() != null) {
+            getMvpView().onDestroy();
+        }
     }
     @Override
@@ -180,6 +180,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         if (EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().unregister(this);
         }
+
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -103,7 +103,7 @@ public class MyMapUtil {
         }
         //只有一个点
         if (points.size() == 1) {
-            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+            Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 10, 16);
             OverlayOptions startOptions = new MarkerOptions().position(points.get(0)).icon(BitmapDescriptorFactory.fromBitmap(pointBitmap));
 //                    .zIndex(9).draggable(true);
             return baiduMap.addOverlay(startOptions);
@@ -120,7 +120,7 @@ public class MyMapUtil {
         }
         // 添加起点图标
-        Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 40, 40);
+        Bitmap startPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), startIconRes), 30, 36);
         OverlayOptions startOptions = new MarkerOptions()
                 .position(startPoint)
                 .icon(BitmapDescriptorFactory.fromBitmap(startPointBitmap))
@@ -129,11 +129,12 @@ public class MyMapUtil {
                 ;
 //                .zIndex(9).draggable(true);
         // 添加终点图标
-        Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 40, 40);
+        Bitmap endPointBitmap = BitmapUtil.getBitmapFromDp(context, BitmapFactory.decodeResource(context.getResources(), endIconRes), 30, 36);
         OverlayOptions endOptions = new MarkerOptions()
                 .position(endPoint)
                 .icon(BitmapDescriptorFactory.fromBitmap(endPointBitmap))
                 .perspective(false)
+                .anchor(0.6f,0.96f)
                 .animateType(MarkerOptions.MarkerAnimateType.grow);
 //                .zIndex(9).draggable(true);
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--边-->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="3px"
+                android:left="2px"
+                android:right="2px"
+                android:top="2px" />
+
+            <solid android:color="#00eeeeee" />
+
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="3px"
+                android:left="2px"
+                android:right="2px"
+                android:top="2px" />
+
+            <solid android:color="#0Deeeeee" />
+
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="3px"
+                android:left="2px"
+                android:right="2px"
+                android:top="2px" />
+            <solid android:color="#0D4F4F4F" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="3px"
+                android:left="2px"
+                android:right="2px"
+                android:top="2px" />
+            <solid android:color="#0D4F4F4F" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="3px"
+                android:left="2px"
+                android:right="2px"
+                android:top="2px" />
+            <solid android:color="#1A4F4F4F" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/white" />
+            <corners android:radius="50dp" />
+            <size
+                android:width="32dp"
+                android:height="32dp" />
+
+        </shape>
+    </item>
+
+</layer-list>
 \ No newline at end of file
@@ -5,64 +5,64 @@
     <item>
         <shape android:shape="rectangle">
             <padding
-                android:bottom="7px"
-                android:left="7px"
-                android:right="7px"
-                android:top="5px" />
-
-            <solid android:color="#00eeeeee" />
-
+                android:bottom="6px"
+                android:left="3px"
+                android:right="3px"
+                android:top="3px" />
+            <solid android:color="#0DF8F8FF" />
             <corners android:radius="5dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <padding
-                android:bottom="7px"
-                android:left="7px"
-                android:right="7px"
-                android:top="5px" />
-
-            <solid android:color="#0Deeeeee" />
-
+                android:bottom="6px"
+                android:left="3px"
+                android:right="3px"
+                android:top="3px" />
+            <solid android:color="#0DE8E8E8" />
             <corners android:radius="5dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <padding
-                android:bottom="7px"
-                android:left="7px"
-                android:right="7px"
-                android:top="5px" />
-            <solid android:color="#0Deeeeee" />
+                android:bottom="6px"
+                android:left="3px"
+                android:right="3px"
+                android:top="3px" />
+            <solid android:color="#0DCFCFCF" />
+
             <corners android:radius="5dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <padding
-                android:bottom="7px"
-                android:left="7px"
-                android:right="7px"
-                android:top="5px" />
-            <solid android:color="#0Deeeeee" />
+                android:bottom="6px"
+                android:left="3px"
+                android:right="3px"
+                android:top="3px" />
+            <solid android:color="#0DB5B5B5" />
             <corners android:radius="5dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <padding
-                android:bottom="7px"
-                android:left="7px"
-                android:right="7px"
-                android:top="5px" />
+                android:bottom="6px"
+                android:left="3px"
+                android:right="3px"
+                android:top="3px" />
+
+            <solid android:color="#0D9C9C9C" />
-            <solid android:color="#0Deeeeee" />
             <corners android:radius="5dp" />
         </shape>
     </item>
+
+
     <!--中心背景 -->
     <item>
         <shape
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="50dp" />
+</shape>
 \ No newline at end of file
@@ -79,24 +79,47 @@
                             android:textSize="18sp"
                             android:textStyle="bold" />
+                        <ImageView
+                            android:id="@+id/iv_gps"
+                            android:layout_width="18dp"
+                            android:layout_height="5dp"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="5dp"
+                            android:layout_toRightOf="@id/tv_gps"
+                             />
+
                         <TextView
                             android:id="@+id/tv_look_trace"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginLeft="15dp"
-                            android:layout_toRightOf="@id/tv_gps"
-                            android:text="(点击查看轨迹)"
-                            android:textColor="@color/text_gray"
+                            android:layout_marginLeft="5dp"
+                            android:layout_toRightOf="@id/iv_gps"
+                            android:textColor="@color/text_gray99"
                             android:textSize="12sp"
                             android:textStyle="bold" />
-                        <ImageView
-                            android:layout_width="55dp"
-                            android:layout_height="55dp"
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_marginRight="15dp"
-                            android:src="@drawable/rt_ic_home_map" />
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="55dp"
+                                android:layout_height="55dp"
+                                android:src="@drawable/rt_ic_home_map" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
+                                android:text="点击查看轨迹"
+                                android:textColor="@color/text_gray99"
+                                android:textSize="10sp" />
+                        </LinearLayout>
                     </RelativeLayout>
                     <!--计时-->
                     <LinearLayout
@@ -139,7 +162,7 @@
                                 android:layout_marginTop="5dp"
                                 android:gravity="center"
                                 android:text="配速"
-                                android:textColor="@color/text_gray"
+                                android:textColor="@color/text_gray99"
                                 android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
@@ -172,7 +195,7 @@
                                 android:layout_marginTop="5dp"
                                 android:gravity="center"
                                 android:text="用时"
-                                android:textColor="@color/text_gray"
+                                android:textColor="@color/text_gray99"
                                 android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
@@ -206,7 +229,7 @@
                                 android:layout_marginTop="5dp"
                                 android:gravity="center"
                                 android:text="步"
-                                android:textColor="@color/text_gray"
+                                android:textColor="@color/text_gray99"
                                 android:textSize="15sp"
                                 android:textStyle="bold" />
                         </LinearLayout>
@@ -11,11 +11,21 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+        <!--地图上面加一层类似于全透明黑色蒙版-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#0D000000"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"></LinearLayout>
+
         <FrameLayout
             android:id="@+id/fl_back"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:background="@drawable/button_fab_white"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/circle_white_shadow_bg"
             android:focusable="true">
             <ImageView
@@ -23,11 +33,57 @@
                 android:layout_height="20dp"
                 android:layout_gravity="center"
                 android:layout_marginLeft="-2dp"
+                android:layout_marginBottom="3dp"
                 android:background="@drawable/icon_back"
                 android:focusable="false" />
         </FrameLayout>
         <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|right"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="10dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="75dp"
+                android:layout_height="30dp"
+                android:layout_gravity="right"
+                android:background="@drawable/gps_white_shadow"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:text="GPS"
+                    android:textColor="@color/text_black"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:id="@+id/iv_gps_state"
+                    android:layout_width="18dp"
+                    android:layout_height="5dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginBottom="3dp" />
+            </LinearLayout>
+            <!---->
+            <TextView
+                android:id="@+id/tv_gps_pop_bg"
+                android:layout_width="150dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="-5dp"
+                android:background="@drawable/gps_tip_bg"
+                android:gravity="center"
+                android:textColor="@color/text_black"
+                android:textSize="10sp"
+                android:visibility="gone" />
+            <!---->
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
@@ -35,32 +91,33 @@
             <FrameLayout
                 android:id="@+id/fl_location"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginBottom="20dp"
-                android:background="@drawable/button_fab_white"
+                android:background="@drawable/circle_white_shadow_bg"
                 android:focusable="true">
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center"
+                    android:layout_marginBottom="3dp"
                     android:background="@drawable/rt_ic_location_blank"
                     android:focusable="false" />
             </FrameLayout>
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginBottom="20dp"
-                android:background="@drawable/shape_10dp_white_raduis_bg">
+                android:layout_height="130dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/white_shadow_bg"
+                android:scaleX="1.02">
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_weight="1.2"
                     android:gravity="center"
                     android:orientation="vertical"
                     android:paddingLeft="5dp"
@@ -87,7 +144,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1.2"
                     android:gravity="center"
                     android:orientation="vertical">
@@ -7,11 +7,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="180dp"
-        android:layout_marginLeft="1dp"
-        android:layout_marginRight="1dp"
-        android:layout_marginBottom="5dp"
-        android:background="@drawable/layer_shadow"
-        android:orientation="vertical">
+        android:background="@drawable/white_shadow_bg"
+        android:orientation="vertical"
+        android:paddingLeft="15dp"
+        android:paddingTop="5dp"
+        android:paddingRight="15dp"
+        android:paddingBottom="15dp">
         <LinearLayout
             android:layout_width="match_parent"
@@ -11,11 +11,11 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="150dp"
-        android:layout_marginLeft="1dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="1dp"
-        android:layout_marginBottom="15dp"
-        android:background="@drawable/layer_shadow"
+        android:paddingLeft="15dp"
+        android:paddingTop="5dp"
+        android:paddingRight="15dp"
+        android:paddingBottom="15dp"
+        android:background="@drawable/white_shadow_bg"
         android:orientation="vertical">
         <LinearLayout
@@ -3,6 +3,8 @@
     <color name="run_main_bg">#3D3745</color>
     <color name="run_main_time_bg">#5BC4A4</color>
     <color name="text_gray">#666666</color>
+    <color name="text_gray99">#999999</color>
+
     <color name="green_round">#5BC4A4</color>
     <color name="red_round">#F97070</color>
     <color name="gray_round">#D6D6D6</color>
@@ -63,5 +63,9 @@
     <string name="all_time">累计用时</string>
     <string name="has_take_part_line">我跑过的线路</string>
     <string name="chek_all_line">查看全部路线</string>
+    <string name="loc_gps_accuracy_unknown">无信号，无法进行数据记录</string>
+    <string name="loc_gps_accuracy_bad">信号糟糕，数据准确度低</string>
+    <string name="loc_gps_accuracy_mid">GPS信号质量中等</string>
+    <string name="loc_gps_accuracy_good">GPS信号质量好</string>
     <!---->
 </resources>