From 0abe9fd66ebdc80f52faaf5f6c8a33e5806daab1 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Sat, 24 Mar 2018 09:15:15 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java                  | 8 ++++----
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 | 3 +++
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 6 +++---
 app/src/main/res/drawable-xhdpi/search_white.png                                      | Bin 0 -> 649 bytes
 app/src/main/res/layout/activity_web_view.xml                                         | 7 ++++++-
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/search_white.png

diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
index bbfe399..af7cd8b 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
@@ -31,7 +31,6 @@ import java.util.List;
 import me.leefeng.citypicker.CityPicker;
 import me.leefeng.citypicker.CityPickerListener;
 
-
 public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter, CepingContract.ICePingModel> implements CepingContract.ICePingView
         , View.OnClickListener, CityPickerListener {
 
@@ -61,6 +60,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         textAndImg_zxlx = view.findViewById(R.id.textAndImg_zxlx);
         layout_control = view.findViewById(R.id.layout_control);
         floatingActionButton = view.findViewById(R.id.floatingActionButton);
+
         tvCourse1 = view.findViewById(R.id.tvCourse1);
         tvCourse2 = view.findViewById(R.id.tvCourse2);
         tvCourse3 = view.findViewById(R.id.tvCourse3);
@@ -149,13 +149,13 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
                 else cityPicker.show();
                 break;
             case R.id.ivCamera:
-                ToastUtils.showToast("功能暂未上线");
+                ToastUtils.showToast("功能暂不开放");
                 break;
             case R.id.textAndImg_xqjc:
-                ToastUtils.showToast("功能暂未上线");
+                ToastUtils.showToast("功能暂不开放");
                 break;
             case R.id.textAndImg_zxlx:
-                ToastUtils.showToast("功能暂未上线");
+                ToastUtils.showToast("功能暂不开放");
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index c55cb3e..38f4507 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -277,6 +277,9 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     }
 
     public void refresh() {
+        first=true;
+        tvLocalAddress.setText(AppContext.getInstance().district);
         mPresenter.getContextChannel(AppContext.getInstance().district,0,1,pageIndex);
+        mPresenter.getBanners("2", AppContext.getInstance().district);
     }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index e85e7dd..81b584e 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -216,15 +216,15 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
                 tv_grally_title = itemView.findViewById(R.id.tv_grally_title);
                 frame_root = itemView.findViewById(R.id.frame_root);
                 FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(-1, -1);
-                params.width = DisplayUtils.getScreenWidthPixels(getActivity()) - 100;
-                params.setMargins(10, 0, 10, 0);
+//                params.width = DisplayUtils.getScreenWidthPixels(getActivity()) - 100;
+//                params.setMargins(10, 0, 10, 0);
                 frame_root.setLayoutParams(params);
             }
 
             @Override
             public void onBindViewHolder(final GuangGaoBean object, final int position) {
                 GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
-                tv_grally_title.setText(object.describe + "");
+                tv_grally_title.setText(object.describe.trim() + "");
                 iv_grally.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/app/src/main/res/drawable-xhdpi/search_white.png b/app/src/main/res/drawable-xhdpi/search_white.png
new file mode 100644
index 0000000..4195837
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/search_white.png differ
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index fa2c762..073755c 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -26,13 +26,18 @@
             android:textSize="@dimen/textSize16" />
         <TextView
             android:id="@+id/title_web"
+            android:singleLine="true"
+            android:layout_toRightOf="@+id/close_btn"
+            android:layout_toLeftOf="@+id/close_btn_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=""
             android:textSize="@dimen/txtsize_title"
+            android:gravity="center"
+            android:ellipsize="end"
             android:layout_centerInParent="true"
             android:visibility="gone"
-            android:textColor="@color/textColor"
+            android:textColor="@color/white"
 
             />
         <ImageView
--
libgit2 0.21.0