From 6bcfb14ffc89bb7d32340f7abb53488474ccbf53 Mon Sep 17 00:00:00 2001 From: taohd <2821744554@qq.com> Date: Fri, 11 May 2018 16:48:14 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/api/Consult.java | 2 +- app/src/main/java/com/shunzhi/parent/api/ReportApi.java | 3 +++ app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java | 2 +- app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java | 2 +- app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java | 3 --- app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 1 + app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 3 +++ app/src/main/java/com/shunzhi/parent/ui/MainActivity.java | 11 ++++++++++- app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java | 1 - 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/api/Consult.java b/app/src/main/java/com/shunzhi/parent/api/Consult.java index 81101e2..9ab6b4f 100644 --- a/app/src/main/java/com/shunzhi/parent/api/Consult.java +++ b/app/src/main/java/com/shunzhi/parent/api/Consult.java @@ -35,6 +35,6 @@ public interface Consult { @FormUrlEncoded @POST("RoleLogin/GetToken") - Observable loginVote(@Field("username") String username, @Field("password") String password); + Observable loginVote(@Field("type")String type,@Field("username") String username, @Field("password") String password); } diff --git a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java index 970a918..493081d 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ReportApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ReportApi.java @@ -30,4 +30,7 @@ public interface ReportApi { @Field("objectId") String classId, @Field("startDate") String startDate, @Field("endDate") String endDate); + @FormUrlEncoded + @POST("api/XiaoAnBanPai/GetSheet") + Observable getSheet(@Field("deviceId") String deviceId); } diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java index 80793e7..5204e85 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java @@ -50,7 +50,7 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM @Override public Observable loginVote(String phoneNum, String password) { return RetrofitCreateHelper.getInstance().createStringApi(Consult.class, AppConfig.BASE_URL_VOTE) - .loginVote(phoneNum,password).compose(RxHelper.rxSchedulerHelper()); + .loginVote("1",phoneNum,password).compose(RxHelper.rxSchedulerHelper()); } public static ConsultContract.IConsultModel newInstance() { diff --git a/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java index ad44813..6920dd3 100644 --- a/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java @@ -13,7 +13,7 @@ import io.reactivex.Observable; * Created by Administrator on 2018/4/8 0008. */ -public class ReportDetialModel implements ReportDetialContract.IReportDetialModel { +public class ReportDetialModel implements ReportDetialContract.IReportDetialModel { public static ReportDetialModel newInstance(){ return new ReportDetialModel(); diff --git a/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java index c7e519a..69a4393 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java @@ -4,12 +4,9 @@ import android.annotation.SuppressLint; import android.util.Log; import com.google.gson.JsonObject; -import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; import com.shunzhi.parent.model.apply.ApplyReplaceCardModel; -import org.json.JSONObject; - import io.reactivex.functions.Consumer; /** diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index 8002fb9..8127dde 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -149,6 +149,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer() { @Override public void accept(String str) throws Exception { + Timber.d("88888%s","loginVote="+str.toString()); mIView.showVote(position,str); } }, new Consumer() { diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java index 395e2dd..a943ac1 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java @@ -4,11 +4,14 @@ import android.text.TextUtils; import android.util.Log; import com.google.gson.JsonObject; +import com.share.mvpsdk.RxManager; import com.share.mvpsdk.helper.RetrofitCreateHelper; +import com.share.mvpsdk.helper.RxHelper; import com.share.mvpsdk.utils.OkHttpExceptionUtil; import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.AppContext; +import com.shunzhi.parent.api.ReportApi; import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.bean.NIMLoginResultBean; import com.shunzhi.parent.bean.UserInfo; diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java index 588029b..74012fc 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java @@ -7,13 +7,20 @@ import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.util.Log; import android.view.MenuItem; +import com.google.gson.JsonObject; +import com.share.mvpsdk.RxManager; import com.share.mvpsdk.base.activity.BaseCompatActivity; import com.share.mvpsdk.helper.BottomNavigationViewHelper; +import com.share.mvpsdk.helper.RetrofitCreateHelper; +import com.share.mvpsdk.helper.RxHelper; import com.share.mvpsdk.utils.PermissionUtils; +import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; +import com.shunzhi.parent.api.ReportApi; import com.shunzhi.parent.bean.message.PHMessage; import com.shunzhi.parent.bean.message.PHMessageDao; import com.shunzhi.parent.manager.MessageManager; @@ -22,6 +29,9 @@ import com.shunzhi.parent.ui.fragment.ConsultFragment; import com.shunzhi.parent.ui.fragment.MineFragment; import com.shunzhi.parent.ui.fragment.ReportFragment; +import io.reactivex.Observable; +import io.reactivex.functions.Consumer; + public class MainActivity extends BaseCompatActivity implements PermissionUtils.PermissionGrant { BottomNavigationView bottom_navigationView; @@ -48,7 +58,6 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. @Override protected void initView(Bundle savedInstanceState) { - PermissionUtils.requestMultiPermissions(this, this); bottom_navigationView = findViewById(R.id.bottom_navigationView); BottomNavigationViewHelper.disableShiftMode(bottom_navigationView); diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java index 0306fd0..4f6f0a1 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java @@ -62,7 +62,6 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment