Commit 49d6fe65b6a98d0e1e827532c09100825caad73d
1 parent
9b095404
Exists in
yxb_dev
and in
2 other branches
no message
Showing
9 changed files
with
36 additions
and
25 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -128,7 +128,9 @@ | @@ -128,7 +128,9 @@ | ||
| 128 | <activity | 128 | <activity |
| 129 | android:name=".ui.activity.MyChildActivity" | 129 | android:name=".ui.activity.MyChildActivity" |
| 130 | android:screenOrientation="portrait"/> | 130 | android:screenOrientation="portrait"/> |
| 131 | - <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"/> | 131 | + <activity android:name=".ui.activity.consult.ConsultOneLevelActivity" |
| 132 | + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" | ||
| 133 | + /> | ||
| 132 | <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> --> | 134 | <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> --> |
| 133 | <activity | 135 | <activity |
| 134 | android:name=".ui.MainActivity" | 136 | android:name=".ui.MainActivity" |
| @@ -175,6 +177,7 @@ | @@ -175,6 +177,7 @@ | ||
| 175 | android:screenOrientation="portrait" /> | 177 | android:screenOrientation="portrait" /> |
| 176 | 178 | ||
| 177 | <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity" | 179 | <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity" |
| 180 | + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" | ||
| 178 | android:launchMode="singleInstance"/> | 181 | android:launchMode="singleInstance"/> |
| 179 | 182 | ||
| 180 | <activity android:name=".ui.activity.orderdetail.OrderDetailActivity" | 183 | <activity android:name=".ui.activity.orderdetail.OrderDetailActivity" |
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
| @@ -95,9 +95,6 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | @@ -95,9 +95,6 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | ||
| 95 | mIView.showChannel(channelList); | 95 | mIView.showChannel(channelList); |
| 96 | mIView.showContext(contextList); | 96 | mIView.showContext(contextList); |
| 97 | 97 | ||
| 98 | - | ||
| 99 | - | ||
| 100 | - | ||
| 101 | } | 98 | } |
| 102 | }, new Consumer<Throwable>() { | 99 | }, new Consumer<Throwable>() { |
| 103 | @Override | 100 | @Override |
app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
| @@ -45,7 +45,7 @@ import java.util.List; | @@ -45,7 +45,7 @@ import java.util.List; | ||
| 45 | public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel> | 45 | public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel> |
| 46 | implements MyChildContract.IMyChildView, View.OnClickListener { | 46 | implements MyChildContract.IMyChildView, View.OnClickListener { |
| 47 | SwipeMenuRecyclerView child_recycle; | 47 | SwipeMenuRecyclerView child_recycle; |
| 48 | - TextView center_title, add_child, go_buy; | 48 | + TextView center_title, add_child, go_buy; |
| 49 | ImageView back; | 49 | ImageView back; |
| 50 | ChildAdapter childAdapter; | 50 | ChildAdapter childAdapter; |
| 51 | List<ChildBean> currlist = new ArrayList<>(); | 51 | List<ChildBean> currlist = new ArrayList<>(); |
| @@ -127,7 +127,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi | @@ -127,7 +127,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi | ||
| 127 | Bundle bundle = new Bundle(); | 127 | Bundle bundle = new Bundle(); |
| 128 | bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + | 128 | bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + |
| 129 | AppConfig.getAppConfig(this).get(AppConfig.USER_ID)); | 129 | AppConfig.getAppConfig(this).get(AppConfig.USER_ID)); |
| 130 | - bundle.putInt("type",AppConfig.ORDER_CENTER); | 130 | + bundle.putInt("type", AppConfig.ORDER_CENTER); |
| 131 | startNewActivity(WebViewActivity.class, bundle); | 131 | startNewActivity(WebViewActivity.class, bundle); |
| 132 | } | 132 | } |
| 133 | } | 133 | } |
| @@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi | @@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi | ||
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | @Override | 148 | @Override |
| 149 | - public void addChildSuccess(String account,String password) { | 149 | + public void addChildSuccess(String account, String password) { |
| 150 | 150 | ||
| 151 | } | 151 | } |
| 152 | 152 |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| @@ -239,7 +239,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | @@ -239,7 +239,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | ||
| 239 | first = false; | 239 | first = false; |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | - | ||
| 243 | } | 242 | } |
| 244 | 243 | ||
| 245 | @Override | 244 | @Override |
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
| @@ -30,7 +30,7 @@ import com.shunzhi.parent.util.GlideUtils; | @@ -30,7 +30,7 @@ import com.shunzhi.parent.util.GlideUtils; | ||
| 30 | 30 | ||
| 31 | public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> | 31 | public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> |
| 32 | implements MineContract.IMineView, View.OnClickListener { | 32 | implements MineContract.IMineView, View.OnClickListener { |
| 33 | - LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about,layoutAdvice; | 33 | + LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layoutAdvice; |
| 34 | RoundedImageView user_photo; | 34 | RoundedImageView user_photo; |
| 35 | TextView user_name, user_mobile, tvExit, binding_state; | 35 | TextView user_name, user_mobile, tvExit, binding_state; |
| 36 | 36 | ||
| @@ -53,7 +53,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -53,7 +53,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 53 | layout_orderDetail = view.findViewById(R.id.layout_orderDetail); | 53 | layout_orderDetail = view.findViewById(R.id.layout_orderDetail); |
| 54 | layout_cache = view.findViewById(R.id.layout_cache); | 54 | layout_cache = view.findViewById(R.id.layout_cache); |
| 55 | layout_about = view.findViewById(R.id.layout_about); | 55 | layout_about = view.findViewById(R.id.layout_about); |
| 56 | - layoutAdvice=view.findViewById(R.id.layoutAdvice); | 56 | + layoutAdvice = view.findViewById(R.id.layoutAdvice); |
| 57 | layoutAdvice.setOnClickListener(this); | 57 | layoutAdvice.setOnClickListener(this); |
| 58 | layout_about.setOnClickListener(this); | 58 | layout_about.setOnClickListener(this); |
| 59 | layout_cache.setOnClickListener(this); | 59 | layout_cache.setOnClickListener(this); |
| @@ -77,9 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -77,9 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 77 | if (AppConfig.ISLOGIN) { | 77 | if (AppConfig.ISLOGIN) { |
| 78 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); | 78 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); |
| 79 | if (!TextUtils.isEmpty(url)) { | 79 | if (!TextUtils.isEmpty(url)) { |
| 80 | - GlideUtils.showImg(getContext(),user_photo,url); | 80 | + GlideUtils.showImg(getContext(), user_photo, url); |
| 81 | } else { | 81 | } else { |
| 82 | - GlideUtils.showImg(getContext(),user_photo,url); | 82 | + GlideUtils.showImg(getContext(), user_photo, url); |
| 83 | user_photo.setCornerRadius(20); | 83 | user_photo.setCornerRadius(20); |
| 84 | } | 84 | } |
| 85 | user_photo.setCornerRadius(20); | 85 | user_photo.setCornerRadius(20); |
| @@ -87,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -87,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 87 | user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME)); | 87 | user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME)); |
| 88 | user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); | 88 | user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); |
| 89 | user_mobile.setVisibility(View.VISIBLE); | 89 | user_mobile.setVisibility(View.VISIBLE); |
| 90 | - }else { | 90 | + } else { |
| 91 | user_name.setVisibility(View.VISIBLE); | 91 | user_name.setVisibility(View.VISIBLE); |
| 92 | user_mobile.setVisibility(View.GONE); | 92 | user_mobile.setVisibility(View.GONE); |
| 93 | } | 93 | } |
| @@ -123,10 +123,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -123,10 +123,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 123 | clearMyCache(); | 123 | clearMyCache(); |
| 124 | break; | 124 | break; |
| 125 | case R.id.layout_about: | 125 | case R.id.layout_about: |
| 126 | - WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1); | 126 | + WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "About.html", -1); |
| 127 | break; | 127 | break; |
| 128 | case R.id.layoutAdvice: | 128 | case R.id.layoutAdvice: |
| 129 | - WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"FeedBack.aspx?userid="+AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID),-1); | 129 | + WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "FeedBack.aspx?userid=" + AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID), -1); |
| 130 | break; | 130 | break; |
| 131 | default: | 131 | default: |
| 132 | break; | 132 | break; |
| @@ -162,7 +162,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -162,7 +162,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | private void clearUerinfo() { | 164 | private void clearUerinfo() { |
| 165 | - if(AppConfig.ISLOGIN) { | 165 | + if (AppConfig.ISLOGIN) { |
| 166 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, ""); | 166 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, ""); |
| 167 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, ""); | 167 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, ""); |
| 168 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, ""); | 168 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, ""); |
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
| @@ -5,6 +5,7 @@ import android.support.annotation.NonNull; | @@ -5,6 +5,7 @@ import android.support.annotation.NonNull; | ||
| 5 | import android.support.annotation.Nullable; | 5 | import android.support.annotation.Nullable; |
| 6 | import android.support.v7.widget.LinearLayoutManager; | 6 | import android.support.v7.widget.LinearLayoutManager; |
| 7 | import android.support.v7.widget.RecyclerView; | 7 | import android.support.v7.widget.RecyclerView; |
| 8 | +import android.text.TextUtils; | ||
| 8 | import android.view.LayoutInflater; | 9 | import android.view.LayoutInflater; |
| 9 | import android.view.View; | 10 | import android.view.View; |
| 10 | import android.view.ViewGroup; | 11 | import android.view.ViewGroup; |
| @@ -99,6 +100,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon | @@ -99,6 +100,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon | ||
| 99 | } | 100 | } |
| 100 | 101 | ||
| 101 | public void showSearchContent(String keyword) { | 102 | public void showSearchContent(String keyword) { |
| 103 | + if (!TextUtils.isEmpty(keyword)) | ||
| 102 | mPresenter.getInformationTopic(keyword, AppContext.getInstance().district, channel, "0", 1); | 104 | mPresenter.getInformationTopic(keyword, AppContext.getInstance().district, channel, "0", 1); |
| 103 | } | 105 | } |
| 104 | 106 |
app/src/main/res/layout/layout_consult_content.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | - android:layout_height="wrap_content" | 4 | + android:layout_height="@dimen/size_dp_100" |
| 5 | android:layout_marginBottom="@dimen/size_dp_10" | 5 | android:layout_marginBottom="@dimen/size_dp_10" |
| 6 | android:orientation="vertical"> | 6 | android:orientation="vertical"> |
| 7 | 7 | ||
| @@ -17,15 +17,17 @@ | @@ -17,15 +17,17 @@ | ||
| 17 | android:layout_weight="4" | 17 | android:layout_weight="4" |
| 18 | android:elevation="@dimen/size_dp_3" | 18 | android:elevation="@dimen/size_dp_3" |
| 19 | android:orientation="vertical" | 19 | android:orientation="vertical" |
| 20 | - android:padding="@dimen/size_dp_5"> | 20 | + android:padding="@dimen/size_dp_4"> |
| 21 | 21 | ||
| 22 | <TextView | 22 | <TextView |
| 23 | android:id="@+id/tvConsultTitle" | 23 | android:id="@+id/tvConsultTitle" |
| 24 | android:layout_width="match_parent" | 24 | android:layout_width="match_parent" |
| 25 | - android:layout_height="wrap_content" | 25 | + android:layout_height="0dp" |
| 26 | + android:layout_weight="2" | ||
| 26 | android:ellipsize="end" | 27 | android:ellipsize="end" |
| 27 | android:gravity="center_vertical" | 28 | android:gravity="center_vertical" |
| 28 | android:maxLines="2" | 29 | android:maxLines="2" |
| 30 | + android:layout_gravity="top" | ||
| 29 | android:text="学校初一段家长统一测试使用家长慧得到良好反馈评价" | 31 | android:text="学校初一段家长统一测试使用家长慧得到良好反馈评价" |
| 30 | android:textColor="@color/textColor" | 32 | android:textColor="@color/textColor" |
| 31 | android:textSize="@dimen/textSize14" /> | 33 | android:textSize="@dimen/textSize14" /> |
| @@ -33,9 +35,11 @@ | @@ -33,9 +35,11 @@ | ||
| 33 | <TextView | 35 | <TextView |
| 34 | android:id="@+id/tvConsultContent" | 36 | android:id="@+id/tvConsultContent" |
| 35 | android:layout_width="match_parent" | 37 | android:layout_width="match_parent" |
| 36 | - android:layout_height="wrap_content" | 38 | + android:layout_height="0dp" |
| 39 | + android:layout_weight="1" | ||
| 37 | android:layout_marginTop="@dimen/size_dp_5" | 40 | android:layout_marginTop="@dimen/size_dp_5" |
| 38 | android:ellipsize="end" | 41 | android:ellipsize="end" |
| 42 | + android:layout_gravity="center_vertical" | ||
| 39 | android:gravity="center_vertical" | 43 | android:gravity="center_vertical" |
| 40 | android:maxLines="2" | 44 | android:maxLines="2" |
| 41 | android:singleLine="true" | 45 | android:singleLine="true" |
| @@ -44,15 +48,19 @@ | @@ -44,15 +48,19 @@ | ||
| 44 | android:textSize="@dimen/textSize14" /> | 48 | android:textSize="@dimen/textSize14" /> |
| 45 | 49 | ||
| 46 | <FrameLayout | 50 | <FrameLayout |
| 51 | + android:layout_gravity="bottom" | ||
| 47 | android:layout_width="match_parent" | 52 | android:layout_width="match_parent" |
| 48 | - android:layout_height="wrap_content" | 53 | + android:layout_height="0dp" |
| 54 | + android:layout_weight="1" | ||
| 49 | android:layout_marginTop="@dimen/size_dp_5"> | 55 | android:layout_marginTop="@dimen/size_dp_5"> |
| 50 | 56 | ||
| 51 | <RelativeLayout | 57 | <RelativeLayout |
| 58 | + android:layout_gravity="bottom" | ||
| 52 | android:layout_width="match_parent" | 59 | android:layout_width="match_parent" |
| 53 | android:layout_height="wrap_content"> | 60 | android:layout_height="wrap_content"> |
| 54 | 61 | ||
| 55 | <TextView | 62 | <TextView |
| 63 | + android:layout_centerVertical="true" | ||
| 56 | android:id="@+id/tvPingLunNums" | 64 | android:id="@+id/tvPingLunNums" |
| 57 | style="@style/TextView_Wrap_16" | 65 | style="@style/TextView_Wrap_16" |
| 58 | android:layout_gravity="center_vertical" | 66 | android:layout_gravity="center_vertical" |
| @@ -75,9 +83,11 @@ | @@ -75,9 +83,11 @@ | ||
| 75 | android:id="@+id/iv_consult" | 83 | android:id="@+id/iv_consult" |
| 76 | android:layout_width="0dp" | 84 | android:layout_width="0dp" |
| 77 | android:layout_height="match_parent" | 85 | android:layout_height="match_parent" |
| 78 | - android:layout_margin="@dimen/size_dp_2" | 86 | + android:layout_margin="@dimen/size_dp_4" |
| 79 | android:layout_weight="2" | 87 | android:layout_weight="2" |
| 88 | + android:scaleType="fitXY" | ||
| 80 | android:src="@color/xueqing_blue" /> | 89 | android:src="@color/xueqing_blue" /> |
| 90 | + | ||
| 81 | </LinearLayout> | 91 | </LinearLayout> |
| 82 | 92 | ||
| 83 | <FrameLayout | 93 | <FrameLayout |
app/src/main/res/menu/bottom_navigationview.xml
| @@ -3,13 +3,13 @@ | @@ -3,13 +3,13 @@ | ||
| 3 | 3 | ||
| 4 | <item android:id="@+id/menu_item_index" | 4 | <item android:id="@+id/menu_item_index" |
| 5 | android:icon="@drawable/selector_ceping" | 5 | android:icon="@drawable/selector_ceping" |
| 6 | - android:title="测评" | 6 | + android:title="慧测慧练" |
| 7 | ></item> | 7 | ></item> |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | <item android:id="@+id/menu_item_consult" | 10 | <item android:id="@+id/menu_item_consult" |
| 11 | android:icon="@drawable/selector_consult" | 11 | android:icon="@drawable/selector_consult" |
| 12 | - android:title="咨询频道" | 12 | + android:title="资讯频道" |
| 13 | ></item> | 13 | ></item> |
| 14 | 14 | ||
| 15 | 15 |
app/src/main/res/values/strings.xml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <!-- TODO: Remove or change this placeholder text --> | 4 | <!-- TODO: Remove or change this placeholder text --> |
| 5 | <string name="hello_blank_fragment">Hello blank fragment</string> | 5 | <string name="hello_blank_fragment">Hello blank fragment</string> |
| 6 | 6 | ||
| 7 | - <string name="ceping">测评</string> | 7 | + <string name="ceping">慧测慧练</string> |
| 8 | <string name="consult_huati">咨询话题</string> | 8 | <string name="consult_huati">咨询话题</string> |
| 9 | <string name="order_detail">订单详情</string> | 9 | <string name="order_detail">订单详情</string> |
| 10 | </resources> | 10 | </resources> |