Browse Source

<科室选择dialog修改,图标修改>

weizhengliang 5 years ago
parent
commit
1bfc616016

+ 6 - 9
app/src/main/java/com/wdkl/callingmainnurse/adapter/SicknessRoomAdapter.java

@@ -62,11 +62,9 @@ public class SicknessRoomAdapter extends RecyclerView.Adapter<SicknessRoomAdapte
         if (position == 0) {
         if (position == 0) {
             //设置第一个item的UI
             //设置第一个item的UI
             holder.standby_top_Img.setVisibility(View.GONE);
             holder.standby_top_Img.setVisibility(View.GONE);
-            //holder.tvBedNum.setVisibility(View.GONE);
-            //holder.tvRoomNum.setVisibility(View.GONE);
-            //holder.tvTitle.setVisibility(View.VISIBLE);
-            holder.tvRoomNum.setText("选择科室");
-            holder.tvBedNum.setText("");
+            holder.tvBedNum.setVisibility(View.GONE);
+            holder.tvRoomNum.setVisibility(View.GONE);
+            holder.tvTitle.setVisibility(View.VISIBLE);
 
 
             //获取全局的呼叫列表
             //获取全局的呼叫列表
             /*if (((MyApplication) mcontext.getApplicationContext()).callEntityList.size() > 0) {
             /*if (((MyApplication) mcontext.getApplicationContext()).callEntityList.size() > 0) {
@@ -115,15 +113,14 @@ public class SicknessRoomAdapter extends RecyclerView.Adapter<SicknessRoomAdapte
         //点中item 的逻辑
         //点中item 的逻辑
         //如果选中的是第一个
         //如果选中的是第一个
         if (selectedPosition == 0) {
         if (selectedPosition == 0) {
-            /*if (selectedPosition == position) {
+            if (selectedPosition == position) {
                 holder.rlCallMain.setBackgroundResource(R.mipmap.bg_call_list_p);
                 holder.rlCallMain.setBackgroundResource(R.mipmap.bg_call_list_p);
             } else {
             } else {
                 holder.rlCallMain.setBackgroundResource(R.mipmap.bg_stanby_n);
                 holder.rlCallMain.setBackgroundResource(R.mipmap.bg_stanby_n);
-            }*/
-            holder.rlCallMain.setBackgroundResource(R.mipmap.bg_stanby_n);
+            }
         } else {
         } else {
             if (position == 0) {
             if (position == 0) {
-                holder.rlCallMain.setBackgroundResource(R.mipmap.bg_stanby_n);
+                holder.rlCallMain.setBackgroundResource(R.mipmap.bg_call_list_p);
             } else {
             } else {
                 if (selectedPosition == position) {
                 if (selectedPosition == position) {
                     if (list.get(position).isNursing()) {
                     if (list.get(position).isNursing()) {

+ 11 - 10
app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -19,6 +19,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.ScrollView;
@@ -1132,19 +1133,13 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
     private void showPartSelectDialog() {
     private void showPartSelectDialog() {
         final String[] partItems = {Constants.PartName};  //test
         final String[] partItems = {Constants.PartName};  //test
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         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();
+        final AlertDialog dialog = builder.create();
         //dialog.setCanceledOnTouchOutside(false);
         //dialog.setCanceledOnTouchOutside(false);
         View dialogView = View.inflate(getActivity(), R.layout.dialog_part_select_layout, null);
         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);
+        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getActivity(), R.layout.custom_spinner_item, partItems);
+        spinnerAdapter.setDropDownViewResource(R.layout.custom_spinner_dropdown_item);
         Spinner partSpinner = dialogView.findViewById(R.id.sp_part_select);
         Spinner partSpinner = dialogView.findViewById(R.id.sp_part_select);
+        Button button = dialogView.findViewById(R.id.btn_ok);
         partSpinner.setAdapter(spinnerAdapter);
         partSpinner.setAdapter(spinnerAdapter);
         partSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
         partSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             @Override
@@ -1157,6 +1152,12 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
 
 
             }
             }
         });
         });
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
         dialog.setView(dialogView);
         dialog.setView(dialogView);
         dialog.show();
         dialog.show();
     }
     }

+ 8 - 0
app/src/main/res/layout/custom_spinner_dropdown_item.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/my_dropdown_item"
+    android:singleLine="true"
+    android:ellipsize="marquee"
+    android:textSize="24sp"/>

+ 9 - 0
app/src/main/res/layout/custom_spinner_item.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/my_spinner_item"
+    android:singleLine="true"
+    android:ellipsize="marquee"
+    android:textAlignment="inherit"
+    android:textSize="24sp"/>

+ 35 - 10
app/src/main/res/layout/dialog_part_select_layout.xml

@@ -3,20 +3,45 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="10dp">
+    android:padding="10dp"
+    android:orientation="vertical">
 
 
     <TextView
     <TextView
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:text="科室名称:"
-        android:textSize="20sp"/>
-    <Spinner
-        android:id="@+id/sp_part_select"
+        android:layout_gravity="center"
+        android:text="请选择科室"
+        android:textSize="28sp"
+        android:textColor="@color/black"/>
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:textSize="20sp" />
+        android:layout_marginTop="20dp"
+        android:padding="10dp">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:text="科室名称:"
+            android:textSize="24sp" />
+
+        <Spinner
+            android:id="@+id/sp_part_select"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:gravity="center"
+            android:textSize="24sp" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_ok"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_gravity="center"
+        android:text="确定"
+        android:textSize="24sp"/>
 </LinearLayout>
 </LinearLayout>