Merge branch 'developer' into yxb_dev

姚旭斌
2 parents 935f129c 0a7ab48f
Showing 6 changed files with 71 additions and 23 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
app/src/main/res/layout/fragment_start.xml
@@ -84,6 +84,8 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter&lt;ChannelContextBean
                 normal_content.setVisibility(View.VISIBLE);
                 tvConsultTitle.setText(object.getTitle());
                 tvConsultContent.setText(object.getContent());
+                tvPingLunNums.setText("评论:"+object.getTalkNum()+"");
+                tvZhuanFaNums.setText("转发:"+object.getForwardingNum()+"");
                 GlideUtils.showImg(mContext,iv_consult,object.getImage());
                 normal_content.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -18,7 +18,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     protected void initView(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             type = getIntent().getStringExtra("type");
-            if(type!=null) {
+            if (null!=type){
                 mFragments[0] = LoginAndRegistFragment.getInstance(type);
                 loadRootFragment(R.id.frame, mFragments[0]);
             }
@@ -114,6 +114,7 @@ public class WebViewActivity extends BaseCompatActivity {
         initWebView();
         initWebSetting(nesteScrollWebView.getSettings());
         nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
+//        Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url"));
     }
     @Override
@@ -143,7 +143,6 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
                 WebViewActivity.getInstance(getContext(), guanggaoList.get(position).url, -1);
             }
         });
-
     }
     @NonNull
@@ -4,6 +4,7 @@ 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.ImageView;
 import android.widget.TextView;
@@ -25,6 +26,8 @@ import com.stx.xhb.xbanner.XBanner;
 import java.util.ArrayList;
 import java.util.List;
+import cn.jzvd.JZVideoPlayerStandard;
+
 public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
         implements ConsultContract.IConsultView {
@@ -32,6 +35,10 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     TextView tvJump;
+    boolean isQidong = false;
+
+    JZVideoPlayerStandard jiecaoVideo;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_start;
@@ -41,13 +48,30 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         xBanner = view.findViewById(R.id.xBanner);
-        tvJump=view.findViewById(R.id.tvJump);
-
-        if (!TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START))) {
-            mPresenter.getBanners("0", AppContext.getInstance().district);
+        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);
+        jiecaoVideo.batteryLevel.setVisibility(View.GONE);
+        jiecaoVideo.thumbImageView.setVisibility(View.GONE);
+        jiecaoVideo.loadingProgressBar.setVisibility(View.GONE);
+
+        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",AppContext.getInstance().district);
+//            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);
+        }
+        tvJump=view.findViewById(R.id.tvJump);
         tvJump.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -87,26 +111,43 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
     private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
         try {
-        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);
+            Log.d("66666","initBannes"+guangGaoBeanList);
+            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;
+                        describe = guangGaoBeanList.get(i).describe;
+                    }
+                }
+                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);
+                    describeList.add(guangGaoBeanList.get(i).describe);
+                }
+                xBanner.setData(imgUrl, describeList);
+                xBanner.stopAutoPlay();
+                xBanner.setmAutoPalyTime(10000);
 //        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
-        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));
+                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));
+                    }
+                });
             }
-        });
-
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
 }
@@ -11,6 +11,11 @@
         android:id="@+id/xBanner"
         ></com.stx.xhb.xbanner.XBanner>
+    <cn.jzvd.JZVideoPlayerStandard
+        android:id="@+id/jiecaoVideo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></cn.jzvd.JZVideoPlayerStandard>
+
     <TextView
         android:id="@+id/tvJump"
         android:layout_width="wrap_content"
	@@ -18,7 +18,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {		@@ -18,7 +18,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
18	protected void initView(Bundle savedInstanceState) {	18	protected void initView(Bundle savedInstanceState) {
19	if (savedInstanceState == null) {	19	if (savedInstanceState == null) {
20	type = getIntent().getStringExtra("type");	20	type = getIntent().getStringExtra("type");
21	- if(type!=null) {	21	+ if (null!=type){
22	mFragments[0] = LoginAndRegistFragment.getInstance(type);	22	mFragments[0] = LoginAndRegistFragment.getInstance(type);
23	loadRootFragment(R.id.frame, mFragments[0]);	23	loadRootFragment(R.id.frame, mFragments[0]);
24	}	24	}
	@@ -114,6 +114,7 @@ public class WebViewActivity extends BaseCompatActivity {		@@ -114,6 +114,7 @@ public class WebViewActivity extends BaseCompatActivity {
114	initWebView();	114	initWebView();
115	initWebSetting(nesteScrollWebView.getSettings());	115	initWebSetting(nesteScrollWebView.getSettings());
116	nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));	116	nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
		117	+// Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url"));
117	}	118	}
118		119
119	@Override	120	@Override
	@@ -143,7 +143,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu		@@ -143,7 +143,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
143	WebViewActivity.getInstance(getContext(), guanggaoList.get(position).url, -1);	143	WebViewActivity.getInstance(getContext(), guanggaoList.get(position).url, -1);
144	}	144	}
145	});	145	});
146	-
147	}	146	}
148		147
149	@NonNull	148	@NonNull
	@@ -4,6 +4,7 @@ import android.os.Bundle;		@@ -4,6 +4,7 @@ import android.os.Bundle;
4	import android.support.annotation.NonNull;	4	import android.support.annotation.NonNull;
5	import android.support.annotation.Nullable;	5	import android.support.annotation.Nullable;
6	import android.text.TextUtils;	6	import android.text.TextUtils;
		7	+import android.util.Log;
7	import android.view.View;	8	import android.view.View;
8	import android.widget.ImageView;	9	import android.widget.ImageView;
9	import android.widget.TextView;	10	import android.widget.TextView;
	@@ -25,6 +26,8 @@ import com.stx.xhb.xbanner.XBanner;		@@ -25,6 +26,8 @@ import com.stx.xhb.xbanner.XBanner;
25	import java.util.ArrayList;	26	import java.util.ArrayList;
26	import java.util.List;	27	import java.util.List;
27		28
		29	+import cn.jzvd.JZVideoPlayerStandard;
		30	+
28	public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>	31	public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
29	implements ConsultContract.IConsultView {	32	implements ConsultContract.IConsultView {
30		33
	@@ -32,6 +35,10 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult		@@ -32,6 +35,10 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
32		35
33	TextView tvJump;	36	TextView tvJump;
34		37
		38	+ boolean isQidong = false;
		39	+
		40	+ JZVideoPlayerStandard jiecaoVideo;
		41	+
35	@Override	42	@Override
36	public int getLayoutId() {	43	public int getLayoutId() {
37	return R.layout.fragment_start;	44	return R.layout.fragment_start;
	@@ -41,13 +48,30 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult		@@ -41,13 +48,30 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
41	public void initUI(View view, @Nullable Bundle savedInstanceState) {	48	public void initUI(View view, @Nullable Bundle savedInstanceState) {
42		49
43	xBanner = view.findViewById(R.id.xBanner);	50	xBanner = view.findViewById(R.id.xBanner);
44	- tvJump=view.findViewById(R.id.tvJump);
45	-
46	- if (!TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START))) {
47	- mPresenter.getBanners("0", AppContext.getInstance().district);	51	+ tvJump = view.findViewById(R.id.tvJump);
		52	+ jiecaoVideo = view.findViewById(R.id.jiecaoVideo);
		53	+ jiecaoVideo.tinyBackImageView.setVisibility(View.GONE);
		54	+ jiecaoVideo.backButton.setVisibility(View.GONE);
		55	+ jiecaoVideo.replayTextView.setVisibility(View.GONE);
		56	+ jiecaoVideo.batteryLevel.setVisibility(View.GONE);
		57	+ jiecaoVideo.thumbImageView.setVisibility(View.GONE);
		58	+ jiecaoVideo.loadingProgressBar.setVisibility(View.GONE);
		59	+
		60	+ isQidong = TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START));
		61	+ if (isQidong) {
		62	+ jiecaoVideo.setVisibility(View.VISIBLE);
		63	+ xBanner.setVisibility(View.GONE);
48	AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");	64	AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
49	- } else mPresenter.getBanners("1",AppContext.getInstance().district);	65	+// mPresenter.getBanners("0", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
		66	+ mPresenter.getBanners("0", "余杭区");
		67	+ } else {
		68	+ jiecaoVideo.setVisibility(View.GONE);
		69	+ xBanner.setVisibility(View.VISIBLE);
		70	+ mPresenter.getBanners("1", "余杭区");
		71	+// mPresenter.getBanners("1", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
		72	+ }
50		73
		74	+ tvJump=view.findViewById(R.id.tvJump);
51		75
52	tvJump.setOnClickListener(new View.OnClickListener() {	76	tvJump.setOnClickListener(new View.OnClickListener() {
53	@Override	77	@Override
	@@ -87,26 +111,43 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult		@@ -87,26 +111,43 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
87		111
88	private void initBannes(List<GuangGaoBean> guangGaoBeanList) {	112	private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
89	try {	113	try {
90	- final List<String> imgUrl = new ArrayList<>();
91	- List<String> describeList = new ArrayList<>();
92	- for (int i = 0; i < guangGaoBeanList.size(); i++) {
93	- imgUrl.add(AppConfig.BASE_URL_FILE+guangGaoBeanList.get(i).fileSrc);
94	- describeList.add(guangGaoBeanList.get(i).describe);
95	- }
96	- xBanner.setData(imgUrl, describeList);
97	- xBanner.stopAutoPlay();
98	- xBanner.setmAutoPalyTime(10000);	114	+ Log.d("66666","initBannes"+guangGaoBeanList);
		115	+ if (isQidong) {
		116	+ String fileUrl = "", describe = "";
		117	+ for (int i = 0; i < guangGaoBeanList.size(); i++) {
		118	+ if (guangGaoBeanList.get(i).fileSrc.contains(".mp4")) {
		119	+ fileUrl = AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc;
		120	+ describe = guangGaoBeanList.get(i).describe;
		121	+ }
		122	+ }
		123	+ jiecaoVideo.setUp(fileUrl, JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, describe);
		124	+ jiecaoVideo.startVideo();
		125	+ } else {
		126	+ final List<String> imgUrl = new ArrayList<>();
		127	+ List<String> describeList = new ArrayList<>();
		128	+ for (int i = 0; i < guangGaoBeanList.size(); i++) {
		129	+ imgUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
		130	+ describeList.add(guangGaoBeanList.get(i).describe);
		131	+ }
		132	+ xBanner.setData(imgUrl, describeList);
		133	+ xBanner.stopAutoPlay();
		134	+ xBanner.setmAutoPalyTime(10000);
99	// xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);	135	// xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
100	- xBanner.setmAdapter(new XBanner.XBannerAdapter() {
101	- @Override
102	- public void loadBanner(XBanner banner, Object model, View view, int position) {
103	- GlideUtils.showImg(getActivity(),(ImageView) view,imgUrl.get(position));	136	+ xBanner.setmAdapter(new XBanner.XBannerAdapter() {
		137	+ @Override
		138	+ public void loadBanner(XBanner banner, Object model, View view, int position) {
		139	+ GlideUtils.showImg(getActivity(), (ImageView) view, imgUrl.get(position));
		140	+ }
		141	+ });
104	}	142	}
105	- });
106	-
107		143
108	- }catch (Exception e){	144	+ } catch (Exception e) {
109	e.printStackTrace();	145	e.printStackTrace();
110	}	146	}
111	}	147	}
		148	+
		149	+ @Override
		150	+ public void onDestroy() {
		151	+ super.onDestroy();
		152	+ }
112	}	153	}