CNLive Android Team / ModulePedometer · Commits

Commit fe6d36690f1424a19ad825ea22412c5682215089

Authored by hanyayun
1 parent 9eddc203

ceshi

Inline Side-by-side
Showing 7 changed files with 16 additions and 7 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
  View file @fe6d366
... ... @@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
  9 +import com.alibaba.android.arouter.launcher.ARouter;
9 10 import com.baidu.mapapi.model.LatLng;
10 11 import com.baidu.mapapi.search.geocode.GeoCodeResult;
11 12 import com.baidu.mapapi.search.geocode.GeoCoder;
... ... @@ -50,7 +51,14 @@ public class MainActivity extends AppCompatActivity {
50 51 findViewById(R.id.tool2).setOnClickListener(new View.OnClickListener() {
51 52 @Override
52 53 public void onClick(View v) {
53   - SelfRecordActivity.newInstance(MainActivity.this, uid, null, null, null);
  54 + ARouter.getInstance().build("/moudle_pedometer/RunLineActivity")
  55 + .withString("userId","10514343")
  56 + .withString("userIcon","")
  57 + .withString("userName","")
  58 + .withString("userPhone","")
  59 + .navigation(MainActivity.this);
  60 +
  61 +// SelfRecordActivity.newInstance(MainActivity.this, uid, null, null, null);
54 62 }
55 63 });
56 64  
... ...
config.gradle
  View file @fe6d366
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.8.0",
  24 + version: "0.8.1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
  View file @fe6d366
... ... @@ -72,7 +72,7 @@ public class MyRecordView implements MvpView {
72 72 }
73 73 if (fragment.currentPage > 1) {
74 74 list.addAll(myRecordInfoBaseInfo.getData().getList());
75   - adapter.notifyDataSetChanged();
  75 + if(adapter != null)adapter.notifyDataSetChanged();
76 76 }
77 77 fragment.binding.refreshLayout.finishRefresh();
78 78 fragment.binding.refreshLayout.finishLoadMore();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
  View file @fe6d366
... ... @@ -74,7 +74,7 @@ public class RunLineView implements MvpView {
74 74 }
75 75 if(fragment.currentPage > 1){
76 76 list.addAll(runLineInfoBaseInfo.getData().getList());
77   - adapter.notifyDataSetChanged();
  77 + if(adapter != null)adapter.notifyDataSetChanged();
78 78 }
79 79 fragment.binding.refreshLayout.finishRefresh();
80 80 fragment.binding.refreshLayout.finishLoadMore();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @fe6d366
... ... @@ -5,17 +5,18 @@ import android.content.Intent;
5 5 import android.support.v7.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7  
  8 +import com.alibaba.android.arouter.facade.annotation.Route;
8 9 import com.cnlive.libs.base.util.StatusBarUtil;
9 10 import com.cnlive.libs.base.util.StatusBarUtil2;
10 11 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
11 12 import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment;
12   -import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
13 13 import com.example.moudle_pedometer.R;
14 14  
15 15 /**
16 16 * 约跑线路
17 17 * Created by hanyayun 019/06/03.
18 18 */
  19 +@Route(path = "/moudle_pedometer/RunLineActivity")
19 20 public class RunLineActivity extends AppCompatActivity {
20 21  
21 22 public static void newInstance(Activity context, String userId, String userIcon, String userName,String userPhone){
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
  View file @fe6d366
... ... @@ -197,7 +197,7 @@ public class RunMainFragment extends QMUIFragment<RunMainFragmentView, RunMainFr
197 197 mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
198 198 }
199 199 if (tipDialog != null) {
200   - tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
  200 + tipDialog.setTipMsg("您已偏离路径轨迹\n请您及时回归路径!");
201 201 tipDialog.show();
202 202 }
203 203 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
  View file @fe6d366
... ... @@ -200,7 +200,7 @@ public class RunningMapFragment extends QMUIFragment<RunningMapFragmentView, Run
200 200 mVibrator.vibrate(new long[]{Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME, Constant.VIBRATOR_DELAY_TIME, Constant.VIBRATOR_RUN_TIME}, Constant.VIBRATOR_REPEAT_TIME);
201 201 }
202 202 if (tipDialog != null) {
203   - tipDialog.setTipMsg("您已偏离路径轨迹\n请您计时回归路径!");
  203 + tipDialog.setTipMsg("您已偏离路径轨迹\n请您及时回归路径!");
204 204 tipDialog.show();
205 205 }
206 206 }
... ...