CNLive Android Team / ModulePedometer · Commits

Commit d537810ccc25ab42ad89f871a97caad446ed7fe1

Authored by 杨帅
2 parents 0661b519 16b86181

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

Inline Side-by-side
Showing 10 changed files with 21 additions and 21 deletions
config.gradle
  View file @d537810
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.2.3",
  24 + version: "0.2.4",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
  View file @d537810
... ... @@ -41,7 +41,7 @@ public class RaceNameListView implements MvpView {
41 41 public void initView(){
42 42 fragment.binding.raceBack.setOnClickListener(v -> fragment.getActivity().finish());
43 43 fragment.binding.intoPath.setOnClickListener(v -> StartCollectTraceActivity.newInstance(fragment.getActivity(),fragment.eventId));
44   - fragment.binding.raceTittle.setText("赛事轨迹列表");
  44 + fragment.binding.raceTittle.setText("轨迹列表");
45 45 fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
46 46 fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
47 47 fragment.binding.raceRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @d537810
... ... @@ -40,6 +40,7 @@ import com.baidu.trace.model.SortType;
40 40 import com.cnlive.libs.base.util.StatusBarUtil2;
41 41 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
42 42 import com.cnlive.moudle.pedometer.model.Constant;
  43 +import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
43 44 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
44 45 import com.cnlive.moudle.pedometer.service.KeepLiveService;
45 46 import com.cnlive.moudle.pedometer.service.StepService;
... ... @@ -632,7 +633,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
632 633 @Override
633 634 public void onClick(View view) {
634 635 ARouter.getInstance().build("/web/WebViewColorActivity")
635   - .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
  636 + .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
636 637 .withString("title", "排行榜")
637 638 .navigation(fragment.getActivity());
638 639 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @d537810
... ... @@ -13,6 +13,7 @@ import android.widget.TextView;
13 13  
14 14 import com.alibaba.android.arouter.launcher.ARouter;
15 15 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
  16 +import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
16 17 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
17 18 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
18 19 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
... ... @@ -57,7 +58,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
57 58 myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
58 59 myViewHolder.check_raking.setOnClickListener(v ->
59 60 ARouter.getInstance().build("/web/WebViewColorActivity")
60   - .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
  61 + .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
61 62 .withString("title","总排行榜")
62 63 .navigation(context));
63 64 if (clickListener != null) {
... ...
moudle_pedometer/src/main/res/drawable-hdpi/bg_bg.png 0 → 100644
View file @d537810

3.49 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bg_bg.png 0 → 100644
View file @d537810

5.18 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bg_bg.png 0 → 100644
View file @d537810

10.6 KB
moudle_pedometer/src/main/res/layout/fragment_race_name_list.xml
  View file @d537810
... ... @@ -52,10 +52,7 @@
52 52 <android.support.v7.widget.RecyclerView
53 53 android:id="@+id/race_recy"
54 54 android:layout_width="match_parent"
55   - android:layout_height="match_parent"
56   - android:layout_marginTop="5dp"
57   - android:layout_marginLeft="5dp"
58   - android:layout_marginRight="5dp"/>
  55 + android:layout_height="match_parent"/>
59 56 </com.scwang.smartrefresh.layout.SmartRefreshLayout>
60 57  
61 58 <com.cnlive.strike.ui.widget.UIEmptyView
... ...
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
  View file @d537810
... ... @@ -2,11 +2,12 @@
2 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="wrap_content"
5   - android:layout_margin="5dp"
6 5 android:orientation="vertical"
7 6 android:id="@+id/shoe_ly"
8   - android:background="@color/white"
9   - android:padding="10dp">
  7 + android:layout_marginLeft="5dp"
  8 + android:layout_marginRight="5dp"
  9 + android:background="@drawable/background"
  10 + android:padding="15dp">
10 11  
11 12 <LinearLayout
12 13 android:layout_width="match_parent"
... ... @@ -99,7 +100,7 @@
99 100 <LinearLayout
100 101 android:layout_width="match_parent"
101 102 android:layout_height="wrap_content"
102   - android:layout_marginTop="5dp">
  103 + android:layout_marginTop="10dp">
103 104  
104 105 <ImageView
105 106 android:layout_width="10dp"
... ... @@ -151,9 +152,9 @@
151 152 android:layout_height="wrap_content"
152 153 android:layout_marginLeft="15dp"
153 154 android:background="@drawable/green_raduis_bg"
154   - android:paddingLeft="10dp"
  155 + android:paddingLeft="12dp"
155 156 android:paddingTop="7dp"
156   - android:paddingRight="10dp"
  157 + android:paddingRight="12dp"
157 158 android:paddingBottom="7dp"
158 159 android:text="@string/delect"
159 160 android:textColor="#36C28D"
... ...
moudle_pedometer/src/main/res/layout/item_record.xml
  View file @d537810
... ... @@ -3,15 +3,14 @@
3 3 android:id="@+id/item_ly"
4 4 android:layout_width="match_parent"
5 5 android:layout_height="wrap_content"
6   - android:layout_margin="5dp"
7   - android:background="@color/white"
  6 + android:background="@drawable/bg_bg"
8 7 android:orientation="vertical">
9 8  
10 9 <LinearLayout
11 10 android:layout_width="match_parent"
12 11 android:layout_height="wrap_content"
13 12 android:orientation="vertical"
14   - android:padding="10dp">
  13 + android:padding="15dp">
15 14  
16 15 <TextView
17 16 android:id="@+id/line_name"
... ... @@ -80,9 +79,9 @@
80 79 android:layout_height="wrap_content"
81 80 android:layout_alignParentRight="true"
82 81 android:background="@drawable/green_raduis_bg"
83   - android:paddingLeft="10dp"
  82 + android:paddingLeft="12dp"
84 83 android:paddingTop="7dp"
85   - android:paddingRight="10dp"
  84 + android:paddingRight="12dp"
86 85 android:paddingBottom="7dp"
87 86 android:text="轨迹列表"
88 87 android:textColor="#36C28D"
... ... @@ -95,12 +94,13 @@
95 94 android:layout_marginRight="10dp"
96 95 android:layout_toLeftOf="@id/path_list"
97 96 android:background="@drawable/green_raduis_bg"
98   - android:paddingLeft="10dp"
  97 + android:paddingLeft="12dp"
99 98 android:paddingTop="7dp"
100   - android:paddingRight="10dp"
  99 + android:paddingRight="12dp"
101 100 android:paddingBottom="7dp"
102 101 android:text="添加轨迹"
103 102 android:textColor="#36C28D"
  103 + android:layout_marginBottom="5dp"
104 104 android:textSize="12sp" />
105 105  
106 106 </RelativeLayout>
... ...