Skip to content

Commit 0c10fd9

Browse files
Merge pull request #775 from 100mslive/dev
Release : 1.2.22
2 parents 43ff781 + 8791407 commit 0c10fd9

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ kotlin.code.style=official
2020
100MS_APP_VERSION_CODE=379
2121
100MS_APP_VERSION_NAME=5.0.14
2222
hmsRoomKitGroup=live.100ms
23-
HMS_ROOM_KIT_VERSION=1.2.21
23+
HMS_ROOM_KIT_VERSION=1.2.22
2424
android.suppressUnsupportedCompileSdk=33
25-
HMS_SDK_VERSION=2.9.69
25+
HMS_SDK_VERSION=2.9.70
2626
# Common publishing info
2727
publishing_licence_name="MIT License"
2828
publishing_licence_url="http://www.opensource.org/licenses/mit-license.php"

room-kit/src/main/java/live/hms/roomkit/ui/meeting/MeetingFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ class MeetingFragment : Fragment() {
881881
contextSafe { context, activity -> activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR }
882882
}
883883
else -> {
884+
showControlBars(false)
884885
contextSafe { context, activity -> activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT }
885886
}
886887
}

room-kit/src/main/java/live/hms/roomkit/ui/meeting/MeetingViewModel.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,10 @@ class MeetingViewModel(
11031103
roleOnJoining?.name,
11041104
object : HMSActionResultListener {
11051105
override fun onError(error: HMSException) {}
1106-
override fun onSuccess() {}
1106+
override fun onSuccess() {
1107+
if (hasLocalPeerRaisedHand)
1108+
lowerLocalPeerHand()
1109+
}
11071110
})
11081111

11091112
initPrebuiltChatMessageRecipient.postValue(Pair(prebuiltInfoContainer.defaultRecipientToMessage(), ++recNum))
@@ -2093,13 +2096,15 @@ class MeetingViewModel(
20932096
}
20942097
}
20952098

2099+
var hasLocalPeerRaisedHand = false
20962100
private fun raiseLocalPeerHand() {
20972101
hmsSDK.raiseLocalPeerHand(object : HMSActionResultListener{
20982102
override fun onError(error: HMSException) {
20992103
Log.e(TAG, "Error while raising hand $error")
21002104
}
21012105

21022106
override fun onSuccess() {
2107+
hasLocalPeerRaisedHand = true
21032108
setHandRaisedAtTime(true)
21042109
Log.d(TAG, "Successfully raised hand")
21052110
}
@@ -2113,6 +2118,7 @@ class MeetingViewModel(
21132118
}
21142119

21152120
override fun onSuccess() {
2121+
hasLocalPeerRaisedHand = false
21162122
Log.d(TAG, "Successfully lowered hand")
21172123
setHandRaisedAtTime(false)
21182124
}

room-kit/src/main/java/live/hms/roomkit/ui/role/RolePreviewFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class RolePreviewFragment : BottomSheetDialogFragment() {
101101
meetingViewModel.changeRoleAccept(onSuccess = {
102102
contextSafe { context, activity ->
103103
activity.runOnUiThread {
104-
meetingViewModel.lowerLocalPeerHand()
104+
// meetingViewModel.lowerLocalPeerHand()
105105
findNavController().navigate(
106106
RolePreviewFragmentDirections.actionRolePreviewFragmentToMeetingFragment(
107107
false

0 commit comments

Comments
 (0)