From 0a5e09de1ce672ca104c1c88080be8787cff6ccd Mon Sep 17 00:00:00 2001 From: linminjie <1004644107@qq.com> Date: Tue, 6 Jun 2023 10:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=B7=BB=E5=8A=A0toast=E4=BF=A1=E6=81=AF=20=20?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/ContractedDoctorAdapter.java | 117 +++++++++++---------- .../unionmed/unionmedtv/adapter/DoctorAdapter.java | 3 +- .../unionmedtv/adapter/HospitalDetailAdapter.java | 3 +- .../unionmedtv/fragment/MyDoctorFragment.java | 2 +- .../activity/fragment/LoginAccountFragment.java | 16 +-- .../activity/fragment/LoginPhoneFragment.java | 40 +++---- .../unionmedtv/presenter/TypeDoctorPresenter.java | 3 +- app/src/main/res/layout/activity_doctor.xml | 2 +- app/src/main/res/layout/activity_doctor_detail.xml | 15 ++- 9 files changed, 109 insertions(+), 92 deletions(-) diff --git a/app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java b/app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java index 8c4b906..f5a1256 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java +++ b/app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java @@ -1,5 +1,6 @@ package com.unionmed.unionmedtv.adapter; +import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -32,64 +33,64 @@ public class ContractedDoctorAdapter extends BaseQuickAdapter void onChildClick(View view, int position, T data) { selectPostion = position; - GetNearDoctorApi.DoctorInfo.MemberBean memberBean = (GetNearDoctorApi.DoctorInfo.MemberBean) data; + GetContractedDoctorApi.DoctorInfo.MemberBean memberBean = (GetContractedDoctorApi.DoctorInfo.MemberBean) data; DoctorDetailActivity.StartActivity(getActivity(), memberBean.getPersoninfo().get(0).getUseraccount()); } }); diff --git a/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java b/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java index 4b74b92..502fc10 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java +++ b/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java @@ -115,7 +115,7 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen return; } if (TextUtils.isEmpty(edit_password.getText().toString())) { - ToastUtils.showLong( "请输入密码"); + ToastUtils.showLong("请输入密码"); return; } AccountLogin(edit_phone.getText().toString(), @@ -150,7 +150,7 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen tokenBean.getMobile(), tokenBean.getName(), tokenBean.getPreRegion().getPkey() - ); + ); } else { // CacheUtil.setToken(null); new XPopup.Builder(getActivity()).isRequestFocus(true) @@ -166,7 +166,11 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen } })).show(); } + } else { + ToastUtils.showLong(apiResponseHttpData.getData().getMessage()); } + } else { + ToastUtils.showLong(apiResponseHttpData.getMessage()); } } @@ -179,9 +183,9 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen }); } - public void getAreaLogn(String identity_id, String mobile, String name,String pkey ) { + public void getAreaLogn(String identity_id, String mobile, String name, String pkey) { EasyHttp.post(this) - .api(new AreaLoginApi(identity_id, mobile, name,pkey)) + .api(new AreaLoginApi(identity_id, mobile, name, pkey)) .request(new OnHttpListener>>() { @Override public void onSucceed(HttpData> personInfoBeanHttpData) { @@ -189,11 +193,11 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen if (personInfoBeanHttpData.getData().getCode() == 200) { CacheUtil.saveUserToken(personInfoBeanHttpData.getData().getData().getUserToken()); HomeActivity.StartActivity(getActivity()); - }else { + } else { CacheUtil.setToken(null); ToastUtils.showLong(personInfoBeanHttpData.getMessage()); } - }else { + } else { CacheUtil.setToken(null); ToastUtils.showLong(personInfoBeanHttpData.getMessage()); } diff --git a/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java b/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java index d3b449f..8feb028 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java +++ b/app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java @@ -103,17 +103,17 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener .commitNow(); } else if (view.getId() == R.id.tv_getVerification) {//获取验证码 if (TextUtils.isEmpty(edit_phone.getText())) { - ToastUtils.showLong( "请输入手机号"); + ToastUtils.showLong("请输入手机号"); return; } getCode(edit_phone.getText().toString()); } else if (view.getId() == R.id.tv_login) {//登录 if (TextUtils.isEmpty(edit_phone.getText())) { - ToastUtils.showLong( "请输入手机号"); + ToastUtils.showLong("请输入手机号"); return; } if (TextUtils.isEmpty(edit_code.getText())) { - ToastUtils.showLong( "请输入验证码"); + ToastUtils.showLong("请输入验证码"); return; } @@ -130,7 +130,7 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener @Override public void onSucceed(HttpData> apiResponseHttpData) { LogUtils.e("成功：" + apiResponseHttpData); - ToastUtils.showLong( "获取验证码成功"); + ToastUtils.showLong("获取验证码成功"); if (apiResponseHttpData.isRequestSucceed()) { if (apiResponseHttpData.getData().getCode() == 200) { tv_getVerification.setEnabled(false); @@ -152,7 +152,7 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener @Override public void onFail(Exception e) { - ToastUtils.showLong( "获取验证码失败"); + ToastUtils.showLong("获取验证码失败"); LogUtils.e("失败：" + e); } }); @@ -184,44 +184,48 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener tokenBean.getMobile(), tokenBean.getName(), tokenBean.getToken()); - }else { + } else { CacheUtil.setToken(null); new XPopup.Builder(getActivity()).isRequestFocus(true) .asCustom(new TipDialog(getActivity(), "请先前往手机app进行实名认证，认证成功后才可登录", new TipDialog.DialogClick() { - @Override - public void cancel() { + @Override + public void cancel() { - } + } - @Override - public void confirm() { + @Override + public void confirm() { - } - })).show(); + } + })).show(); } + } else { + ToastUtils.showLong(apiResponseHttpData.getData().getMessage()); } + } else { + ToastUtils.showLong(apiResponseHttpData.getMessage()); } } @Override public void onFail(Exception e) { - ToastUtils.showLong( "登录失败"); + ToastUtils.showLong("登录失败"); LogUtils.e("失败：" + e); } }); } - public void getAreaLogn(String identity_id, String mobile, String name,String token) { + public void getAreaLogn(String identity_id, String mobile, String name, String token) { EasyHttp.post(this) - .api(new AreaLoginApi(identity_id, mobile, name,token)) + .api(new AreaLoginApi(identity_id, mobile, name, token)) .request(new OnHttpListener>() { @Override public void onSucceed(HttpData personInfoBeanHttpData) { - if(personInfoBeanHttpData.isRequestSucceed()) { + if (personInfoBeanHttpData.isRequestSucceed()) { CacheUtil.saveUserToken(personInfoBeanHttpData.getData().getUserToken()); HomeActivity.StartActivity(getActivity()); - }else { + } else { CacheUtil.setToken(null); ToastUtils.showLong(personInfoBeanHttpData.getMessage()); } diff --git a/app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java b/app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java index 33c56b0..f75e312 100644 --- a/app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java +++ b/app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java @@ -2,6 +2,7 @@ package com.unionmed.unionmedtv.presenter; import android.annotation.SuppressLint; import android.content.Context; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -83,7 +84,7 @@ public class TypeDoctorPresenter extends Presenter { } else { vh.iv_sex.setImageDrawable(mContext.getResources().getDrawable(R.drawable.icon_sex_girl)); } - if (memberBean.getDistance().isEmpty()) { + if (TextUtils.isEmpty(memberBean.getDistance())) { vh.tv_distance.setVisibility(View.GONE); }else { vh.tv_distance.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/layout/activity_doctor.xml b/app/src/main/res/layout/activity_doctor.xml index 485e50d..af37246 100644 --- a/app/src/main/res/layout/activity_doctor.xml +++ b/app/src/main/res/layout/activity_doctor.xml @@ -44,7 +44,7 @@ android:layout_marginLeft="12dp" android:layout_width="match_parent" android:layout_height="match_parent" - android:hint="请输入医院名称" + android:hint="请输入医生名称" android:focusable="true" android:focusableInTouchMode="true" android:background="@null" diff --git a/app/src/main/res/layout/activity_doctor_detail.xml b/app/src/main/res/layout/activity_doctor_detail.xml index 388df57..3c374dd 100644 --- a/app/src/main/res/layout/activity_doctor_detail.xml +++ b/app/src/main/res/layout/activity_doctor_detail.xml @@ -45,6 +45,7 @@ android:layout_height="250dp" android:layout_marginLeft="93dp" android:layout_marginTop="35dp" + android:scaleType="centerCrop" android:src="@color/design_default_color_background" /> @@ -68,7 +69,7 @@ android:layout_marginTop="14dp" android:layout_toRightOf="@+id/tv_name" android:gravity="center" - android:text="内科门诊｜主任医师" + tools:text="内科门诊｜主任医师" android:textColor="@color/white_f1f1f1" android:textSize="16sp" /> @@ -80,12 +81,13 @@ android:layout_below="@+id/tv_name" android:layout_alignLeft="@+id/tv_name" android:layout_marginTop="33dp" - android:text="所属医院：福建省医科大学附属协和医院" + tools:text="所属医院：福建省医科大学附属协和医院" android:textColor="@color/grey_c0cbd1" android:textSize="16sp" /> @@ -113,7 +117,7 @@ android:id="@+id/lin_video" android:layout_width="139dp" android:layout_height="45dp" - android:layout_below="@+id/tv_doctor_brief" + android:layout_alignBottom="@+id/iv_image" android:layout_alignLeft="@+id/tv_doctor_brief" android:layout_marginTop="26dp" android:background="@drawable/btn_select" @@ -146,6 +150,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="26dp" android:layout_toRightOf="@+id/lin_video" + android:layout_alignBottom="@+id/iv_image" android:background="@drawable/btn_select" android:clickable="true" android:focusable="true"