Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into yxb_dev

姚旭斌
2 parents b3ee985a 0c319a2d
Showing 9 changed files with 20 additions and 8 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/api/Consult.java
app/src/main/java/com/shunzhi/parent/api/ReportApi.java
app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
app/src/main/java/com/shunzhi/parent/model/report/ReportDetialModel.java
app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
@@ -35,6 +35,6 @@ public interface Consult {
     @FormUrlEncoded
     @POST("RoleLogin/GetToken")
-    Observable<String> loginVote(@Field("username") String username, @Field("password") String password);
+    Observable<String> loginVote(@Field("type")String type,@Field("username") String username, @Field("password") String password);
 }
@@ -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<JsonObject> getSheet(@Field("deviceId") String deviceId);
 }
@@ -50,7 +50,7 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
     @Override
     public Observable<String> loginVote(String phoneNum, String password) {
         return RetrofitCreateHelper.getInstance().createStringApi(Consult.class, AppConfig.BASE_URL_VOTE)
-                .loginVote(phoneNum,password).compose(RxHelper.<String>rxSchedulerHelper());
+                .loginVote("1",phoneNum,password).compose(RxHelper.<String>rxSchedulerHelper());
     }
     public static ConsultContract.IConsultModel newInstance() {
@@ -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();
@@ -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;
 /**
@@ -149,6 +149,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
         mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() {
             @Override
             public void accept(String str) throws Exception {
+                Timber.d("88888%s","loginVote="+str.toString());
                 mIView.showVote(position,str);
             }
         }, new Consumer<Throwable>() {
@@ -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;
@@ -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);
@@ -62,7 +62,6 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment&lt;ApplyReplace
             et_carduser.setText(currChildBean.getStudentName());
         }
-
     }
     @SuppressLint("LongLogTag")
	@@ -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	}
	@@ -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() {
	@@ -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();
	@@ -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")