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

杨帅
2 parents 0661b519 16b86181
Showing 10 changed files with 21 additions and 21 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/res/drawable-hdpi/bg_bg.png
moudle_pedometer/src/main/res/drawable-xhdpi/bg_bg.png
moudle_pedometer/src/main/res/drawable-xxhdpi/bg_bg.png
moudle_pedometer/src/main/res/layout/fragment_race_name_list.xml
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
moudle_pedometer/src/main/res/layout/item_record.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.3",
+            version: "0.2.4",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -41,7 +41,7 @@ public class RaceNameListView implements MvpView {
     public void initView(){
         fragment.binding.raceBack.setOnClickListener(v -> fragment.getActivity().finish());
         fragment.binding.intoPath.setOnClickListener(v -> StartCollectTraceActivity.newInstance(fragment.getActivity(),fragment.eventId));
-        fragment.binding.raceTittle.setText("赛事轨迹列表");
+        fragment.binding.raceTittle.setText("轨迹列表");
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.raceRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
@@ -40,6 +40,7 @@ import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.service.StepService;
@@ -632,7 +633,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onClick(View view) {
                 ARouter.getInstance().build("/web/WebViewColorActivity")
-                        .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
+                        .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
                         .withString("title", "排行榜")
                         .navigation(fragment.getActivity());
             }
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
@@ -57,7 +58,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
         myViewHolder.check_raking.setOnClickListener(v ->
                 ARouter.getInstance().build("/web/WebViewColorActivity")
-                        .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
+                        .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
                         .withString("title","总排行榜")
                         .navigation(context));
         if (clickListener != null) {
@@ -52,10 +52,7 @@
            <android.support.v7.widget.RecyclerView
                android:id="@+id/race_recy"
                android:layout_width="match_parent"
-               android:layout_height="match_parent"
-               android:layout_marginTop="5dp"
-               android:layout_marginLeft="5dp"
-               android:layout_marginRight="5dp"/>
+               android:layout_height="match_parent"/>
        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
         <com.cnlive.strike.ui.widget.UIEmptyView
@@ -2,11 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="5dp"
     android:orientation="vertical"
     android:id="@+id/shoe_ly"
-    android:background="@color/white"
-    android:padding="10dp">
+    android:layout_marginLeft="5dp"
+    android:layout_marginRight="5dp"
+    android:background="@drawable/background"
+    android:padding="15dp">
     <LinearLayout
         android:layout_width="match_parent"
@@ -99,7 +100,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp">
+                android:layout_marginTop="10dp">
                 <ImageView
                     android:layout_width="10dp"
@@ -151,9 +152,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
                     android:background="@drawable/green_raduis_bg"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="12dp"
                     android:paddingTop="7dp"
-                    android:paddingRight="10dp"
+                    android:paddingRight="12dp"
                     android:paddingBottom="7dp"
                     android:text="@string/delect"
                     android:textColor="#36C28D"
@@ -3,15 +3,14 @@
     android:id="@+id/item_ly"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="5dp"
-    android:background="@color/white"
+    android:background="@drawable/bg_bg"
     android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="10dp">
+        android:padding="15dp">
         <TextView
             android:id="@+id/line_name"
@@ -80,9 +79,9 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:background="@drawable/green_raduis_bg"
-                android:paddingLeft="10dp"
+                android:paddingLeft="12dp"
                 android:paddingTop="7dp"
-                android:paddingRight="10dp"
+                android:paddingRight="12dp"
                 android:paddingBottom="7dp"
                 android:text="轨迹列表"
                 android:textColor="#36C28D"
@@ -95,12 +94,13 @@
                 android:layout_marginRight="10dp"
                 android:layout_toLeftOf="@id/path_list"
                 android:background="@drawable/green_raduis_bg"
-                android:paddingLeft="10dp"
+                android:paddingLeft="12dp"
                 android:paddingTop="7dp"
-                android:paddingRight="10dp"
+                android:paddingRight="12dp"
                 android:paddingBottom="7dp"
                 android:text="添加轨迹"
                 android:textColor="#36C28D"
+                android:layout_marginBottom="5dp"
                 android:textSize="12sp" />
         </RelativeLayout>