部分接口失败添加toast信息 医生详情修改

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<GetContractedDocto
 
     @Override
     protected void convert(@NotNull BaseViewHolder vh, GetContractedDoctorApi.DoctorInfo.MemberBean memberBean) {
-//        TextView tv_online_status = vh.getView(R.id.tv_online_status);
-//        int drawable;
-//        if (memberBean.getOnline().equals("1")) {
-//            tv_online_status.setText("在线");
-//            tv_online_status.setBackground(getContext().getResources().getDrawable(R.drawable.shape_corner15_color_0bbac6));
-//            drawable = R.mipmap.icon_default_online;
-//        } else {
-//            tv_online_status.setText("离线");
-//            drawable = R.mipmap.icon_default_offline;
-//            tv_online_status.setBackground(getContext().getResources().getDrawable(R.drawable.shape_corner15_color_9a9a9a));
-//        }
-//        ImageView iv_photo = vh.getView(R.id.iv_photo);
-//        Glide.with(getContext())
-//                .load(memberBean.getPhoto())
-//                .apply(new RequestOptions()
-//                        .circleCrop()
-//                        .placeholder(drawable)
-//                        .circleCrop())
-//                .into(iv_photo);
-//        TextView tv_name = vh.getView(R.id.tv_name);
-//        tv_name.setText(memberBean.getName());
-//        TextView tv_dept = vh.getView(R.id.tv_dept);
-//        if (!memberBean.getPersoninfo().isEmpty()) {
-//            if (!memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
-//                    && !memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门职称都不为null
-//                tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment()
-//                        + " | " + memberBean.getPersoninfo().get(0).getZc());
-//            } else if (memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
-//                    && memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门职称都为null
-//                tv_dept.setText("- -");
-//            } else if (!memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
-//                    && memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门不为null，职称为null
-//                tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment());
-//            } else if (memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
-//                    && !memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门为null，职称不为null
-//                tv_dept.setText(memberBean.getPersoninfo().get(0).getZc());
-//            }
-//
-//
-//        } else {
-//            tv_dept.setText("- -");
-//            tv_dept.setText("- -");
-//        }
-//        TextView tv_hospital = vh.getView(R.id.tv_hospital);
-//        tv_hospital.setText(memberBean.getPersoninfo().get(0).getChosname());
-//        ImageView iv_sex = vh.getView(R.id.iv_sex);
-//        if (memberBean.getSex().equals("男")) {
-//            iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_boy));
-//        } else {
-//            iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
-//        }
-//        TextView tv_distance = vh.getView(R.id.tv_distance);
-//        if (memberBean.getDistance().isEmpty()) {
-//            tv_distance.setVisibility(View.GONE);
-//        } else {
-//            tv_distance.setVisibility(View.VISIBLE);
-//            tv_distance.setText(memberBean.getDistance());
-//        }
+        TextView tv_online_status = vh.getView(R.id.tv_online_status);
+        int drawable;
+        if (memberBean.getOnline().equals("1")) {
+            tv_online_status.setText("在线");
+            tv_online_status.setBackground(getContext().getResources().getDrawable(R.drawable.shape_corner15_color_0bbac6));
+            drawable = R.mipmap.icon_default_online;
+        } else {
+            tv_online_status.setText("离线");
+            drawable = R.mipmap.icon_default_offline;
+            tv_online_status.setBackground(getContext().getResources().getDrawable(R.drawable.shape_corner15_color_9a9a9a));
+        }
+        ImageView iv_photo = vh.getView(R.id.iv_photo);
+        Glide.with(getContext())
+                .load(memberBean.getPhoto())
+                .apply(new RequestOptions()
+                        .circleCrop()
+                        .placeholder(drawable)
+                        .circleCrop())
+                .into(iv_photo);
+        TextView tv_name = vh.getView(R.id.tv_name);
+        tv_name.setText(memberBean.getName());
+        TextView tv_dept = vh.getView(R.id.tv_dept);
+        if (!memberBean.getPersoninfo().isEmpty()) {
+            if (!memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
+                    && !memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门职称都不为null
+                tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment()
+                        + " | " + memberBean.getPersoninfo().get(0).getZc());
+            } else if (memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
+                    && memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门职称都为null
+                tv_dept.setText("- -");
+            } else if (!memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
+                    && memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门不为null，职称为null
+                tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment());
+            } else if (memberBean.getPersoninfo().get(0).getDepartment().isEmpty()
+                    && !memberBean.getPersoninfo().get(0).getZc().isEmpty()) {//部门为null，职称不为null
+                tv_dept.setText(memberBean.getPersoninfo().get(0).getZc());
+            }
+
+
+        } else {
+            tv_dept.setText("- -");
+            tv_dept.setText("- -");
+        }
+        TextView tv_hospital = vh.getView(R.id.tv_hospital);
+        tv_hospital.setText(memberBean.getPersoninfo().get(0).getChosname());
+        ImageView iv_sex = vh.getView(R.id.iv_sex);
+        if (memberBean.getSex().equals("男")) {
+            iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_boy));
+        } else {
+            iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
+        }
+        TextView tv_distance = vh.getView(R.id.tv_distance);
+        if (TextUtils.isEmpty(memberBean.getDistance())) {
+            tv_distance.setVisibility(View.GONE);
+        } else {
+            tv_distance.setVisibility(View.VISIBLE);
+            tv_distance.setText(memberBean.getDistance());
+        }
 
         vh.itemView.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/unionmed/unionmedtv/adapter/DoctorAdapter.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;
@@ -102,7 +103,7 @@ public class DoctorAdapter extends BaseDelegateMultiAdapter<GetNearDoctorApi.Doc
                 iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
             }
             TextView tv_distance = vh.getView(R.id.tv_distance);
-            if (memberBean.getDistance().isEmpty()) {
+            if (TextUtils.isEmpty(memberBean.getDistance())) {
                 tv_distance.setVisibility(View.GONE);
             } else {
                 tv_distance.setVisibility(View.VISIBLE);

app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDetailAdapter.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;
@@ -84,7 +85,7 @@ public class HospitalDetailAdapter extends BaseQuickAdapter<GetNearDoctorApi.Doc
             iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
         }
         TextView tv_distance=vh.getView(R.id.tv_distance);
-        if (memberBean.getDistance().isEmpty()) {
+        if (TextUtils.isEmpty(memberBean.getDistance())) {
             tv_distance.setVisibility(View.GONE);
         }else {
             tv_distance.setVisibility(View.VISIBLE);

app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java

@@ -64,7 +64,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
             @Override
             public <T> 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());
             }
         });

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(),
@@ -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<HttpData<ApiResponse<AreaLoginApi>>>() {
                     @Override
                     public void onSucceed(HttpData<ApiResponse<AreaLoginApi>> 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());
                         }

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<ApiResponse<Object>> 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,7 +184,7 @@ 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() {
@@ -200,28 +200,32 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener
                                             })).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<HttpData<AreaLoginApi>>() {
                     @Override
                     public void onSucceed(HttpData<AreaLoginApi> personInfoBeanHttpData) {
-                        if(personInfoBeanHttpData.isRequestSucceed()) {
+                        if (personInfoBeanHttpData.isRequestSucceed()) {
                             CacheUtil.saveUserToken(personInfoBeanHttpData.getData().getUserToken());
                             HomeActivity.StartActivity(getActivity());
-                        }else {
+                        } else {
                             CacheUtil.setToken(null);
                             ToastUtils.showLong(personInfoBeanHttpData.getMessage());
                         }

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);

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"

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" />
 
                 <TextView
@@ -55,7 +56,7 @@
                     android:layout_marginLeft="24dp"
                     android:layout_marginTop="5dp"
                     android:layout_toRightOf="@+id/iv_image"
-                    android:text="谢航宇"
+                    tools:text="谢航宇"
                     android:textColor="@color/white_f1f1f1"
                     android:textSize="28sp" />
 
@@ -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" />
 
                 <TextView
                     android:id="@+id/tv_grade"
+                    android:visibility="gone"
                     android:layout_width="76dp"
                     android:layout_height="26dp"
                     android:layout_alignTop="@+id/tv_affiliation_hospital"
@@ -98,14 +100,16 @@
                     android:textColor="@color/white_f1f1f1" />
 
                 <TextView
+
                     android:id="@+id/tv_doctor_brief"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/tv_affiliation_hospital"
                     android:layout_alignLeft="@+id/tv_name"
+                    android:layout_above="@+id/lin_video"
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="80dp"
-                    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"