页面备注添加

dev
李桢 1 year ago
parent 5672fac09c
commit 6c130f9265
  1. 6
      app/src/main/java/com/unionmed/unionmedtv/activity/AddressSelectActivity.java
  2. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/DoctorActivity.java
  3. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/DoctorDetailActivity.java
  4. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/GroupDetailActivity.java
  5. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/GroupMsgActivity.java
  6. 10
      app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java
  7. 5
      app/src/main/java/com/unionmed/unionmedtv/activity/HospitalActivity.java
  8. 26
      app/src/main/java/com/unionmed/unionmedtv/activity/HospitalDetailActivity.java
  9. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/MsgActivity.java
  10. 4
      app/src/main/java/com/unionmed/unionmedtv/activity/MsgDetailActivity.java
  11. 3
      app/src/main/java/com/unionmed/unionmedtv/activity/VideoCallActivity.java
  12. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/DoctorAdapter.java
  13. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/GroupItemAdapter.java
  14. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/GroupMsgListAdapter.java
  15. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalAdapter.java
  16. 102
      app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDetailAdapter.java
  17. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/HospitalDoctorAdapter.java
  18. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/MsgItemAdapter.java
  19. 27
      app/src/main/java/com/unionmed/unionmedtv/adapter/MsgListAdapter.java
  20. 3
      app/src/main/java/com/unionmed/unionmedtv/adapter/RemoteAdapter.java
  21. 4
      app/src/main/java/com/unionmed/unionmedtv/fragment/GroupMsgFragment.java
  22. 4
      app/src/main/java/com/unionmed/unionmedtv/fragment/MsgFragment.java
  23. 5
      app/src/main/java/com/unionmed/unionmedtv/fragment/MyDoctorFragment.java
  24. 2
      app/src/main/res/layout/activity_group_msg.xml

@ -28,9 +28,14 @@ import com.unionmed.unionmedtv.utils.Constants;
import java.util.ArrayList;
import java.util.List;
/**
* 地址切换
*/
public class AddressSelectActivity extends BaseActivity {
private LabelsView labelview;
private List<City> list = new ArrayList<>();
public static void StartActivity(Context context) {
Intent intent = new Intent(context, AddressSelectActivity.class);
context.startActivity(intent);
@ -59,6 +64,7 @@ public class AddressSelectActivity extends BaseActivity {
});
}
public void loadData() {
EasyConfig.getInstance().addHeader("cur_version", AppUtils.getAppVersionName()).addHeader("token", CacheUtil.getToken().getToken());
EasyHttp.post(this)

@ -38,6 +38,9 @@ import java.util.List;
import me.jessyan.autosize.utils.LogUtils;
/**
* 附近医生
*/
public class DoctorActivity extends BaseActivity {
private RecyclerView recyclerView;
private DoctorAdapter doctorAdapter;

@ -50,6 +50,9 @@ import io.rong.calllib.RongCallCommon;
import io.rong.calllib.RongCallSession;
import io.rong.imlib.model.Conversation;
/**
* 医生详情
*/
public class DoctorDetailActivity extends BaseActivity implements View.OnClickListener {
private String userAccount = "";
private ImageView iv_image;

@ -53,6 +53,9 @@ import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.UserInfo;
/**
* 群详细信息
*/
public class GroupDetailActivity extends BaseActivity {
private TextView tv_name;

@ -36,6 +36,9 @@ import java.util.List;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
/**
* 群消息列表
*/
public class GroupMsgActivity extends BaseActivity implements View.OnClickListener {
private RecyclerView recyclerView;
private GroupMsgListAdapter msgListAdapter;

@ -45,6 +45,9 @@ import java.util.List;
import io.rong.imlib.RongCoreClient;
import io.rong.imlib.RongIMClient;
/**
* 首页
*/
public class HomeActivity extends BaseActivity implements View.OnFocusChangeListener, View.OnClickListener {
private ViewPager2 mViewPager;
private ArrayList<Fragment> fragments = new ArrayList<>();
@ -57,6 +60,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
private ImageView iv_msg;
private ImageView mIvNetwork;
private NetworkChangeReceiver networkChangeReceiver;
public static void StartActivity(Context context) {
Intent intent = new Intent(context, HomeActivity.class);
context.startActivity(intent);
@ -71,6 +75,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
initBroadCast();
initPermissions();
}
public void initPermissions() {
XXPermissions.with(HomeActivity.this)
// 申请单个权限
@ -100,6 +105,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
}
});
}
class NetworkChangeReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
@ -122,12 +128,14 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
}
}
}
private void initBroadCast() {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
networkChangeReceiver = new NetworkChangeReceiver();
registerReceiver(networkChangeReceiver, intentFilter);
}
public void initView() {
fragments.add(new MyDoctorFragment());
tv_my_doctor = findViewById(R.id.tv_my_doctor);
@ -199,6 +207,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
});
}
public static boolean connectIsSuccess(Context context) {
Log.i("TAG", "connectIsSuccess: ====================" + RongIMClient.getInstance()
.getCurrentConnectionStatus());
@ -216,6 +225,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
return true;
}
}
@Override
public void onFocusChange(View view, boolean b) {
if (view.getId() == R.id.tv_my_doctor) {

@ -22,9 +22,7 @@ import com.hjq.http.EasyHttp;
import com.hjq.http.listener.OnHttpListener;
import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.adapter.HospitalAdapter;
import com.unionmed.unionmedtv.adapter.HospitalDetailAdapter;
import com.unionmed.unionmedtv.api.GetHospitalApi;
import com.unionmed.unionmedtv.api.GetNearDoctorApi;
import com.unionmed.unionmedtv.base.BaseActivity;
import com.unionmed.unionmedtv.network.ApiResponse;
import com.unionmed.unionmedtv.network.HttpData;
@ -39,6 +37,9 @@ import java.util.List;
import me.jessyan.autosize.utils.LogUtils;
/**
* 附近医院
*/
public class HospitalActivity extends BaseActivity {
private RecyclerView recyclerView;
private HospitalAdapter hospitalAdapter;

@ -5,56 +5,36 @@ import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.widget.NestedScrollView;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.FocusHighlight;
import androidx.leanback.widget.FocusHighlightHelper;
import androidx.leanback.widget.ItemBridgeAdapter;
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.VerticalGridView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemChildClickListener;
import com.hjq.http.EasyHttp;
import com.hjq.http.listener.OnHttpListener;
import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.adapter.DoctorAdapter;
import com.unionmed.unionmedtv.adapter.HospitalDetailAdapter;
import com.unionmed.unionmedtv.adapter.HospitalDoctorAdapter;
import com.unionmed.unionmedtv.api.GetHospitalDetailApi;
import com.unionmed.unionmedtv.api.GetNearDoctorApi;
import com.unionmed.unionmedtv.base.BaseActivity;
import com.unionmed.unionmedtv.network.ApiResponse;
import com.unionmed.unionmedtv.network.HttpData;
import com.unionmed.unionmedtv.presenter.TypeDoctorPresenter;
import com.unionmed.unionmedtv.presenter.TypeHospitalPresenter;
import com.unionmed.unionmedtv.utils.CacheUtil;
import com.unionmed.unionmedtv.utils.FontDisplayUtil;
import com.unionmed.unionmedtv.utils.LinearSpacingItemDecoration;
import com.unionmed.unionmedtv.utils.MyGridLayoutManager;
import com.unionmed.unionmedtv.utils.OnChildClickListener;
import com.unionmed.unionmedtv.widgets.AppVerticalGridView;
import com.unionmed.unionmedtv.widgets.focus.MyItemBridgeAdapter;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import me.jessyan.autosize.utils.LogUtils;
/**
* 附近医院详情
*/
public class HospitalDetailActivity extends BaseActivity {
private RecyclerView recyclerView;
private HospitalDoctorAdapter doctorAdapter;

@ -54,6 +54,9 @@ import java.util.List;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
/**
* 消息通知列表
*/
public class MsgActivity extends BaseActivity {
private RecyclerView recyclerView;
private MsgListAdapter msgListAdapter;

@ -40,6 +40,9 @@ import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Message;
/**
* im消息详情列表
*/
public class MsgDetailActivity extends BaseActivity implements View.OnClickListener {
private RecyclerView recyclerView;
private MsgItemAdapter msgItemAdapter;
@ -49,6 +52,7 @@ public class MsgDetailActivity extends BaseActivity implements View.OnClickListe
private String groupId = "";
private String groupName = "";
private GroupMsgItemLinearLayoutManager msgItemLinearLayoutManager;
public static void StartActivity(Context context, String title, String groupId) {
Intent intent = new Intent(context, MsgDetailActivity.class);
intent.putExtra("title", title);

@ -67,6 +67,9 @@ import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Message;
import io.rong.imlib.model.UserInfo;
/**
* 视频通话界面
*/
public class VideoCallActivity extends BaseActivity implements View.OnClickListener {
/**
* @param context

@ -23,6 +23,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
/**
* 医生列表adapter
*/
public class DoctorAdapter extends BaseDelegateMultiAdapter<GetNearDoctorApi.DoctorInfo.MemberBean, BaseViewHolder> {
private OnChildClickListener onChildClickListener;

@ -36,6 +36,9 @@ import io.rong.imlib.model.UnknownMessage;
import io.rong.message.ImageMessage;
import io.rong.message.TextMessage;
/**
* 群信息成员adaptr
*/
public class GroupItemAdapter extends BaseQuickAdapter<GroupMemberModel, BaseViewHolder> {
public GroupItemAdapter(int layoutResId) {

@ -42,6 +42,9 @@ import java.util.Map;
import io.rong.imlib.model.Conversation;
/**
* 群列表左侧群名称adapter
*/
public class GroupMsgListAdapter extends BaseQuickAdapter<MyConversation, BaseViewHolder> {
private OnChildClickListener onChildClickListener;
private int postion = 0;

@ -22,6 +22,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
/**
* 医院列表adapter
*/
public class HospitalAdapter extends BaseDelegateMultiAdapter<GetHospitalApi.MemberBean, BaseViewHolder> {
private OnChildClickListener onChildClickListener;

@ -1,102 +0,0 @@
package com.unionmed.unionmedtv.adapter;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.api.GetNearDoctorApi;
import com.unionmed.unionmedtv.presenter.TypeDoctorPresenter;
import com.unionmed.unionmedtv.utils.OnChildClickListener;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class HospitalDetailAdapter extends BaseQuickAdapter<GetNearDoctorApi.DoctorInfo.MemberBean,BaseViewHolder>{
private OnChildClickListener onChildClickListener;
public HospitalDetailAdapter(int layoutResId, @Nullable List<GetNearDoctorApi.DoctorInfo.MemberBean> data, OnChildClickListener onChildClickListener) {
super(layoutResId, data);
this.onChildClickListener=onChildClickListener;
}
@Override
protected void convert(@NotNull BaseViewHolder vh, GetNearDoctorApi.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 (!TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getDepartment())
&& !TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getZc())) {//部门职称都不为null
tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment()
+ " | " + memberBean.getPersoninfo().get(0).getZc());
} else if (TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getDepartment())
&& TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getZc())) {//部门职称都为null
tv_dept.setText("- -");
} else if (!TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getDepartment())
&& TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getZc())) {//部门不为null,职称为null
tv_dept.setText(memberBean.getPersoninfo().get(0).getDepartment());
} else if (TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getDepartment())
&& !TextUtils.isEmpty(memberBean.getPersoninfo().get(0).getZc())) {//部门为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
public void onClick(View view) {
onChildClickListener.onChildClick(view,vh.getLayoutPosition(),memberBean);
}
});
}
}

@ -22,6 +22,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
/**
* 医院详情页面下医生列表adapter
*/
public class HospitalDoctorAdapter extends BaseQuickAdapter<GetHospitalDetailApi.DoctorsBean, BaseViewHolder> {
private OnChildClickListener onChildClickListener;

@ -62,6 +62,9 @@ import io.rong.imlib.model.UnknownMessage;
import io.rong.message.ImageMessage;
import io.rong.message.TextMessage;
/**
* 消息详情列表adapter
*/
public class MsgItemAdapter extends BaseDelegateMultiAdapter<Message, BaseViewHolder> {
private OnChildClickListener onChildClickListener;
private String name;

@ -1,55 +1,34 @@
package com.unionmed.unionmedtv.adapter;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.lifecycle.LifecycleOwner;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseDelegateMultiAdapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.delegate.BaseMultiTypeDelegate;
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.hjq.http.EasyHttp;
import com.hjq.http.listener.OnHttpListener;
import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.activity.MsgActivity;
import com.unionmed.unionmedtv.activity.VideoCallActivity;
import com.unionmed.unionmedtv.api.GetGroupInfo;
import com.unionmed.unionmedtv.api.GetImUserInfoApi;
import com.unionmed.unionmedtv.api.GetNearDoctorApi;
import com.unionmed.unionmedtv.bean.ImUserInfoBean;
import com.unionmed.unionmedtv.bean.MyConversation;
import com.unionmed.unionmedtv.livedatas.LiveDataBus;
import com.unionmed.unionmedtv.network.ApiResponse;
import com.unionmed.unionmedtv.network.HttpData;
import com.unionmed.unionmedtv.utils.CacheUtil;
import com.unionmed.unionmedtv.utils.Constants;
import com.unionmed.unionmedtv.utils.OnChildClickListener;
import com.unionmed.unionmedtv.utils.UserInfoByServerUtil;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Group;
/**
* 消息通知左侧列表adapter
*/
public class MsgListAdapter extends BaseQuickAdapter<MyConversation, BaseViewHolder> {
private OnChildClickListener onChildClickListener;
private int postion = 0;

@ -26,6 +26,9 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
/**
* 视频通话成员adapter
*/
public class RemoteAdapter extends BaseQuickAdapter<RemoteBean, BaseViewHolder> {
private OnChildClickListener onChildClickListener;

@ -30,7 +30,9 @@ import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Message;
/**
* 群消息右侧消息详情
*/
public class GroupMsgFragment extends Fragment implements View.OnClickListener {
private RecyclerView recyclerView;
private MsgItemAdapter msgItemAdapter;

@ -40,7 +40,9 @@ import io.rong.imlib.model.HistoryMessageOption;
import io.rong.imlib.model.Message;
import io.rong.message.TextMessage;
/**
* 消息通知右侧详情
*/
public class MsgFragment extends Fragment implements View.OnClickListener {
private RecyclerView recyclerView;
private MsgItemAdapter msgItemAdapter;

@ -42,7 +42,9 @@ import java.util.List;
import me.jessyan.autosize.utils.LogUtils;
/**
* 首页我的医生
*/
public class MyDoctorFragment extends Fragment implements View.OnClickListener {
private RecyclerView recyclerView;
private ContractedDoctorAdapter contractedDoctorAdapter;
@ -55,6 +57,7 @@ public class MyDoctorFragment extends Fragment implements View.OnClickListener {
private int selectPostion = 0;//当前列表item点击位置
private ImgConstraintLayout constraint_doctor;
private ImgConstraintLayout constraint_hospital;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_my_doctor, container, false);

@ -36,7 +36,7 @@
<LinearLayout
android:layout_width="275dp"
android:layout_width="375dp"
android:layout_height="match_parent"
android:background="#0B2D45"
android:orientation="vertical">

Loading…
Cancel
Save