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

杨帅
2 parents e70e8843 2a122520
Showing 4 changed files with 51 additions and 17 deletions
config.gradle
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RegistrationInfoPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.2.4",
+            version: "0.2.5",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -62,15 +62,13 @@
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity" />
         <activity
-            android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"
-            android:process=":step" />
+            android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"/>
         <service
             android:name="com.cnlive.moudle.pedometer.service.StepService"
             android:enabled="true"
             android:exported="true"
             android:priority="1000"
-            android:process=":step"
             android:stopWithTask="false">
             <intent-filter>
@@ -119,18 +117,16 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity"
-            android:launchMode="singleTask" />
-
+            android:launchMode="singleTask"/>
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
-            android:launchMode="singleTask" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
-        <!--android:process=":step"-->
+            android:launchMode="singleTask"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"/>
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"/>
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
             android:launchMode="singleTask" />
@@ -183,11 +179,16 @@
             </intent-filter>
         </receiver>
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity" />
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"/>
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity"/>
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity"/>
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity"/>
     </application>
 </manifest>
 \ No newline at end of file
@@ -29,8 +29,16 @@ public class RegistrationInfoPresenter extends MvpBasePresenter&lt;RegistrationInfo
         map.put("eventId", eventId);
         map.put("sid", sid);
         map.put("mobile", mobile);
-        map.put("sex", "");
-        map.put("birthday", "");
+        if(sex.equals("女")){
+            sex = "1";
+        }else if (sex.equals("男")){
+            sex = "0";
+        }
+        map.put("sex", sex);
+        if(birthday.contains("年")) birthday = birthday.replace("年","-");
+        if(birthday.contains("月")) birthday = birthday.replace("月","-");
+        if(birthday.contains("日")) birthday = birthday.replace("日","");
+        map.put("birthday", birthday);
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
@@ -10,9 +10,15 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunLineView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunLineBinding;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 /**
  * Created by hanyayun 019/06/03.
@@ -35,6 +41,7 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if(getMvpView() != null)getMvpView().initView();
+        EventBus.getDefault().register(this);
         getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(v ->{
@@ -46,4 +53,22 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
             getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         });
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void Event(MessageEvent messageEvent) {
+        if (messageEvent.getMessageType() == Constant.REGISTRATION_SUCCESS) {
+            if (getMvpView() != null) {
+                currentPage = 1;
+                getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
+            }
+        }
+    }
 }