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

韩亚云
2 parents d553e41b f77fa77d
Showing 5 changed files with 60 additions and 18 deletions
config.gradle
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.9",
+            version: "0.3.1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -116,30 +116,47 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
-            android:launchMode="singleTask" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <!--全部成绩详情页-->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <!--进行中的活动-->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.OnGoingActivity"
-            android:launchMode="singleTask" />
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <!--轨迹列表详情页-->
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
         <!--************************************************路径工具**********************************************-->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
@@ -181,11 +198,26 @@
             </intent-filter>
         </receiver>
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>
 \ No newline at end of file
@@ -138,10 +138,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
                 if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
-                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.GONE);
-
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.INVISIBLE);
                 }
                 if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.VISIBLE);
                     if (isChangeMapState) {
                         if (null != baiduMap) {
                             if (null != baiduMap.getMapStatus()) {
@@ -218,6 +218,15 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+                if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.INVISIBLE);
+                }
+                if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.VISIBLE);
+                }
+                if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.VISIBLE);
+                }
                 if (previousState == SlidingUpPanelLayout.PanelState.ANCHORED && newState == SlidingUpPanelLayout.PanelState.DRAGGING) {
                     if (fragment.binding.flTop.getVisibility() != View.VISIBLE) {
                         QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
@@ -970,7 +979,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //todo 防止停止后,再次开始,无法获取到赛道的轨迹
         if (runRaceDetailInfo != null) {
-            if (runRaceDetailInfo.getFenceId() != null) {
+            if (runRaceDetailInfo.getFenceId() != null && !TextUtils.isEmpty(runRaceDetailInfo.getFenceId())) {
                 //设置围栏ID
                 CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
             }
@@ -1128,7 +1137,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
             //没有获取到轨迹
-            if (0 == initZoom && null != firstLatLng) {
+            if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
                 builder.target(firstLatLng).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             }
@@ -28,6 +28,7 @@
                     android:orientation="vertical">
                     <ImageView
+                        android:id="@+id/ivSlideIcon"
                         android:layout_width="13dp"
                         android:layout_height="7dp"
                         android:layout_gravity="center_horizontal"