陶汉栋 / ParentWork

Download as
Browse Code »

Commit 0abe9fd66ebdc80f52faaf5f6c8a33e5806daab1

Authored by 陶汉栋
1 parent 257465ea
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 5 changed files with 16 additions and 8 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
  Diff comments   View file @0abe9fd
@@ -31,7 +31,6 @@ import java.util.List; @@ -31,7 +31,6 @@ import java.util.List;
31 import me.leefeng.citypicker.CityPicker; 31 import me.leefeng.citypicker.CityPicker;
32 import me.leefeng.citypicker.CityPickerListener; 32 import me.leefeng.citypicker.CityPickerListener;
33 33
34 -  
35 public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter, CepingContract.ICePingModel> implements CepingContract.ICePingView 34 public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter, CepingContract.ICePingModel> implements CepingContract.ICePingView
36 , View.OnClickListener, CityPickerListener { 35 , View.OnClickListener, CityPickerListener {
37 36
@@ -61,6 +60,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP @@ -61,6 +60,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
61 textAndImg_zxlx = view.findViewById(R.id.textAndImg_zxlx); 60 textAndImg_zxlx = view.findViewById(R.id.textAndImg_zxlx);
62 layout_control = view.findViewById(R.id.layout_control); 61 layout_control = view.findViewById(R.id.layout_control);
63 floatingActionButton = view.findViewById(R.id.floatingActionButton); 62 floatingActionButton = view.findViewById(R.id.floatingActionButton);
  63 +
64 tvCourse1 = view.findViewById(R.id.tvCourse1); 64 tvCourse1 = view.findViewById(R.id.tvCourse1);
65 tvCourse2 = view.findViewById(R.id.tvCourse2); 65 tvCourse2 = view.findViewById(R.id.tvCourse2);
66 tvCourse3 = view.findViewById(R.id.tvCourse3); 66 tvCourse3 = view.findViewById(R.id.tvCourse3);
@@ -149,13 +149,13 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP @@ -149,13 +149,13 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
149 else cityPicker.show(); 149 else cityPicker.show();
150 break; 150 break;
151 case R.id.ivCamera: 151 case R.id.ivCamera:
152 - ToastUtils.showToast("功能暂未上线"); 152 + ToastUtils.showToast("功能暂不开放");
153 break; 153 break;
154 case R.id.textAndImg_xqjc: 154 case R.id.textAndImg_xqjc:
155 - ToastUtils.showToast("功能暂未上线"); 155 + ToastUtils.showToast("功能暂不开放");
156 break; 156 break;
157 case R.id.textAndImg_zxlx: 157 case R.id.textAndImg_zxlx:
158 - ToastUtils.showToast("功能暂未上线"); 158 + ToastUtils.showToast("功能暂不开放");
159 break; 159 break;
160 default: 160 default:
161 break; 161 break;
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
  Diff comments   View file @0abe9fd
@@ -277,6 +277,9 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu @@ -277,6 +277,9 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
277 } 277 }
278 278
279 public void refresh() { 279 public void refresh() {
  280 + first=true;
  281 + tvLocalAddress.setText(AppContext.getInstance().district);
280 mPresenter.getContextChannel(AppContext.getInstance().district,0,1,pageIndex); 282 mPresenter.getContextChannel(AppContext.getInstance().district,0,1,pageIndex);
  283 + mPresenter.getBanners("2", AppContext.getInstance().district);
281 } 284 }
282 } 285 }
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  Diff comments   View file @0abe9fd
@@ -216,15 +216,15 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon @@ -216,15 +216,15 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
216 tv_grally_title = itemView.findViewById(R.id.tv_grally_title); 216 tv_grally_title = itemView.findViewById(R.id.tv_grally_title);
217 frame_root = itemView.findViewById(R.id.frame_root); 217 frame_root = itemView.findViewById(R.id.frame_root);
218 FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(-1, -1); 218 FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(-1, -1);
219 - params.width = DisplayUtils.getScreenWidthPixels(getActivity()) - 100;  
220 - params.setMargins(10, 0, 10, 0); 219 +// params.width = DisplayUtils.getScreenWidthPixels(getActivity()) - 100;
  220 +// params.setMargins(10, 0, 10, 0);
221 frame_root.setLayoutParams(params); 221 frame_root.setLayoutParams(params);
222 } 222 }
223 223
224 @Override 224 @Override
225 public void onBindViewHolder(final GuangGaoBean object, final int position) { 225 public void onBindViewHolder(final GuangGaoBean object, final int position) {
226 GlideUtils.showImg(mContext, iv_grally, object.fileSrc); 226 GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
227 - tv_grally_title.setText(object.describe + ""); 227 + tv_grally_title.setText(object.describe.trim() + "");
228 iv_grally.setOnClickListener(new View.OnClickListener() { 228 iv_grally.setOnClickListener(new View.OnClickListener() {
229 @Override 229 @Override
230 public void onClick(View v) { 230 public void onClick(View v) {
app/src/main/res/drawable-xhdpi/search_white.png 0 → 100644
View file @0abe9fd

649 Bytes
app/src/main/res/layout/activity_web_view.xml
  Diff comments   View file @0abe9fd
@@ -26,13 +26,18 @@ @@ -26,13 +26,18 @@
26 android:textSize="@dimen/textSize16" /> 26 android:textSize="@dimen/textSize16" />
27 <TextView 27 <TextView
28 android:id="@+id/title_web" 28 android:id="@+id/title_web"
  29 + android:singleLine="true"
  30 + android:layout_toRightOf="@+id/close_btn"
  31 + android:layout_toLeftOf="@+id/close_btn_right"
29 android:layout_width="wrap_content" 32 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
31 android:text="" 34 android:text=""
32 android:textSize="@dimen/txtsize_title" 35 android:textSize="@dimen/txtsize_title"
  36 + android:gravity="center"
  37 + android:ellipsize="end"
33 android:layout_centerInParent="true" 38 android:layout_centerInParent="true"
34 android:visibility="gone" 39 android:visibility="gone"
35 - android:textColor="@color/textColor" 40 + android:textColor="@color/white"
36 41
37 /> 42 />
38 <ImageView 43 <ImageView