Commit 6bcfb14ffc89bb7d32340f7abb53488474ccbf53
1 parent
5b908d62
Exists in
yxb_dev
and in
1 other branch
no message
Showing
9 changed files
with
20 additions
and
8 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/api/Consult.java
| @@ -35,6 +35,6 @@ public interface Consult { | @@ -35,6 +35,6 @@ public interface Consult { | ||
| 35 | 35 | ||
| 36 | @FormUrlEncoded | 36 | @FormUrlEncoded |
| 37 | @POST("RoleLogin/GetToken") | 37 | @POST("RoleLogin/GetToken") |
| 38 | - Observable<String> loginVote(@Field("username") String username, @Field("password") String password); | 38 | + Observable<String> loginVote(@Field("type")String type,@Field("username") String username, @Field("password") String password); |
| 39 | 39 | ||
| 40 | } | 40 | } |
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
| @@ -30,4 +30,7 @@ public interface ReportApi { | @@ -30,4 +30,7 @@ public interface ReportApi { | ||
| 30 | @Field("objectId") String classId, | 30 | @Field("objectId") String classId, |
| 31 | @Field("startDate") String startDate, | 31 | @Field("startDate") String startDate, |
| 32 | @Field("endDate") String endDate); | 32 | @Field("endDate") String endDate); |
| 33 | + @FormUrlEncoded | ||
| 34 | + @POST("api/XiaoAnBanPai/GetSheet") | ||
| 35 | + Observable<JsonObject> getSheet(@Field("deviceId") String deviceId); | ||
| 33 | } | 36 | } |
app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
| @@ -50,7 +50,7 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM | @@ -50,7 +50,7 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM | ||
| 50 | @Override | 50 | @Override |
| 51 | public Observable<String> loginVote(String phoneNum, String password) { | 51 | public Observable<String> loginVote(String phoneNum, String password) { |
| 52 | return RetrofitCreateHelper.getInstance().createStringApi(Consult.class, AppConfig.BASE_URL_VOTE) | 52 | return RetrofitCreateHelper.getInstance().createStringApi(Consult.class, AppConfig.BASE_URL_VOTE) |
| 53 | - .loginVote(phoneNum,password).compose(RxHelper.<String>rxSchedulerHelper()); | 53 | + .loginVote("1",phoneNum,password).compose(RxHelper.<String>rxSchedulerHelper()); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | public static ConsultContract.IConsultModel newInstance() { | 56 | public static ConsultContract.IConsultModel newInstance() { |
app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java
| @@ -13,7 +13,7 @@ import io.reactivex.Observable; | @@ -13,7 +13,7 @@ import io.reactivex.Observable; | ||
| 13 | * Created by Administrator on 2018/4/8 0008. | 13 | * Created by Administrator on 2018/4/8 0008. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | -public class ReportDetialModel implements ReportDetialContract.IReportDetialModel { | 16 | +public class ReportDetialModel implements ReportDetialContract.IReportDetialModel { |
| 17 | 17 | ||
| 18 | public static ReportDetialModel newInstance(){ | 18 | public static ReportDetialModel newInstance(){ |
| 19 | return new ReportDetialModel(); | 19 | return new ReportDetialModel(); |
app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java
| @@ -4,12 +4,9 @@ import android.annotation.SuppressLint; | @@ -4,12 +4,9 @@ import android.annotation.SuppressLint; | ||
| 4 | import android.util.Log; | 4 | import android.util.Log; |
| 5 | 5 | ||
| 6 | import com.google.gson.JsonObject; | 6 | import com.google.gson.JsonObject; |
| 7 | -import com.share.mvpsdk.utils.ToastUtils; | ||
| 8 | import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; | 7 | import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; |
| 9 | import com.shunzhi.parent.model.apply.ApplyReplaceCardModel; | 8 | import com.shunzhi.parent.model.apply.ApplyReplaceCardModel; |
| 10 | 9 | ||
| 11 | -import org.json.JSONObject; | ||
| 12 | - | ||
| 13 | import io.reactivex.functions.Consumer; | 10 | import io.reactivex.functions.Consumer; |
| 14 | 11 | ||
| 15 | /** | 12 | /** |
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
| @@ -149,6 +149,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | @@ -149,6 +149,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | ||
| 149 | mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() { | 149 | mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() { |
| 150 | @Override | 150 | @Override |
| 151 | public void accept(String str) throws Exception { | 151 | public void accept(String str) throws Exception { |
| 152 | + Timber.d("88888%s","loginVote="+str.toString()); | ||
| 152 | mIView.showVote(position,str); | 153 | mIView.showVote(position,str); |
| 153 | } | 154 | } |
| 154 | }, new Consumer<Throwable>() { | 155 | }, new Consumer<Throwable>() { |
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
| @@ -4,11 +4,14 @@ import android.text.TextUtils; | @@ -4,11 +4,14 @@ import android.text.TextUtils; | ||
| 4 | import android.util.Log; | 4 | import android.util.Log; |
| 5 | 5 | ||
| 6 | import com.google.gson.JsonObject; | 6 | import com.google.gson.JsonObject; |
| 7 | +import com.share.mvpsdk.RxManager; | ||
| 7 | import com.share.mvpsdk.helper.RetrofitCreateHelper; | 8 | import com.share.mvpsdk.helper.RetrofitCreateHelper; |
| 9 | +import com.share.mvpsdk.helper.RxHelper; | ||
| 8 | import com.share.mvpsdk.utils.OkHttpExceptionUtil; | 10 | import com.share.mvpsdk.utils.OkHttpExceptionUtil; |
| 9 | import com.share.mvpsdk.utils.ToastUtils; | 11 | import com.share.mvpsdk.utils.ToastUtils; |
| 10 | import com.shunzhi.parent.AppConfig; | 12 | import com.shunzhi.parent.AppConfig; |
| 11 | import com.shunzhi.parent.AppContext; | 13 | import com.shunzhi.parent.AppContext; |
| 14 | +import com.shunzhi.parent.api.ReportApi; | ||
| 12 | import com.shunzhi.parent.bean.CurrentBean; | 15 | import com.shunzhi.parent.bean.CurrentBean; |
| 13 | import com.shunzhi.parent.bean.NIMLoginResultBean; | 16 | import com.shunzhi.parent.bean.NIMLoginResultBean; |
| 14 | import com.shunzhi.parent.bean.UserInfo; | 17 | import com.shunzhi.parent.bean.UserInfo; |
app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
| @@ -7,13 +7,20 @@ import android.support.annotation.NonNull; | @@ -7,13 +7,20 @@ import android.support.annotation.NonNull; | ||
| 7 | import android.support.design.widget.BottomNavigationView; | 7 | import android.support.design.widget.BottomNavigationView; |
| 8 | import android.support.v4.app.Fragment; | 8 | import android.support.v4.app.Fragment; |
| 9 | import android.support.v4.app.FragmentTransaction; | 9 | import android.support.v4.app.FragmentTransaction; |
| 10 | +import android.util.Log; | ||
| 10 | import android.view.MenuItem; | 11 | import android.view.MenuItem; |
| 11 | 12 | ||
| 13 | +import com.google.gson.JsonObject; | ||
| 14 | +import com.share.mvpsdk.RxManager; | ||
| 12 | import com.share.mvpsdk.base.activity.BaseCompatActivity; | 15 | import com.share.mvpsdk.base.activity.BaseCompatActivity; |
| 13 | import com.share.mvpsdk.helper.BottomNavigationViewHelper; | 16 | import com.share.mvpsdk.helper.BottomNavigationViewHelper; |
| 17 | +import com.share.mvpsdk.helper.RetrofitCreateHelper; | ||
| 18 | +import com.share.mvpsdk.helper.RxHelper; | ||
| 14 | import com.share.mvpsdk.utils.PermissionUtils; | 19 | import com.share.mvpsdk.utils.PermissionUtils; |
| 20 | +import com.shunzhi.parent.AppConfig; | ||
| 15 | import com.shunzhi.parent.AppContext; | 21 | import com.shunzhi.parent.AppContext; |
| 16 | import com.shunzhi.parent.R; | 22 | import com.shunzhi.parent.R; |
| 23 | +import com.shunzhi.parent.api.ReportApi; | ||
| 17 | import com.shunzhi.parent.bean.message.PHMessage; | 24 | import com.shunzhi.parent.bean.message.PHMessage; |
| 18 | import com.shunzhi.parent.bean.message.PHMessageDao; | 25 | import com.shunzhi.parent.bean.message.PHMessageDao; |
| 19 | import com.shunzhi.parent.manager.MessageManager; | 26 | import com.shunzhi.parent.manager.MessageManager; |
| @@ -22,6 +29,9 @@ import com.shunzhi.parent.ui.fragment.ConsultFragment; | @@ -22,6 +29,9 @@ import com.shunzhi.parent.ui.fragment.ConsultFragment; | ||
| 22 | import com.shunzhi.parent.ui.fragment.MineFragment; | 29 | import com.shunzhi.parent.ui.fragment.MineFragment; |
| 23 | import com.shunzhi.parent.ui.fragment.ReportFragment; | 30 | import com.shunzhi.parent.ui.fragment.ReportFragment; |
| 24 | 31 | ||
| 32 | +import io.reactivex.Observable; | ||
| 33 | +import io.reactivex.functions.Consumer; | ||
| 34 | + | ||
| 25 | public class MainActivity extends BaseCompatActivity implements PermissionUtils.PermissionGrant { | 35 | public class MainActivity extends BaseCompatActivity implements PermissionUtils.PermissionGrant { |
| 26 | 36 | ||
| 27 | BottomNavigationView bottom_navigationView; | 37 | BottomNavigationView bottom_navigationView; |
| @@ -48,7 +58,6 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. | @@ -48,7 +58,6 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. | ||
| 48 | 58 | ||
| 49 | @Override | 59 | @Override |
| 50 | protected void initView(Bundle savedInstanceState) { | 60 | protected void initView(Bundle savedInstanceState) { |
| 51 | - | ||
| 52 | PermissionUtils.requestMultiPermissions(this, this); | 61 | PermissionUtils.requestMultiPermissions(this, this); |
| 53 | bottom_navigationView = findViewById(R.id.bottom_navigationView); | 62 | bottom_navigationView = findViewById(R.id.bottom_navigationView); |
| 54 | BottomNavigationViewHelper.disableShiftMode(bottom_navigationView); | 63 | BottomNavigationViewHelper.disableShiftMode(bottom_navigationView); |
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
| @@ -62,7 +62,6 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | @@ -62,7 +62,6 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace | ||
| 62 | et_carduser.setText(currChildBean.getStudentName()); | 62 | et_carduser.setText(currChildBean.getStudentName()); |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | - | ||
| 66 | } | 65 | } |
| 67 | 66 | ||
| 68 | @SuppressLint("LongLogTag") | 67 | @SuppressLint("LongLogTag") |