From ce7abc12fe2eaf6d2e01c7747dc078bc2b79bd9c Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Thu, 22 Mar 2018 16:49:53 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java |  8 +++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java          | 46 ++++++++++++++++++++++++++++++----------------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
index 5a436da..dffbc13 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
@@ -19,9 +19,11 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     protected void initView(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             type = getIntent().getStringExtra("type");
-            Log.e("aaa--==",type);
-            mFragments[0] = LoginAndRegistFragment.getInstance(type);
-            loadRootFragment(R.id.frame, mFragments[0]);
+            if (null!=type){
+                mFragments[0] = LoginAndRegistFragment.getInstance(type);
+                loadRootFragment(R.id.frame, mFragments[0]);
+            }
+
         } else {
             mFragments[0] = findFragment(LoginAndRegistFragment.class);
         }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index b8494c4..5b5f858 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
@@ -33,7 +34,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
 
     TextView tvJump;
 
-    boolean isQidong =false;
+    boolean isQidong = false;
 
     JZVideoPlayerStandard jiecaoVideo;
 
@@ -46,8 +47,8 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
 
         xBanner = view.findViewById(R.id.xBanner);
-        tvJump=view.findViewById(R.id.tvJump);
-        jiecaoVideo=view.findViewById(R.id.jiecaoVideo);
+        tvJump = view.findViewById(R.id.tvJump);
+        jiecaoVideo = view.findViewById(R.id.jiecaoVideo);
         jiecaoVideo.tinyBackImageView.setVisibility(View.GONE);
         jiecaoVideo.backButton.setVisibility(View.GONE);
         jiecaoVideo.replayTextView.setVisibility(View.GONE);
@@ -55,11 +56,17 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
         jiecaoVideo.thumbImageView.setVisibility(View.GONE);
         jiecaoVideo.loadingProgressBar.setVisibility(View.GONE);
 
-        isQidong=TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START));
-        if (!isQidong) {
-            mPresenter.getBanners("0", "余杭区");
+        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");
-        } else mPresenter.getBanners("1","余杭区");
+            mPresenter.getBanners("0", AppContext.getInstance().district==""?"越城区":AppContext.getInstance().district);
+        } else {
+            jiecaoVideo.setVisibility(View.GONE);
+            xBanner.setVisibility(View.VISIBLE);
+            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"越城区":AppContext.getInstance().district);
+        }
 
 
         tvJump.setOnClickListener(new View.OnClickListener() {
@@ -100,19 +107,21 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
 
     private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
         try {
-            if (!isQidong){
-                String fileUrl="";
+            if (isQidong) {
+                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;
+                    if (guangGaoBeanList.get(i).fileSrc.contains(".mp4")) {
+                        fileUrl = AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc;
+                        describe = guangGaoBeanList.get(i).describe;
                     }
                 }
-                jiecaoVideo
-            }else {
+                jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe);
+                jiecaoVideo.startVideo();
+            } 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);
+                    imgUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
                     describeList.add(guangGaoBeanList.get(i).describe);
                 }
                 xBanner.setData(imgUrl, describeList);
@@ -122,13 +131,18 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
                 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));
+                        GlideUtils.showImg(getActivity(), (ImageView) view, imgUrl.get(position));
                     }
                 });
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
 }
--
libgit2 0.21.0