no message

陶汉栋
1 parent ab99c955
Showing 12 changed files with 79 additions and 40 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/AppConfig.java
app/src/main/java/com/shunzhi/parent/AppContext.java
app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java
app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.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;
@@ -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() {
@@ -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);
@@ -30,7 +30,7 @@ public class OrderDetailModel extends BaseModel implements OrderDetailContract.I
     @Override
     public Observable<JsonObject> 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.<JsonObject>rxSchedulerHelper());
@@ -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();
@@ -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 {
@@ -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<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                Log.d("6666","throwable="+throwable.toString());
+//                Log.d("6666","throwable="+throwable.toString());
             }
         }));
@@ -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;
@@ -146,6 +146,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
+                if(position<=imgesUrl.size()-1)
                 GlideUtils.showImg(getActivity(),(ImageView) view,imgesUrl.get(position));
             }
         });
@@ -78,7 +78,12 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
     }
     private void setPersonInfo() {
-        if (AppConfig.ISBINDING) {
+
+        String useName=AppConfig.getAppConfig(getContext()).get(AppConfig.USER_NAME);
+        if (!TextUtils.isEmpty(useName))AppConfig.ISLOGIN=true;
+        else AppConfig.ISLOGIN=false;
+
+        if (TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING))) {
             binding_state.setText("");
         }
         if (AppConfig.ISLOGIN) {
@@ -5,6 +5,7 @@ import android.os.CountDownTimer;
 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.ImageView;
 import android.widget.TextView;
@@ -71,18 +72,10 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
         jiecaoVideo.loadingProgressBar.setVisibility(View.GONE);
         countDownTimer.start();
         isQidong = TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START));
-        if (isQidong) {
-            jiecaoVideo.setVisibility(View.VISIBLE);
-            xBanner.setVisibility(View.GONE);
-            AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
-//            mPresenter.getBanners("0", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
-            mPresenter.getBanners("0", "");
-        } else {
-            jiecaoVideo.setVisibility(View.GONE);
-            xBanner.setVisibility(View.VISIBLE);
-            mPresenter.getBanners("1", "");
-//            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
-        }
+
+        if (isQidong)mPresenter.getBanners("0", "");
+        else mPresenter.getBanners("1", "");
+//        showVideos();
         tvJump=view.findViewById(R.id.tvJump);
@@ -96,6 +89,20 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     }
+    private void showVideos(){
+        if (isQidong) {
+            jiecaoVideo.setVisibility(View.VISIBLE);
+            xBanner.setVisibility(View.GONE);
+//            mPresenter.getBanners("0", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
+            mPresenter.getBanners("0", "");
+        } else {
+            jiecaoVideo.setVisibility(View.GONE);
+            xBanner.setVisibility(View.VISIBLE);
+            mPresenter.getBanners("1", "");
+//            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
+        }
+    }
+
     @NonNull
     @Override
     public BasePresenter initPresenter() {
@@ -121,36 +128,42 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     public void showContext(List<ChannelContextBean> list) {
     }
-
+     List<String> imgUrl = new ArrayList<>();
+    List<String> describeList = new ArrayList<>();
     private void initBannes(List<GuangGaoBean> 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<String> imgUrl = new ArrayList<>();
-                List<String> 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&lt;ConsultContract.Consult
         }
     }
+    private void showBanners(){
+        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));
+            }
+        });
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -111,7 +111,7 @@ public class RetrofitCreateHelper {
 //        return retrofit.create(clazz);
 //    }
     public void setAuthorization(String Authorization) {
-        this.token = Authorization;
+        this.token ="Bearer " +  Authorization;
     }
     public <T> T login(Class<T> clazz, String url) {
	@@ -30,7 +30,7 @@ public class OrderDetailModel extends BaseModel implements OrderDetailContract.I		@@ -30,7 +30,7 @@ public class OrderDetailModel extends BaseModel implements OrderDetailContract.I
30	@Override	30	@Override
31	public Observable<JsonObject> getOrderDetails() {	31	public Observable<JsonObject> getOrderDetails() {
32	String user_id=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID);	32	String user_id=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.USER_ID);
33	- Log.d("6666","user_id="+user_id);	33	+// Log.d("6666","user_id="+user_id);
34	return RetrofitCreateHelper.getInstance().createApi(OrderDetailApi.class, AppConfig.BASE_URL).getOrderDetail(user_id)	34	return RetrofitCreateHelper.getInstance().createApi(OrderDetailApi.class, AppConfig.BASE_URL).getOrderDetail(user_id)
35	.compose(RxHelper.<JsonObject>rxSchedulerHelper());	35	.compose(RxHelper.<JsonObject>rxSchedulerHelper());
36		36
	@@ -44,7 +44,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente		@@ -44,7 +44,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente
44	OrderDetailBean orderDetailBean=new Gson().fromJson(orderDetailObj,OrderDetailBean.class);	44	OrderDetailBean orderDetailBean=new Gson().fromJson(orderDetailObj,OrderDetailBean.class);
45	orderDetailBeanList.add(orderDetailBean);	45	orderDetailBeanList.add(orderDetailBean);
46	}	46	}
47	- Log.d("6666","orderDetailBeanList="+orderDetailBeanList);	47	+// Log.d("6666","orderDetailBeanList="+orderDetailBeanList);
48	mIView.showOrderDetais(orderDetailBeanList);	48	mIView.showOrderDetais(orderDetailBeanList);
49	}else {	49	}else {
50	ToastUtils.showToast(jsonObject.get("message").getAsString());	50	ToastUtils.showToast(jsonObject.get("message").getAsString());
	@@ -53,7 +53,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente		@@ -53,7 +53,7 @@ public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreente
53	}, new Consumer<Throwable>() {	53	}, new Consumer<Throwable>() {
54	@Override	54	@Override
55	public void accept(Throwable throwable) throws Exception {	55	public void accept(Throwable throwable) throws Exception {
56	- Log.d("6666","throwable="+throwable.toString());	56	+// Log.d("6666","throwable="+throwable.toString());
57	}	57	}
58	}));	58	}));
59		59
	@@ -111,7 +111,7 @@ public class RetrofitCreateHelper {		@@ -111,7 +111,7 @@ public class RetrofitCreateHelper {
111	// return retrofit.create(clazz);	111	// return retrofit.create(clazz);
112	// }	112	// }
113	public void setAuthorization(String Authorization) {	113	public void setAuthorization(String Authorization) {
114	- this.token = Authorization;	114	+ this.token ="Bearer " + Authorization;
115	}	115	}
116		116
117	public <T> T login(Class<T> clazz, String url) {	117	public <T> T login(Class<T> clazz, String url) {