Commit 7fa6a0f8f9916ef13355e996b84d5f3f7ecd0476
1 parent
3909048b
Exists in
yxb_dev
and in
2 other branches
no message
Showing
2 changed files
with
12 additions
and
6 deletions
Show diff stats
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; | 33 | + LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback; |
| 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,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -53,7 +53,9 @@ 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 | + layout_feedback = view.findViewById(R.id.layout_feedback); | ||
| 56 | layout_about.setOnClickListener(this); | 57 | layout_about.setOnClickListener(this); |
| 58 | + layout_feedback.setOnClickListener(this); | ||
| 57 | layout_cache.setOnClickListener(this); | 59 | layout_cache.setOnClickListener(this); |
| 58 | childlayout.setOnClickListener(this); | 60 | childlayout.setOnClickListener(this); |
| 59 | personinfo.setOnClickListener(this); | 61 | personinfo.setOnClickListener(this); |
| @@ -75,9 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -75,9 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 75 | if (AppConfig.ISLOGIN) { | 77 | if (AppConfig.ISLOGIN) { |
| 76 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); | 78 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); |
| 77 | if (!TextUtils.isEmpty(url)) { | 79 | if (!TextUtils.isEmpty(url)) { |
| 78 | - GlideUtils.showImg(getContext(),user_photo,url); | 80 | + GlideUtils.showImg(getContext(), user_photo, url); |
| 79 | } else { | 81 | } else { |
| 80 | - GlideUtils.showImg(getContext(),user_photo,url); | 82 | + GlideUtils.showImg(getContext(), user_photo, url); |
| 81 | user_photo.setCornerRadius(20); | 83 | user_photo.setCornerRadius(20); |
| 82 | } | 84 | } |
| 83 | user_photo.setCornerRadius(20); | 85 | user_photo.setCornerRadius(20); |
| @@ -85,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -85,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 85 | user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME)); | 87 | user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME)); |
| 86 | user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); | 88 | user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME)); |
| 87 | user_mobile.setVisibility(View.VISIBLE); | 89 | user_mobile.setVisibility(View.VISIBLE); |
| 88 | - }else { | 90 | + } else { |
| 89 | user_name.setVisibility(View.VISIBLE); | 91 | user_name.setVisibility(View.VISIBLE); |
| 90 | user_mobile.setVisibility(View.GONE); | 92 | user_mobile.setVisibility(View.GONE); |
| 91 | } | 93 | } |
| @@ -121,7 +123,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -121,7 +123,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 121 | clearMyCache(); | 123 | clearMyCache(); |
| 122 | break; | 124 | break; |
| 123 | case R.id.layout_about: | 125 | case R.id.layout_about: |
| 124 | - WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1); | 126 | + WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "About.html", -1); |
| 127 | + break; | ||
| 128 | + case R.id.layout_feedback: | ||
| 129 | + WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "FeedBack.aspx?userid=" + AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID), -1); | ||
| 125 | break; | 130 | break; |
| 126 | default: | 131 | default: |
| 127 | break; | 132 | break; |
| @@ -157,7 +162,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -157,7 +162,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 157 | } | 162 | } |
| 158 | 163 | ||
| 159 | private void clearUerinfo() { | 164 | private void clearUerinfo() { |
| 160 | - if(AppConfig.ISLOGIN) { | 165 | + if (AppConfig.ISLOGIN) { |
| 161 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, ""); | 166 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, ""); |
| 162 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, ""); | 167 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, ""); |
| 163 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, ""); | 168 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, ""); |
app/src/main/res/layout/fragment_mine.xml
| @@ -239,6 +239,7 @@ | @@ -239,6 +239,7 @@ | ||
| 239 | android:orientation="vertical"> | 239 | android:orientation="vertical"> |
| 240 | 240 | ||
| 241 | <LinearLayout | 241 | <LinearLayout |
| 242 | + android:id="@+id/layout_feedback" | ||
| 242 | android:layout_width="match_parent" | 243 | android:layout_width="match_parent" |
| 243 | android:gravity="center_vertical" | 244 | android:gravity="center_vertical" |
| 244 | android:layout_height="?android:actionBarSize"> | 245 | android:layout_height="?android:actionBarSize"> |