陶汉栋 / ParentWork

Download as
Browse Code »

Commit 5f67acc0284c43705a61cdc9129015665a7fe174

Authored by 姚旭斌
2 parents 10a30b8e e3be68e6
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev 

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
Showing 3 changed files with 21 additions and 20 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
  Diff comments   View file @5f67acc
@@ -64,7 +64,6 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ @@ -64,7 +64,6 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
64 mRxManager.register(mIModel.getBanners(position,areaName).subscribe(new Consumer<JsonObject>() { 64 mRxManager.register(mIModel.getBanners(position,areaName).subscribe(new Consumer<JsonObject>() {
65 @Override 65 @Override
66 public void accept(JsonObject jsonObject) throws Exception { 66 public void accept(JsonObject jsonObject) throws Exception {
67 - Log.d("66666","getBanners="+jsonObject);  
68 if (jsonObject.get("status").getAsString().equals("1")){ 67 if (jsonObject.get("status").getAsString().equals("1")){
69 JsonArray jsonArray=jsonObject.getAsJsonArray("data"); 68 JsonArray jsonArray=jsonObject.getAsJsonArray("data");
70 List<GuangGaoBean> guangGaoBeanList=new ArrayList<>(); 69 List<GuangGaoBean> guangGaoBeanList=new ArrayList<>();
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
  Diff comments   View file @5f67acc
@@ -214,6 +214,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu @@ -214,6 +214,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
214 214
215 @Override 215 @Override
216 public void showBanners(List<GuangGaoBean> guangGaoBeanList) { 216 public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
  217 + describeList.clear();
217 for (int i = 0; i < guangGaoBeanList.size(); i++) { 218 for (int i = 0; i < guangGaoBeanList.size(); i++) {
218 imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc); 219 imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
219 describeList.add(guangGaoBeanList.get(i).describe); 220 describeList.add(guangGaoBeanList.get(i).describe);
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  Diff comments   View file @5f67acc
@@ -66,25 +66,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon @@ -66,25 +66,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
66 initViews(view); 66 initViews(view);
67 } 67 }
68 68
69 - private void initRecyclerView(List<GuangGaoBean> guangGaoBeanList) {  
70 -  
71 - if (null == myGrallyAdapter) myGrallyAdapter = new MyGrallyAdapter();  
72 - myGrallyAdapter.addAll(guangGaoBeanList);  
73 - recyclerViewGrally.setAdapter(myGrallyAdapter);  
74 - recyclerViewGrally.addOnScrollListener(new RecyclerView.OnScrollListener() {  
75 - @Override  
76 - public void onScrollStateChanged(RecyclerView recyclerView, int newState) {  
77 - super.onScrollStateChanged(recyclerView, newState);  
78 - }  
79 -  
80 - @Override  
81 - public void onScrolled(RecyclerView recyclerView, int dx, int dy) {  
82 - super.onScrolled(recyclerView, dx, dy);  
83 - }  
84 - });  
85 -  
86 - }  
87 -  
88 private void initViews(View view) { 69 private void initViews(View view) {
89 channel = getArguments().getString("channel"); 70 channel = getArguments().getString("channel");
90 layout_control = view.findViewById(R.id.layout_control); 71 layout_control = view.findViewById(R.id.layout_control);
@@ -144,6 +125,25 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon @@ -144,6 +125,25 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
144 initRecyclerView(guangGaoBeanList); 125 initRecyclerView(guangGaoBeanList);
145 } 126 }
146 127
  128 + private void initRecyclerView(List<GuangGaoBean> guangGaoBeanList) {
  129 +
  130 + if (null == myGrallyAdapter) myGrallyAdapter = new MyGrallyAdapter();
  131 + myGrallyAdapter.addAll(guangGaoBeanList);
  132 + recyclerViewGrally.setAdapter(myGrallyAdapter);
  133 + recyclerViewGrally.addOnScrollListener(new RecyclerView.OnScrollListener() {
  134 + @Override
  135 + public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
  136 + super.onScrollStateChanged(recyclerView, newState);
  137 + }
  138 +
  139 + @Override
  140 + public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
  141 + super.onScrolled(recyclerView, dx, dy);
  142 + }
  143 + });
  144 +
  145 + }
  146 +
147 @Override 147 @Override
148 public void showConsultContent(List<ChannelContextBean> list) { 148 public void showConsultContent(List<ChannelContextBean> list) {
149 myConsultBeanList.addAll(list); 149 myConsultBeanList.addAll(list);
@@ -215,6 +215,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon @@ -215,6 +215,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
215 @Override 215 @Override
216 public void onBindViewHolder(final GuangGaoBean object, int position) { 216 public void onBindViewHolder(final GuangGaoBean object, int position) {
217 Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG + object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally); 217 Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG + object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
  218 +
218 tv_grally_title.setText(object.describe + ""); 219 tv_grally_title.setText(object.describe + "");
219 iv_grally.setOnClickListener(new View.OnClickListener() { 220 iv_grally.setOnClickListener(new View.OnClickListener() {
220 @Override 221 @Override