kljk
/
UnionMedTV
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
dev
李桢 1 year ago
parent fc92e272a4
commit 0a5e09de1c
9 changed files with 109 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 117
      app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java
  2. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/DoctorAdapter.java
  3. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDetailAdapter.java
  4. 2
      app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java
  5. 4
      app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java
  6. 4
      app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java
  7. 3
      app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java
  8. 2
      app/src/main/res/layout/activity_doctor.xml
  9. 15
      app/src/main/res/layout/activity_doctor_detail.xml

117
app/src/main/java/com/unionmed/unionmedtv/adapter/ContractedDoctorAdapter.java
Unescape View File

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

3
app/src/main/java/com/unionmed/unionmedtv/adapter/DoctorAdapter.java
Unescape View File

@ -1,5 +1,6 @@
package com.unionmed.unionmedtv.adapter; package com.unionmed.unionmedtv.adapter;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; 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)); iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
} }
TextView tv_distance = vh.getView(R.id.tv_distance); TextView tv_distance = vh.getView(R.id.tv_distance);
if (memberBean.getDistance().isEmpty()) { if (TextUtils.isEmpty(memberBean.getDistance())) {
tv_distance.setVisibility(View.GONE); tv_distance.setVisibility(View.GONE);
} else { } else {
tv_distance.setVisibility(View.VISIBLE); tv_distance.setVisibility(View.VISIBLE);

3
app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDetailAdapter.java
Unescape View File

@ -1,5 +1,6 @@
package com.unionmed.unionmedtv.adapter; package com.unionmed.unionmedtv.adapter;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; 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)); iv_sex.setImageDrawable(getContext().getResources().getDrawable(R.drawable.icon_sex_girl));
} }
TextView tv_distance=vh.getView(R.id.tv_distance); TextView tv_distance=vh.getView(R.id.tv_distance);
if (memberBean.getDistance().isEmpty()) { if (TextUtils.isEmpty(memberBean.getDistance())) {
tv_distance.setVisibility(View.GONE); tv_distance.setVisibility(View.GONE);
}else { }else {
tv_distance.setVisibility(View.VISIBLE); tv_distance.setVisibility(View.VISIBLE);

2
app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java
Unescape View File

@ -64,7 +64,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
@Override @Override
public <T> void onChildClick(View view, int position, T data) { public <T> void onChildClick(View view, int position, T data) {
selectPostion = position; 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()); DoctorDetailActivity.StartActivity(getActivity(), memberBean.getPersoninfo().get(0).getUseraccount());
} }
}); });

4
app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginAccountFragment.java
Unescape View File

@ -166,7 +166,11 @@ public class LoginAccountFragment extends Fragment implements View.OnClickListen
} }
})).show(); })).show();
} }
} else {
ToastUtils.showLong(apiResponseHttpData.getData().getMessage());
} }
} else {
ToastUtils.showLong(apiResponseHttpData.getMessage());
} }
} }

4
app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java
Unescape View File

@ -200,7 +200,11 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener
})).show(); })).show();
} }
} else {
ToastUtils.showLong(apiResponseHttpData.getData().getMessage());
} }
} else {
ToastUtils.showLong(apiResponseHttpData.getMessage());
} }
} }

3
app/src/main/java/com/unionmed/unionmedtv/presenter/TypeDoctorPresenter.java
Unescape View File

@ -2,6 +2,7 @@ package com.unionmed.unionmedtv.presenter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -83,7 +84,7 @@ public class TypeDoctorPresenter extends Presenter {
} else { } else {
vh.iv_sex.setImageDrawable(mContext.getResources().getDrawable(R.drawable.icon_sex_girl)); 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); vh.tv_distance.setVisibility(View.GONE);
}else { }else {
vh.tv_distance.setVisibility(View.VISIBLE); vh.tv_distance.setVisibility(View.VISIBLE);

2
app/src/main/res/layout/activity_doctor.xml
Unescape View File

@ -44,7 +44,7 @@
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:hint="请输入医院名称" android:hint="请输入医生名称"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:background="@null" android:background="@null"

15
app/src/main/res/layout/activity_doctor_detail.xml
Unescape View File

@ -45,6 +45,7 @@
android:layout_height="250dp" android:layout_height="250dp"
android:layout_marginLeft="93dp" android:layout_marginLeft="93dp"
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:scaleType="centerCrop"
android:src="@color/design_default_color_background" /> android:src="@color/design_default_color_background" />
<TextView <TextView
@ -55,7 +56,7 @@
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/iv_image" android:layout_toRightOf="@+id/iv_image"
android:text="谢航宇" tools:text="谢航宇"
android:textColor="@color/white_f1f1f1" android:textColor="@color/white_f1f1f1"
android:textSize="28sp" /> android:textSize="28sp" />
@ -68,7 +69,7 @@
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_toRightOf="@+id/tv_name" android:layout_toRightOf="@+id/tv_name"
android:gravity="center" android:gravity="center"
android:text="内科门诊｜主任医师" tools:text="内科门诊｜主任医师"
android:textColor="@color/white_f1f1f1" android:textColor="@color/white_f1f1f1"
android:textSize="16sp" /> android:textSize="16sp" />
@ -80,12 +81,13 @@
android:layout_below="@+id/tv_name" android:layout_below="@+id/tv_name"
android:layout_alignLeft="@+id/tv_name" android:layout_alignLeft="@+id/tv_name"
android:layout_marginTop="33dp" android:layout_marginTop="33dp"
android:text="所属医院：福建省医科大学附属协和医院" tools:text="所属医院：福建省医科大学附属协和医院"
android:textColor="@color/grey_c0cbd1" android:textColor="@color/grey_c0cbd1"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <TextView
android:id="@+id/tv_grade" android:id="@+id/tv_grade"
android:visibility="gone"
android:layout_width="76dp" android:layout_width="76dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_alignTop="@+id/tv_affiliation_hospital" android:layout_alignTop="@+id/tv_affiliation_hospital"
@ -98,14 +100,16 @@
android:textColor="@color/white_f1f1f1" /> android:textColor="@color/white_f1f1f1" />
<TextView <TextView
android:id="@+id/tv_doctor_brief" android:id="@+id/tv_doctor_brief"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_affiliation_hospital" android:layout_below="@+id/tv_affiliation_hospital"
android:layout_alignLeft="@+id/tv_name" android:layout_alignLeft="@+id/tv_name"
android:layout_above="@+id/lin_video"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginRight="80dp" android:layout_marginRight="80dp"
android:text="医生简介：主任医师，福建医科大学附属协和主任医师，福建医科大学附属协和医院体检中心主任，中华医学会福建健康管理学分会副主任委员；近年来特别关注疾病预防及慢性疾病的健康管理工作，使慢性疾病的诊治更加系统化。" tools:text="医生简介：主任医师，福建医科大学附属协和主任医师，福建医科大学附属协和医院体检中心主任，中华医学会福建健康管理学分会副主任委员；近年来特别关注疾病预防及慢性疾病的健康管理工作，使慢性疾病的诊治更加系统化。"
android:textColor="@color/grey_c0cbd1" android:textColor="@color/grey_c0cbd1"
android:textSize="16sp" /> android:textSize="16sp" />
@ -113,7 +117,7 @@
android:id="@+id/lin_video" android:id="@+id/lin_video"
android:layout_width="139dp" android:layout_width="139dp"
android:layout_height="45dp" 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_alignLeft="@+id/tv_doctor_brief"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:background="@drawable/btn_select" android:background="@drawable/btn_select"
@ -146,6 +150,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:layout_toRightOf="@+id/lin_video" android:layout_toRightOf="@+id/lin_video"
android:layout_alignBottom="@+id/iv_image"
android:background="@drawable/btn_select" android:background="@drawable/btn_select"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"

Write Preview
Loading…
Cancel
Save