Merge remote-tracking branch 'origin/master'

杨帅
2 parents 0fe13086 b2aba0c1
Showing 7 changed files with 22 additions and 44 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RegistrationInfoActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
@@ -38,11 +38,11 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
     public void initView() {
         fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
-            goLineDetail();
+            fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("填写报名信息");
         fragment.binding.commitInfo.setOnClickListener(v -> fragment.commitInfo());
-        fragment.binding.toLineDetail.setOnClickListener(v -> goLineDetail());
+        fragment.binding.toLineDetail.setOnClickListener(v -> fragment.getActivity().finish());
         sex = new BottomMenuDialog.Builder(fragment.getActivity())
                 .addMenu("男", new View.OnClickListener() {
                     @Override
@@ -101,12 +101,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
         EventBus.getDefault().post(new MessageEvent(Constant.REGISTRATION_SUCCESS, ""));
     }
-    private void goLineDetail() {
-        Intent intent = new Intent(fragment.getActivity(), RunRaceDetailActivity.class);
-        intent.putExtra("isRegisterResult", true);
-        fragment.getActivity().setResult(1002, intent);
-        fragment.getActivity().finish();
-    }
     @Override
     public void onDateSet(TimePickerDialog timePickerView, long millseconds) {
@@ -372,7 +372,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             public void onClick(View view) {
                 //立即报名
                 if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
-                    RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
+                    RegistrationInfoActivity.newInstance(fragment.getActivity());
                 } else {
                     startStepService(getContext());
                 }
@@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        CollUserStepEntityDao.createTable(db, ifNotExists);
         UserStepEntityDao.createTable(db, ifNotExists);
+        CollUserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        CollUserStepEntityDao.dropTable(db, ifExists);
         UserStepEntityDao.dropTable(db, ifExists);
+        CollUserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(UserStepEntityDao.class);
+        registerDaoClass(CollUserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,11 +8,11 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
-import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
-    private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
+    private final DaoConfig collUserStepEntityDaoConfig;
-    private final CollUserStepEntityDao collUserStepEntityDao;
     private final UserStepEntityDao userStepEntityDao;
+    private final CollUserStepEntityDao collUserStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
-        collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
-        collUserStepEntityDaoConfig.initIdentityScope(type);
-
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
+        collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
+        collUserStepEntityDaoConfig.initIdentityScope(type);
+
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
-        registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(UserStepEntity.class, userStepEntityDao);
+        registerDao(CollUserStepEntity.class, collUserStepEntityDao);
     }
     public void clear() {
-        collUserStepEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
-    }
-
-    public CollUserStepEntityDao getCollUserStepEntityDao() {
-        return collUserStepEntityDao;
+        collUserStepEntityDaoConfig.clearIdentityScope();
     }
     public UserStepEntityDao getUserStepEntityDao() {
         return userStepEntityDao;
     }
+    public CollUserStepEntityDao getCollUserStepEntityDao() {
+        return collUserStepEntityDao;
+    }
+
 }
@@ -16,9 +16,9 @@ import com.example.moudle_pedometer.R;
  */
 public class RegistrationInfoActivity extends AppCompatActivity {
-    public static void newInstance(Activity context,int resultCode){
+    public static void newInstance(Activity context){
         Intent intent = new Intent(context,RegistrationInfoActivity.class);
-        context.startActivityForResult(intent,resultCode);
+        context.startActivity(intent);
     }
     @Override
@@ -76,14 +76,6 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     }
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == 1002) {
-
-        }
-    }
-
-    @Override
     public void onBackPressed() {
         super.onBackPressed();
         if (getCurrentFragment()!=null) {
@@ -38,8 +38,6 @@ import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRegistrationInfoBinding;
 import com.jzxiang.pickerview.TimePickerDialog;
-import java.util.ArrayList;
-import java.util.List;
 /**
  * Created by hanyayun 019/05/29.
@@ -48,7 +46,6 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     public TimePickerDialog pickerDialog;
-    private final String TAG = "RegistrationInfo";
     public static RegistrationInfoFragment newInstance() {
         RegistrationInfoFragment fragment = new RegistrationInfoFragment();
@@ -67,10 +64,6 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     }
     public void commitInfo() {
-
-//        getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10514343", "15210479774",
-//                binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
-//                binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
         addMonitorToFence(1);
     }
@@ -143,7 +136,6 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                 } else {
                     QMUITipDialogUtil.dismessDialog();
                 }
-
             }
             @Override