Prechádzať zdrojové kódy

<按客户需求打开设置菜单>

weizhengliang 5 rokov pred
rodič
commit
7c345660f3

+ 1 - 1
app/build.gradle

@@ -23,7 +23,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.21"
+        versionName "1.22"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

+ 2 - 2
app/src/main/java/com/wdkl/callingmainnursemanager/ui/activity/MainFragmentActivity.java

@@ -640,11 +640,11 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                //UIUtils.rvSideslipShowPopu(MainFragmentActivity.this, event);
+                UIUtils.rvSideslipShowPopu(MainFragmentActivity.this, event);
                 break;
             case MotionEvent.ACTION_UP:
                 if (isInitFloatViewLocation)
-                    //UIUtils.rvSideslipShowPopu(MainFragmentActivity.this, event);
+                    UIUtils.rvSideslipShowPopu(MainFragmentActivity.this, event);
                 break;
             default:
                 break;

+ 3 - 3
app/src/main/java/com/wdkl/callingmainnursemanager/ui/fragment/CallingBedFragment.java

@@ -459,7 +459,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         rvCallBed.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
             @Override
             public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
-                //UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
+                UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
                 return false;
             }
 
@@ -474,7 +474,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         rvCallRoom.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
             @Override
             public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
-                //UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
+                UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
                 return false;
             }
 
@@ -489,7 +489,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         rvCallList.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
             @Override
             public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
-                //UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
+                UIUtils.rvSideslipShowPopu(getActivity(), motionEvent);
                 return false;
             }
 

+ 1 - 1
app/src/main/java/com/wdkl/callingmainnursemanager/ui/fragment/CallingHostFragment.java

@@ -765,7 +765,7 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
 
     @Override
     public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
-        //UIUtils.rvSideslipShowPopu(getActivity(), e);
+        UIUtils.rvSideslipShowPopu(getActivity(), e);
         return false;
     }
 

+ 3 - 3
app/src/main/res/layout/activity_main_sideslip_popu_window.xml

@@ -63,7 +63,8 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_sickness_bed_call"
@@ -179,8 +180,7 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone">
+            android:orientation="vertical" >
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_system_setting"