Merge branch 'fix/android_swipeRecycle_bug' into 'develop'

android 修复会议处理页面的bug

See merge request o2oa/o2oa!1949

o2android/app/build.gradle

@@ -238,7 +238,9 @@ dependencies {
     implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     implementation 'com.facebook.shimmer:shimmer:0.1.0@aar'
     implementation 'com.borax12.materialdaterangepicker:library:1.9'
-    implementation 'com.yanzhenjie:recyclerview-swipe:1.1.4'
+//    implementation 'com.yanzhenjie:recyclerview-swipe:1.1.4'
+    //d
+    implementation 'com.yanzhenjie.recyclerview:x:1.3.2'
     implementation 'com.race604.waveloading:library:1.1.1'
 
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/invited/MeetingInvitedFragment.kt

@@ -2,14 +2,14 @@ package net.zoneland.x.bpm.mobile.v1.zoneXBPM.app.meeting.invited
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator
-import com.yanzhenjie.recyclerview.swipe.SwipeMenuItem
-import com.yanzhenjie.recyclerview.swipe.widget.DefaultItemDecoration
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.yanzhenjie.recyclerview.SwipeMenuCreator
+import com.yanzhenjie.recyclerview.SwipeMenuItem
+import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration
 import kotlinx.android.synthetic.main.fragment_meeting_invited.*
 import net.muliba.changeskin.FancySkinManager
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.R
@@ -70,16 +70,17 @@ class MeetingInvitedFragment : BaseMVPViewPagerFragment<MeetingInvitedFragmentCo
         receive_invite_list.layoutManager = LinearLayoutManager(activity)
         receive_invite_list.addItemDecoration(DefaultItemDecoration(ContextCompat.getColor(activity!!, R.color.z_color_split_line_ddd)))
         receive_invite_list.setSwipeMenuCreator(menuCreator)
-        receive_invite_list.setSwipeMenuItemClickListener { menuBridge ->
+        receive_invite_list.setOnItemMenuClickListener { menuBridge, adapterPosition ->
             menuBridge.closeMenu()// 任何操作必须先关闭菜单，否则可能出现Item菜单打开状态错乱。
-            val menuPosition = menuBridge.position
-            val itemPosition = menuBridge.adapterPosition
-            when (menuPosition) {
+            // 左侧还是右侧菜单：
+//            val direction = menuBridge.direction
+            // 菜单在Item中的Position：
+            when (menuBridge.position) {
                 0 -> {
-                    mPresenter.acceptMeetingInvited(receiveInviteList[itemPosition].id)
+                    mPresenter.acceptMeetingInvited(receiveInviteList[adapterPosition].id)
                 }
                 1 -> {
-                    mPresenter.rejectMeetingInvited(receiveInviteList[itemPosition].id)
+                    mPresenter.rejectMeetingInvited(receiveInviteList[adapterPosition].id)
                 }
             }
         }

o2android/app/src/main/res/layout/fragment_meeting_invited.xml

@@ -95,7 +95,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
-            <com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView
+            <com.yanzhenjie.recyclerview.SwipeRecyclerView
                 android:id="@+id/receive_invite_list"
                 android:background="@android:color/white"
                 android:layout_width="match_parent"

o2android/gradle.properties

@@ -23,6 +23,6 @@ android.enableJetifier=true
 
 
 # o2
-o2.versionName=5.2.0
-o2.versionCode=120
+o2.versionName=5.2.1
+o2.versionCode=121