|
@@ -1,11 +1,13 @@
|
|
|
package com.wdkl.callingmainnurse.ui.fragment;
|
|
|
|
|
|
import android.annotation.SuppressLint;
|
|
|
+import android.content.DialogInterface;
|
|
|
import android.content.Intent;
|
|
|
import android.os.Bundle;
|
|
|
import android.os.Handler;
|
|
|
import android.os.Message;
|
|
|
import android.support.v4.widget.SwipeRefreshLayout;
|
|
|
+import android.support.v7.app.AlertDialog;
|
|
|
import android.support.v7.widget.GridLayoutManager;
|
|
|
import android.support.v7.widget.LinearLayoutManager;
|
|
|
import android.support.v7.widget.RecyclerView;
|
|
@@ -15,9 +17,12 @@ import android.view.LayoutInflater;
|
|
|
import android.view.MotionEvent;
|
|
|
import android.view.View;
|
|
|
import android.view.ViewGroup;
|
|
|
+import android.widget.AdapterView;
|
|
|
+import android.widget.ArrayAdapter;
|
|
|
import android.widget.ImageView;
|
|
|
import android.widget.LinearLayout;
|
|
|
import android.widget.ScrollView;
|
|
|
+import android.widget.Spinner;
|
|
|
import android.widget.TextView;
|
|
|
|
|
|
import com.google.gson.Gson;
|
|
@@ -158,6 +163,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
|
|
|
@Bind(R.id.fragment_call_sickbed_room_tv_list_title)
|
|
|
TextView tvTitle;
|
|
|
+
|
|
|
+ @Bind(R.id.tv_part_title)
|
|
|
+ TextView tvPartTitle;
|
|
|
+
|
|
|
/**
|
|
|
* 病房适配器
|
|
|
*/
|
|
@@ -440,6 +449,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
vRightPatientInfo.setVisibility(View.VISIBLE);
|
|
|
vRightCallInfo.setVisibility(View.GONE);
|
|
|
vRightCallListInfo.setVisibility(View.GONE);
|
|
|
+ tvPartTitle.setText("当前科室: " + Constants.PartName);
|
|
|
//默认设置
|
|
|
rvCallBed.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
|
|
|
@Override
|
|
@@ -528,7 +538,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
//获得医院信息
|
|
|
getHospitalData();
|
|
|
//初始化排队信息栏数据
|
|
|
- initCallingQueuingInfo();
|
|
|
+ //initCallingQueuingInfo();
|
|
|
MainFragmentActivity.initCallVoiceShowProgress();//add by waderson 20190801 SIP通话音量不能保存?要动态设置??曹强的东西真搞不懂他
|
|
|
}
|
|
|
|
|
@@ -1031,12 +1041,13 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
}
|
|
|
//重置床位数据
|
|
|
if (position == 0) {
|
|
|
- sickbedInformationList = null;
|
|
|
- callListAdapter.updateList(((MyApplication) getActivity().getApplication()).callEntityList);
|
|
|
+ //sickbedInformationList = null;
|
|
|
+ //callListAdapter.updateList(((MyApplication) getActivity().getApplication()).callEntityList);
|
|
|
rvCallBed.setVisibility(View.GONE);
|
|
|
rvCallList.setVisibility(View.VISIBLE);
|
|
|
llBgList.setBackgroundResource(R.mipmap.bg_call_list);
|
|
|
- tvTitle.setText("呼叫列表");
|
|
|
+ //tvTitle.setText("呼叫列表");
|
|
|
+ showPartSelectDialog();
|
|
|
} else {
|
|
|
llBgList.setBackgroundResource(R.mipmap.bg_bed_list);
|
|
|
tvTitle.setText("床位列表");
|
|
@@ -1118,6 +1129,38 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void showPartSelectDialog() {
|
|
|
+ final String[] partItems = {Constants.PartName}; //test
|
|
|
+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
|
|
+ builder.setTitle("请选择科室");
|
|
|
+ builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(DialogInterface dialog, int which) {
|
|
|
+ //
|
|
|
+ }
|
|
|
+ });
|
|
|
+ AlertDialog dialog = builder.create();
|
|
|
+ //dialog.setCanceledOnTouchOutside(false);
|
|
|
+ View dialogView = View.inflate(getActivity(), R.layout.dialog_part_select_layout, null);
|
|
|
+ ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_item, partItems);
|
|
|
+ spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
|
+ Spinner partSpinner = dialogView.findViewById(R.id.sp_part_select);
|
|
|
+ partSpinner.setAdapter(spinnerAdapter);
|
|
|
+ partSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
|
|
+ @Override
|
|
|
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
|
|
+ Log.d("wzl", "on item selected: " + position);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onNothingSelected(AdapterView<?> parent) {
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+ dialog.setView(dialogView);
|
|
|
+ dialog.show();
|
|
|
+ }
|
|
|
+
|
|
|
private void setPatientView(RoomEntity.WardInformation.SickbedInformation bedEntity) {
|
|
|
if (null != bedEntity) {
|
|
|
tvRoomBedAnswerState.setText(wardInformationList.get(this.position).getRoomNum() + "房" + bedEntity.getBedNum() + "床");
|