From 55f0d839b94524774cee5f302f6a60062cb68ab1 Mon Sep 17 00:00:00 2001 From: wwx <1143403680@qq.com> Date: Wed, 18 Apr 2018 18:07:38 +0800 Subject: [PATCH] no message --- app/libs/processor.jar | Bin 5681 -> 0 bytes app/src/main/AndroidManifest.xml | 4 ++++ app/src/main/java/com/shunzhi/parent/AppConfig.java | 12 ++++++------ app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java | 1 + app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java | 2 +- app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java | 15 +++++++++------ app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java | 3 ++- app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java | 26 ++++++++++++++++++++++---- app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java | 1 - app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java | 55 ++++++++++++++++++++++++++++++------------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java | 11 ++++++++--- app/src/main/res/layout/fragment_apply_replacecard.xml | 8 ++++---- app/src/main/res/layout/fragment_report.xml | 2 +- mvpsdk/src/main/res/values/dimens.xml | 1 + 14 files changed, 89 insertions(+), 52 deletions(-) diff --git a/app/libs/processor.jar b/app/libs/processor.jar index 9baa0a0..7c0fbfe 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d50dfc0..0b3e8d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -204,6 +204,10 @@ android:name=".ui.activity.report.ReportSceneActivity" android:launchMode="singleInstance" /> + + diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 5c519c8..653ef8c 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -38,15 +38,15 @@ public class AppConfig { public static String APP_IS_START = "app_is_start"; //http://campus.myjxt.com/ -// public static String BASE_URL="http://60.190.202.57:1000/"; -// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; -// public static String BASE_URL_FILE="http://60.190.202.57:8196"; + public static String BASE_URL="http://60.190.202.57:1000/"; + public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; + public static String BASE_URL_FILE="http://60.190.202.57:8196"; //正式 - public static String BASE_URL="http://campus.myjxt.com/"; - public static String BASE_URL_ORDER="http://parent.myjxt.com/"; - public static String BASE_URL_FILE="http://manage.myjxt.com"; +// public static String BASE_URL="http://campus.myjxt.com/"; +// public static String BASE_URL_ORDER="http://parent.myjxt.com/"; +// public static String BASE_URL_FILE="http://manage.myjxt.com"; // public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java index 8312e90..64ccf4f 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/ReportAdapter.java @@ -13,6 +13,7 @@ import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; import com.shunzhi.parent.R; import com.shunzhi.parent.bean.ReportBean; +import com.shunzhi.parent.ui.activity.apply.ApplyReplaceCardActivity; import com.shunzhi.parent.ui.activity.report.ReportDetialActivity; import com.shunzhi.parent.views.CustomLinearLayoutManager; diff --git a/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java b/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java index 466e4df..53616b9 100644 --- a/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java +++ b/app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java @@ -13,5 +13,5 @@ import retrofit2.http.Query; public interface ApplyReplaceCardApi { @GET("/api/OneCard/AddStuCard") - Observable getApplyReplaceCard(@Query("studentId,cardId") int studentId,String cardId); + Observable getApplyReplaceCard(@Query("studentId") int studentId,@Query("onecard") 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 6dabee1..e6706de 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,12 +1,16 @@ package com.shunzhi.parent.contract.apply; + + +import android.util.Log; + 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 com.share.mvpsdk.base.IBaseView; +import com.share.mvpsdk.utils.ToastUtils; -import java.util.List; /** * Created by Administrator on 2018/4/18 0018. @@ -14,15 +18,14 @@ import java.util.List; public interface ApplyReplaceCardContract { - //IOrderDetailModel,IOrderDetailView abstract class ApplyReplaceCardPreenter extends BasePresenter{ - public abstract void showReplaceCardDetail(int studentId,String cardId); + public abstract void ReplaceCardDetail(int studentId,String cardId); } interface IApplyReplaceCardModel extends IBaseModel { io.reactivex.Observable getReplaceCardDetailResult(int studentId, String cardId); } - interface IApplyReplaceCardView extends IBaseActivity{ - void showReplaceCardDetail(List applyReplaceCardBean); + interface IApplyReplaceCardView extends IBaseView{ + void showTipsDialog(); } } 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 index 1933f84..a2bdbb0 100644 --- a/app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java @@ -3,6 +3,7 @@ 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.share.mvpsdk.helper.RxHelper; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.api.ApplyReplaceCardApi; @@ -22,6 +23,6 @@ public class ApplyReplaceCardModel extends BaseModel implements ApplyReplaceCard @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); + return RetrofitCreateHelper.getInstance().createApi(ApplyReplaceCardApi.class,AppConfig.BASE_URL).getApplyReplaceCard(studentId,cardId).compose(RxHelper.rxSchedulerHelper()); } } 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 0e1a7d0..8bfd5a6 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,10 +1,15 @@ package com.shunzhi.parent.presenter.apply; +import android.annotation.SuppressLint; +import android.text.TextUtils; +import android.util.Log; + 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 com.shunzhi.parent.views.ReplaceCardDialog; import io.reactivex.functions.Consumer; @@ -12,6 +17,10 @@ import io.reactivex.functions.Consumer; * Created by Administrator on 2018/4/18 0018. */ public class ApplyReplaceCardPresenter extends ApplyReplaceCardContract.ApplyReplaceCardPreenter { + + private JsonObject json; + private ReplaceCardDialog replaceCardDialog=null; + @Override public ApplyReplaceCardContract.IApplyReplaceCardModel getModel() { return ApplyReplaceCardModel.newInstance(); @@ -23,12 +32,21 @@ public class ApplyReplaceCardPresenter extends ApplyReplaceCardContract.ApplyRep } @Override - public void showReplaceCardDetail(int studentId, String cardId) { - mRxManager.register(mIModel.getReplaceCardDetailResult(studentId,cardId).subscribe(new Consumer() { + public void ReplaceCardDetail(int studentId, String cardId) { + mRxManager.register(mIModel.getReplaceCardDetailResult(studentId, cardId).subscribe(new Consumer() { + @SuppressLint("LongLogTag") @Override public void accept(JsonObject jsonObject) throws Exception { - ToastUtils.showToast(jsonObject.toString()); - //接收到的json + ToastUtils.showToast("data:" + jsonObject.toString()); + + json = jsonObject.getAsJsonObject("data"); + String isShowTipDialog = json.get("data").getAsString(); + if (isShowTipDialog.equals("true")) { + //mIView.showTipsDialog(); + replaceCardDialog.setTitle("补卡提示"); + replaceCardDialog.setText("您已补卡成功！"); + replaceCardDialog.show(); + } } }, new Consumer() { 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 f8c8994..82d1740 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 @@ -23,7 +23,6 @@ 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; 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 b7167ce..680a60a 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 @@ -1,9 +1,11 @@ package com.shunzhi.parent.ui.fragment.apply; +import android.annotation.SuppressLint; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -14,24 +16,24 @@ 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.presenter.apply.ApplyReplaceCardPresenter; 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; + ReplaceCardDialog replaceCardDialog = null; private EditText et_cardnum; - private String cardnum; - private String cardid; + private String cardnum =""; @NonNull @Override public BasePresenter initPresenter() { - return null; + return new ApplyReplaceCardPresenter(); } @Override @@ -41,35 +43,38 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment + android:layout_margin="@dimen/margin_large"> @@ -100,7 +100,7 @@ android:id="@+id/tv_cardnumber" android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingLeft="@dimen/margin_small" + android:layout_margin="@dimen/dp_8" android:layout_weight="1" android:text="考勤次数:" android:textColor="@color/hintTextColor" diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index f56827a..f2d2e19 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white" - android:visibility="visible"> + android:visibility="gone"> 0.66dp 4dp 5dp + 8dp 10dp 14dp 22dp -- libgit2 0.21.0