CNLive Android Team / ModulePedometer · Commits

Commit 5cf164789eb87badc48b1100fb25190824341dbc

Authored by 杨帅
2 parents e70e8843 2a122520

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

Inline Side-by-side
Showing 4 changed files with 51 additions and 17 deletions
config.gradle
  View file @5cf1647
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.2.4",
  24 + version: "0.2.5",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/AndroidManifest.xml
  View file @5cf1647
... ... @@ -62,15 +62,13 @@
62 62 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" />
63 63 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity" />
64 64 <activity
65   - android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"
66   - android:process=":step" />
  65 + android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"/>
67 66  
68 67 <service
69 68 android:name="com.cnlive.moudle.pedometer.service.StepService"
70 69 android:enabled="true"
71 70 android:exported="true"
72 71 android:priority="1000"
73   - android:process=":step"
74 72 android:stopWithTask="false">
75 73 <intent-filter>
76 74  
... ... @@ -119,18 +117,16 @@
119 117  
120 118 <activity
121 119 android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity"
122   - android:launchMode="singleTask" />
123   -
  120 + android:launchMode="singleTask"/>
124 121 <activity
125 122 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
126   - android:launchMode="singleTask" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
127   - <!--android:process=":step"-->
  123 + android:launchMode="singleTask"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
128 124 <activity
129 125 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
130   - android:launchMode="singleTask" />
  126 + android:launchMode="singleTask"/>
131 127 <activity
132 128 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
133   - android:launchMode="singleTask" />
  129 + android:launchMode="singleTask"/>
134 130 <activity
135 131 android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
136 132 android:launchMode="singleTask" />
... ... @@ -183,11 +179,16 @@
183 179 </intent-filter>
184 180 </receiver>
185 181  
186   - <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity" />
187   - <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
188   - <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity" />
189   - <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity" />
190   - <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity" />
  182 + <activity
  183 + android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"/>
  184 + <activity
  185 + android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
  186 + <activity
  187 + android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity"/>
  188 + <activity
  189 + android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity"/>
  190 + <activity
  191 + android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity"/>
191 192 </application>
192 193  
193 194 </manifest>
194 195 \ No newline at end of file
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RegistrationInfoPresenter.java
  View file @5cf1647
... ... @@ -29,8 +29,16 @@ public class RegistrationInfoPresenter extends MvpBasePresenter&lt;RegistrationInfo
29 29 map.put("eventId", eventId);
30 30 map.put("sid", sid);
31 31 map.put("mobile", mobile);
32   - map.put("sex", "");
33   - map.put("birthday", "");
  32 + if(sex.equals("女")){
  33 + sex = "1";
  34 + }else if (sex.equals("男")){
  35 + sex = "0";
  36 + }
  37 + map.put("sex", sex);
  38 + if(birthday.contains("年")) birthday = birthday.replace("年","-");
  39 + if(birthday.contains("月")) birthday = birthday.replace("月","-");
  40 + if(birthday.contains("日")) birthday = birthday.replace("日","");
  41 + map.put("birthday", birthday);
34 42 Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo>() {
35 43 @Override
36 44 public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
  View file @5cf1647
... ... @@ -10,9 +10,15 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
10 10 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
11 11 import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter;
12 12 import com.cnlive.moudle.pedometer.frame.view.RunLineView;
  13 +import com.cnlive.moudle.pedometer.model.Constant;
  14 +import com.cnlive.moudle.pedometer.model.MessageEvent;
13 15 import com.example.moudle_pedometer.R;
14 16 import com.example.moudle_pedometer.databinding.FragmentRunLineBinding;
15 17  
  18 +import org.greenrobot.eventbus.EventBus;
  19 +import org.greenrobot.eventbus.Subscribe;
  20 +import org.greenrobot.eventbus.ThreadMode;
  21 +
16 22  
17 23 /**
18 24 * Created by hanyayun 019/06/03.
... ... @@ -35,6 +41,7 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
35 41 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
36 42 super.onViewCreated(view, savedInstanceState);
37 43 if(getMvpView() != null)getMvpView().initView();
  44 + EventBus.getDefault().register(this);
38 45 getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
39 46  
40 47 binding.refreshLayout.setOnRefreshListener(v ->{
... ... @@ -46,4 +53,22 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
46 53 getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
47 54 });
48 55 }
  56 +
  57 + @Override
  58 + public void onDestroy() {
  59 + super.onDestroy();
  60 + if (EventBus.getDefault().isRegistered(this)) {
  61 + EventBus.getDefault().unregister(this);
  62 + }
  63 + }
  64 +
  65 + @Subscribe(threadMode = ThreadMode.MAIN)
  66 + public void Event(MessageEvent messageEvent) {
  67 + if (messageEvent.getMessageType() == Constant.REGISTRATION_SUCCESS) {
  68 + if (getMvpView() != null) {
  69 + currentPage = 1;
  70 + getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
  71 + }
  72 + }
  73 + }
49 74 }
... ...