陶汉栋 / ParentWork

Download as
Browse Code »

Commit 3d8461381d8d93c7573b47b6c7212f9952b9c8a4

Authored by 姚旭斌
2 parents b3ee985a 0c319a2d
Exists in yxb_dev and in 1 other branch developer

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

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