From 774a0595891161857b5a6269c918a1626e96d452 Mon Sep 17 00:00:00 2001 From: wwx <1143403680@qq.com> Date: Wed, 18 Apr 2018 14:28:19 +0800 Subject: [PATCH] no message --- app/libs/processor.jar | Bin 5681 -> 0 bytes app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java | 17 +++++++++++++++++ app/src/main/java/com/shunzhi/parent/bean/apply/ApplyReplaceCardBean.java | 11 +++++++++++ app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java | 12 +++++++++--- app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java | 27 +++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java | 26 ++++++++++++++++++++++++-- app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java | 2 -- app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java | 5 ++++- app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java | 13 ++++++++++++- app/src/main/res/layout/fragment_report.xml | 6 ------ app/src/main/res/layout/fragment_report_detial.xml | 7 +++---- 11 files changed, 107 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java create mode 100644 app/src/main/java/com/shunzhi/parent/bean/apply/ApplyReplaceCardBean.java create mode 100644 app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java diff --git a/app/libs/processor.jar b/app/libs/processor.jar index 8375161..9baa0a0 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java b/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java new file mode 100644 index 0000000..466e4df --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java @@ -0,0 +1,17 @@ +package com.shunzhi.parent.api; + +import com.google.gson.JsonObject; + +import io.reactivex.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +/** + * Created by Administrator on 2018/4/18 0018. + */ + +public interface ApplyReplaceCardApi { + + @GET("/api/OneCard/AddStuCard") + Observable getApplyReplaceCard(@Query("studentId,cardId") int studentId,String cardId); +} diff --git a/app/src/main/java/com/shunzhi/parent/bean/apply/ApplyReplaceCardBean.java b/app/src/main/java/com/shunzhi/parent/bean/apply/ApplyReplaceCardBean.java new file mode 100644 index 0000000..1f1a860 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/apply/ApplyReplaceCardBean.java @@ -0,0 +1,11 @@ +package com.shunzhi.parent.bean.apply; + +/** + * Created by Administrator on 2018/4/18 0018. + */ + +public class ApplyReplaceCardBean { + + public String StudentID; + public String CardID; +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java b/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java index bca4f0f..6dabee1 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java @@ -1,7 +1,12 @@ package com.shunzhi.parent.contract.apply; +import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.IBaseActivity; +import com.share.mvpsdk.base.IBaseModel; +import com.shunzhi.parent.bean.apply.ApplyReplaceCardBean; + +import java.util.List; /** * Created by Administrator on 2018/4/18 0018. @@ -11,12 +16,13 @@ public interface ApplyReplaceCardContract { //IOrderDetailModel,IOrderDetailView abstract class ApplyReplaceCardPreenter extends BasePresenter{ - public abstract void showReplaceCardDetail(); + public abstract void showReplaceCardDetail(int studentId,String cardId); } - - interface IApplyReplaceCardModel { + interface IApplyReplaceCardModel extends IBaseModel { + io.reactivex.Observable getReplaceCardDetailResult(int studentId, String cardId); } interface IApplyReplaceCardView extends IBaseActivity{ + void showReplaceCardDetail(List applyReplaceCardBean); } } diff --git a/app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java b/app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java new file mode 100644 index 0000000..1933f84 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java @@ -0,0 +1,27 @@ +package com.shunzhi.parent.model.apply; + +import com.google.gson.JsonObject; +import com.share.mvpsdk.base.BaseModel; +import com.share.mvpsdk.helper.RetrofitCreateHelper; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.AppContext; +import com.shunzhi.parent.api.ApplyReplaceCardApi; +import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; + +import io.reactivex.Observable; + +/** + * Created by Administrator on 2018/4/18 0018. + */ +//BaseModel implements OrderDetailContract.IOrderDetailModel +public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCardContract.IApplyReplaceCardModel{ + public static ApplyReplaceCardContract.IApplyReplaceCardModel newInstance() { + return new ApplyReplaceCardModel(); + } + + @Override + public Observable getReplaceCardDetailResult(int studentId, String cardId) { + String user_id = AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID); + return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class,AppConfig.BASE_URL).getApplyReplaceCard(studentId,cardId); + } +} 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 ff4ae4d..0e1a7d0 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 @@ -1,20 +1,42 @@ package com.shunzhi.parent.presenter.apply; +import com.google.gson.JsonObject; import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; +import com.shunzhi.parent.model.apply.ApplyReplaceCardModel; + +import io.reactivex.functions.Consumer; /** * Created by Administrator on 2018/4/18 0018. */ -//OrderDetailContract.OrderDetailPreenter public class ApplyReplaceCardPresenter extends ApplyReplaceCardContract.ApplyReplaceCardPreenter { @Override public ApplyReplaceCardContract.IApplyReplaceCardModel getModel() { - return null; + return ApplyReplaceCardModel.newInstance(); } @Override public void onStart() { } + + @Override + public void showReplaceCardDetail(int studentId, String cardId) { + mRxManager.register(mIModel.getReplaceCardDetailResult(studentId,cardId).subscribe(new Consumer() { + @Override + public void accept(JsonObject jsonObject) throws Exception { + ToastUtils.showToast(jsonObject.toString()); + //接收到的json + + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + + } + })); + + } } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java index 7f6c6c8..b6e0fc5 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/report/ReportDetialPresenter.java @@ -61,8 +61,6 @@ public class ReportDetialPresenter extends ReportDetialContract.ReportDetialPres mIView.showDetialList(list,pointNow,pointPast,sceneName); mIView.showDetialInfo(ranking, pscore, risePoint, pointUpAverage, riseRanking, averageRanking, evaluationDescripe); - - } }, new Consumer() { @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java index 2ee8050..f8c8994 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java @@ -13,6 +13,7 @@ import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; import com.shunzhi.parent.R; +import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; import com.shunzhi.parent.presenter.apply.ApplyReplaceCardPresenter; import com.shunzhi.parent.ui.fragment.apply.ApplyReplaceCardFragment; import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; @@ -22,6 +23,7 @@ import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment; * 补卡界面 */ +//OrderDetailContract.OrderDetailPreenter,OrderDetailContract.IOrderDetailModel public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements View.OnClickListener{ ApplyReplaceCardFragment applyReplaceCardFragment = null; ImageView ivBack; @@ -45,7 +47,6 @@ public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements V center_title = findViewById(R.id.center_title); frame_replacecard = findViewById(R.id.frame_replacecard); center_title.setText("补卡"); - ivBack.setOnClickListener(this); fragmentTransaction = getSupportFragmentManager().beginTransaction(); @@ -65,4 +66,6 @@ public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements V public BasePresenter initPresenter() { return new ApplyReplaceCardPresenter(); } + } + 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 f0fee5a..b7167ce 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 @@ -11,19 +11,22 @@ import android.widget.Toast; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; +import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.R; +import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract; import com.shunzhi.parent.views.ReplaceCardDialog; /** * Created by Administrator on 2018/4/10 0010. */ -public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements View.OnClickListener{ +public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements View.OnClickListener{ private Button bt_sure; private Button bt_cancel; ReplaceCardDialog replaceCardDialog=null; private EditText et_cardnum; private String cardnum; + private String cardid; @NonNull @Override @@ -44,6 +47,14 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment implements V et_cardnum = view.findViewById(R.id.et_cardnum); bt_sure.setOnClickListener(this); + + cardid = et_cardnum.getText().toString().trim(); + if (TextUtils.isEmpty(cardid)) { + ToastUtils.showToast("请输入新卡卡号！"); + }else { + //studentid 从成长界面获取 此处设置为“123” + mPresenter.showReplaceCardDetail(123, cardid); + } } @Override diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index d5f7c87..f56827a 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -68,13 +68,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" -<<<<<<< HEAD android:visibility="visible"> -======= - android:visibility="gone" - - > ->>>>>>> eda704dec86974be81437b97aa949c3570bb8be0 -<<<<<<< HEAD + -======= ->>>>>>> eda704dec86974be81437b97aa949c3570bb8be0 + android:layout_height="match_parent" + tools:ignore="DuplicateIds" />