diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 7efffb5..335dc84 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -24,10 +24,11 @@ public class AppConfig { public static String PARENT_ID = "parent_id"; public static String NIM_CONFIG_VIBRATE = "nim_config_vibrate";//收到通知震动 public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃 + public static String ISBINDING="isbinding"; public static boolean ISLOGIN = false; - public static boolean ISBINDING = false; +// public static boolean ISBINDING = false; public static int BINDING_SUCCESS_HEZUO = 1; public static int BINDING_SUCCESS_NOT = 2; diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 314ecd4..2dbbb53 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -15,6 +15,7 @@ import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; import com.share.mvpsdk.global.GlobalApplication; import com.amap.api.location.AMapLocationClientOption.AMapLocationMode; +import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.shunzhi.parent.bean.message.DaoMaster; import com.shunzhi.parent.bean.message.DaoMaster.DevOpenHelper; import com.shunzhi.parent.bean.message.DaoSession; @@ -57,6 +58,7 @@ public class AppContext extends GlobalApplication { initMapLocal(); NIMClient.init(this, loginInfo(), options()); initDB(); + RetrofitCreateHelper.getInstance().setAuthorization(AppConfig.getAppConfig(this).get(AppConfig.ACCESS_TOKEN)); } private void initDB() { diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java index e6d575d..d13d035 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -79,9 +79,11 @@ public class MessageManager { public void onEvent(StatusCode statusCode) { if (statusCode == StatusCode.KICKOUT) { Context context = AppContext.getInstance(); -// Intent i = new Intent(context, LoginAndRegistActivity.class); -// i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); -// context.startActivity(i); + Intent i = new Intent(context, LoginAndRegistActivity.class); + i.putExtra("type", "登录"); + i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + ToastUtils.showToast("请重新登录"); + context.startActivity(i); } } }, true); diff --git a/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java b/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java index 6be7a0d..fda361c 100644 --- a/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java @@ -30,7 +30,7 @@ public class OrderDetailModel extends BaseModel implements OrderDetailContract.I @Override public Observable getOrderDetails() { String user_id=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID); - Log.d("6666","user_id="+user_id); +// Log.d("6666","user_id="+user_id); return RetrofitCreateHelper.getInstance().createApi(OrderDetailApi.class, AppConfig.BASE_URL).getOrderDetail(user_id) .compose(RxHelper.rxSchedulerHelper()); 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 e6458f3..c5c8172 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 @@ -55,7 +55,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString()); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, loginPwd); - RetrofitCreateHelper.getInstance().setAuthorization("Bearer " + jsonObject.get("access_token").getAsString()); + RetrofitCreateHelper.getInstance().setAuthorization(jsonObject.get("access_token").getAsString()); getUserInfo(loginName, 0, ""); } else { ToastUtils.showToast(jsonObject.get("error").getAsString()); @@ -167,8 +167,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid()); if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) { - Log.e("qqqq--==","qqqqq"); - AppConfig.ISBINDING = true; +// Log.e("qqqq--==","qqqqq"); + AppConfig.getAppConfig(mIView.getBindActivity()).set(AppConfig.ISBINDING,"1"); } String account = currentBean.getUserid(); diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java index 320b0dd..ca158fc 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java @@ -4,6 +4,7 @@ import com.google.gson.JsonObject; 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.bean.ChildClass; import com.shunzhi.parent.bean.CurrentBean; import com.shunzhi.parent.bean.GradeBean; @@ -70,7 +71,7 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter { @Override public void accept(JsonObject jsonObject) throws Exception { ToastUtils.showToast("绑定孩子成功"); - AppConfig.ISBINDING=true; + AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.ISBINDING,"1"); if (jsonObject.get("data").toString().equals("null")) { mIView.addChildSuccess("", ""); } else { diff --git a/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java index 53a20ff..4aad0be 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java @@ -44,7 +44,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente OrderDetailBean orderDetailBean=new Gson().fromJson(orderDetailObj,OrderDetailBean.class); orderDetailBeanList.add(orderDetailBean); } - Log.d("6666","orderDetailBeanList="+orderDetailBeanList); +// Log.d("6666","orderDetailBeanList="+orderDetailBeanList); mIView.showOrderDetais(orderDetailBeanList); }else { ToastUtils.showToast(jsonObject.get("message").getAsString()); @@ -53,7 +53,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente }, new Consumer() { @Override public void accept(Throwable throwable) throws Exception { - Log.d("6666","throwable="+throwable.toString()); +// Log.d("6666","throwable="+throwable.toString()); } })); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java index 9b607e9..795f54d 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java @@ -20,6 +20,7 @@ import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; import com.share.mvpsdk.base.adapter.OnItemClickListener; import com.share.mvpsdk.utils.DateUtils; import com.share.mvpsdk.utils.DisplayUtils; +import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.R; import com.shunzhi.parent.bean.orderdetail.OrderDetailBean; diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 50c0f7b..48edc3b 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -146,6 +146,7 @@ public class ConsultFragment extends BaseMVPCompatFragment list) { } - + List imgUrl = new ArrayList<>(); + List describeList = new ArrayList<>(); private void initBannes(List guangGaoBeanList) { try { + imgUrl = new ArrayList<>(); + describeList = new ArrayList<>(); if (isQidong) { + AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1"); String fileUrl = "", describe = ""; for (int i = 0; i < guangGaoBeanList.size(); i++) { if (guangGaoBeanList.get(i).fileSrc.contains(".mp4")) { fileUrl = AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc; describe = guangGaoBeanList.get(i).describe; + imgUrl.add(fileUrl); + describeList.add(describe); + }else { + imgUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc); + describeList.add(guangGaoBeanList.get(i).describe); } } - jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe); - jiecaoVideo.startVideo(); +// Log.d("66666","fileUrl="+guangGaoBeanList); + if (!TextUtils.isEmpty(fileUrl)){ + jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe); + jiecaoVideo.startVideo(); + }else { + isQidong=false; + showVideos(); + showBanners(); + } + } else { - final List imgUrl = new ArrayList<>(); - List describeList = new ArrayList<>(); for (int i = 0; i < guangGaoBeanList.size(); i++) { imgUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc); describeList.add(guangGaoBeanList.get(i).describe); } - xBanner.setData(imgUrl, describeList); - xBanner.stopAutoPlay(); - xBanner.setmAutoPalyTime(10000); - xBanner.setPointsIsVisible(false); - xBanner.setmAdapter(new XBanner.XBannerAdapter() { - @Override - public void loadBanner(XBanner banner, Object model, View view, int position) { - GlideUtils.showImg(getActivity(), (ImageView) view, imgUrl.get(position)); - } - }); + showBanners(); } } catch (Exception e) { @@ -158,6 +171,19 @@ public class StartFragment extends BaseMVPCompatFragment T login(Class clazz, String url) { -- libgit2 0.21.0