分享图片大小修改2

韩亚云
2 parents f23ed0f6 79c0bb8e
Showing 7 changed files with 32 additions and 19 deletions
.idea/gradle.xml
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
@@ -3,6 +3,9 @@
   <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">
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.3.5",
+            version: "0.3.7",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -281,7 +281,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) {
             fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"));
         }
-
+        //设置活动类型
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())){
+            fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType());
+        }
         //设置路线介绍的图片
         if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
@@ -289,6 +292,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
         }
+        //设置路线介绍
+        if(!TextUtils.isEmpty(runRaceDetailInfo.getDescription())){
+            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+        }
         //添加轨迹按钮点击事件
         fragment.binding.rlScrollViewAddTrace.setOnClickListener(new View.OnClickListener() {
@@ -94,8 +94,6 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         this.position = position;
         this.eventShoeLinesBean = eventShoeLinesBean;
         allMapOverlays = new ArrayList<>();
-        //设置滑动卡片
-//        fragment.binding.slidingLayout.set
         //添加起点
         CollectPoint startPoint = null;
         List<CollectPoint> resultCollectPoints = null;
@@ -51,14 +51,6 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     public CollKeepLiveService() {
     }
-    public static CollKeepLiveService getInstance() {
-        if (instance == null) {
-            instance = new CollKeepLiveService();
-            return instance;
-        } else {
-            return instance;
-        }
-    }
     @Override
     public void onCreate() {
@@ -139,10 +139,6 @@ public class RunMainFragmentView implements MvpView {
                 long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
                 StepUtil.setQueryTraceTime(getContext(), CommonInfo.getUserId(getContext()), startTime, endTime, runRaceDetailInfo.getEntityName());
             }
-            //设置重要点
-            if (TextUtils.isEmpty(userStepEntity.getImportPoint())) {
-                StepUtil.setImportPoints(getContext(), CommonInfo.getUserId(getContext()), runRaceDetailInfo.getLatLongitude());
-            }
             //设置开始时间和赛事id
             if (TextUtils.isEmpty(userStepEntity.getStreetId())) {
                 StepUtil.setStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getContext()));
@@ -12,6 +12,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunMainFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
@@ -32,6 +33,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 public class RunMainFragment extends QMUIFragment<RunMainFragmentView, RunMainFragmentPresenter, FragmentRunMainBinding> {
@@ -67,9 +69,24 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
                     StepUtil.updateStepData(getActivity(), userStepEntity);
                     //获取数据库中的重要点
                     String importStr = userStepEntity.getImportPoint();
-                    if (TextUtils.isEmpty(runRaceDetailInfo.getLatLongitude())) {
-                        //设置重要点
-                        StepUtil.setImportPoints(getActivity(), CommonInfo.getUserId(getActivity()), GsonUtil.GsonString(runRaceDetailInfo.getLatLongitude()));
+                    //如果为空
+                    if (TextUtils.isEmpty(userStepEntity.getImportPoint())) {
+                        if (!TextUtils.isEmpty(runRaceDetailInfo.getLatLongitude())) {
+                            List<CollectPoint> collectPoints = GsonUtil.jsonToList(runRaceDetailInfo.getLatLongitude(), CollectPoint.class);
+                            List<LatLng> importLatLngs = new ArrayList<>();
+                            if (null != collectPoints && collectPoints.size() > 0) {
+                                for (CollectPoint collectPoint : collectPoints) {
+                                    LatLng latLng = new LatLng(collectPoint.getLatitude(), collectPoint.getLongitude());
+                                    if (null != latLng) {
+                                        importLatLngs.add(latLng);
+                                    }
+                                }
+                            }
+                            if (null != importLatLngs && importLatLngs.size() > 0) {
+                                //设置重要点
+                                StepUtil.setImportPoints(getActivity(), CommonInfo.getUserId(getActivity()), GsonUtil.GsonString(importLatLngs));
+                            }
+                        }
                     }
                 }