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

---
 app/src/main/AndroidManifest.xml                                                      |  5 ++++-
 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java          |  3 ---
 app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java                 |  6 +++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 |  1 -
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                    | 16 ++++++++--------
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java |  2 ++
 app/src/main/res/layout/layout_consult_content.xml                                    | 22 ++++++++++++++++------
 app/src/main/res/menu/bottom_navigationview.xml                                       |  4 ++--
 app/src/main/res/values/strings.xml                                                   |  2 +-
 9 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9add6c7..9a2a12c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -128,7 +128,9 @@
         <activity
             android:name=".ui.activity.MyChildActivity"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"/>
+        <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
+            />
         <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
         <activity
             android:name=".ui.MainActivity"
@@ -175,6 +177,7 @@
             android:screenOrientation="portrait" />
 
         <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
             android:launchMode="singleInstance"/>
 
         <activity android:name=".ui.activity.orderdetail.OrderDetailActivity"
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
index fde3352..651ac79 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -95,9 +95,6 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
                 mIView.showChannel(channelList);
                 mIView.showContext(contextList);
 
-
-
-
             }
         }, new Consumer<Throwable>() {
             @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
index fba3045..c4939bb 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
@@ -45,7 +45,7 @@ import java.util.List;
 public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel>
         implements MyChildContract.IMyChildView, View.OnClickListener {
     SwipeMenuRecyclerView child_recycle;
-    TextView  center_title, add_child, go_buy;
+    TextView center_title, add_child, go_buy;
     ImageView back;
     ChildAdapter childAdapter;
     List<ChildBean> currlist = new ArrayList<>();
@@ -127,7 +127,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
             Bundle bundle = new Bundle();
             bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
                     AppConfig.getAppConfig(this).get(AppConfig.USER_ID));
-            bundle.putInt("type",AppConfig.ORDER_CENTER);
+            bundle.putInt("type", AppConfig.ORDER_CENTER);
             startNewActivity(WebViewActivity.class, bundle);
         }
     }
@@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
     }
 
     @Override
-    public void addChildSuccess(String account,String  password) {
+    public void addChildSuccess(String account, String password) {
 
     }
 
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 b59ebe0..f4ce880 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
@@ -239,7 +239,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
             first = false;
         }
 
-
     }
 
     @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index 58d44e4..e6e3381 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -30,7 +30,7 @@ import com.shunzhi.parent.util.GlideUtils;
 
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about,layoutAdvice;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layoutAdvice;
     RoundedImageView user_photo;
     TextView user_name, user_mobile, tvExit, binding_state;
 
@@ -53,7 +53,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
         layout_cache = view.findViewById(R.id.layout_cache);
         layout_about = view.findViewById(R.id.layout_about);
-        layoutAdvice=view.findViewById(R.id.layoutAdvice);
+        layoutAdvice = view.findViewById(R.id.layoutAdvice);
         layoutAdvice.setOnClickListener(this);
         layout_about.setOnClickListener(this);
         layout_cache.setOnClickListener(this);
@@ -77,9 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         if (AppConfig.ISLOGIN) {
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
             if (!TextUtils.isEmpty(url)) {
-                GlideUtils.showImg(getContext(),user_photo,url);
+                GlideUtils.showImg(getContext(), user_photo, url);
             } else {
-                GlideUtils.showImg(getContext(),user_photo,url);
+                GlideUtils.showImg(getContext(), user_photo, url);
                 user_photo.setCornerRadius(20);
             }
             user_photo.setCornerRadius(20);
@@ -87,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
             user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
             user_mobile.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             user_name.setVisibility(View.VISIBLE);
             user_mobile.setVisibility(View.GONE);
         }
@@ -123,10 +123,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
                 clearMyCache();
                 break;
             case R.id.layout_about:
-                WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1);
+                WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "About.html", -1);
                 break;
             case R.id.layoutAdvice:
-                WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"FeedBack.aspx?userid="+AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID),-1);
+                WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "FeedBack.aspx?userid=" + AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID), -1);
                 break;
             default:
                 break;
@@ -162,7 +162,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     }
 
     private void clearUerinfo() {
-        if(AppConfig.ISLOGIN) {
+        if (AppConfig.ISLOGIN) {
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, "");
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
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 ef9a3d4..d9894fe 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
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -99,6 +100,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
     }
 
     public void showSearchContent(String keyword) {
+        if (!TextUtils.isEmpty(keyword))
         mPresenter.getInformationTopic(keyword, AppContext.getInstance().district, channel, "0", 1);
     }
 
diff --git a/app/src/main/res/layout/layout_consult_content.xml b/app/src/main/res/layout/layout_consult_content.xml
index a437bbd..30256a6 100644
--- a/app/src/main/res/layout/layout_consult_content.xml
+++ b/app/src/main/res/layout/layout_consult_content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/size_dp_100"
     android:layout_marginBottom="@dimen/size_dp_10"
     android:orientation="vertical">
 
@@ -17,15 +17,17 @@
             android:layout_weight="4"
             android:elevation="@dimen/size_dp_3"
             android:orientation="vertical"
-            android:padding="@dimen/size_dp_5">
+            android:padding="@dimen/size_dp_4">
 
             <TextView
                 android:id="@+id/tvConsultTitle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="2"
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="2"
+                android:layout_gravity="top"
                 android:text="学校初一段家长统一测试使用家长慧得到良好反馈评价"
                 android:textColor="@color/textColor"
                 android:textSize="@dimen/textSize14" />
@@ -33,9 +35,11 @@
             <TextView
                 android:id="@+id/tvConsultContent"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginTop="@dimen/size_dp_5"
                 android:ellipsize="end"
+                android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:maxLines="2"
                 android:singleLine="true"
@@ -44,15 +48,19 @@
                 android:textSize="@dimen/textSize14" />
 
             <FrameLayout
+                android:layout_gravity="bottom"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginTop="@dimen/size_dp_5">
 
                 <RelativeLayout
+                    android:layout_gravity="bottom"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
                     <TextView
+                        android:layout_centerVertical="true"
                         android:id="@+id/tvPingLunNums"
                         style="@style/TextView_Wrap_16"
                         android:layout_gravity="center_vertical"
@@ -75,9 +83,11 @@
             android:id="@+id/iv_consult"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_margin="@dimen/size_dp_2"
+            android:layout_margin="@dimen/size_dp_4"
             android:layout_weight="2"
+            android:scaleType="fitXY"
             android:src="@color/xueqing_blue" />
+
     </LinearLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/menu/bottom_navigationview.xml b/app/src/main/res/menu/bottom_navigationview.xml
index cafffac..aedd00c 100644
--- a/app/src/main/res/menu/bottom_navigationview.xml
+++ b/app/src/main/res/menu/bottom_navigationview.xml
@@ -3,13 +3,13 @@
 
     <item android:id="@+id/menu_item_index"
             android:icon="@drawable/selector_ceping"
-            android:title="测评"
+            android:title="慧测慧练"
         ></item>
 
 
     <item android:id="@+id/menu_item_consult"
         android:icon="@drawable/selector_consult"
-        android:title="咨询频道"
+        android:title="资讯频道"
         ></item>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 401c694..50f49aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
-    <string name="ceping">测评</string>
+    <string name="ceping">慧测慧练</string>
     <string name="consult_huati">咨询话题</string>
     <string name="order_detail">订单详情</string>
 </resources>
--
libgit2 0.21.0