Skip to content

Commit

Permalink
Release 1.10.1: Develop to main (#1365)
Browse files Browse the repository at this point in the history
# Description

- Release 1.10.1: Develop to main

### Pre-launch Checklist

- [x] The [Documentation] is updated accordingly, or this PR doesn't
require it.
- [x] I have updated the `ExampleAppChangelog.txt` file with relevant
changes.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making, or this PR is
test-exempt.
- [x] All existing and new tests are passing.

<!-- Links -->

[Documentation]: https://www.100ms.live/docs
  • Loading branch information
ygit authored Mar 15, 2024
2 parents caa1740 + 5859152 commit 8b187a1
Show file tree
Hide file tree
Showing 136 changed files with 19,440 additions and 1,020 deletions.
9 changes: 5 additions & 4 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 0.1
cli:
version: 1.20.1
version: 1.21.0
plugins:
sources:
- id: trunk
Expand All @@ -10,19 +10,20 @@ lint:
disabled:
- osv-scanner
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected].30
- [email protected].38
- [email protected]
- trufflehog@3.68.4
- trufflehog@3.69.0
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- shellcheck@0.9.0
- shellcheck@0.10.0
- git-diff-check
- [email protected]
- [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,26 @@ class HMSManager(reactContext: ReactApplicationContext) :
}
}

@ReactMethod
fun setAlwaysScreenOn(
data: ReadableMap,
promise: Promise?,
) {
val window = reactApplicationContext?.currentActivity?.window
if (window == null) {
promise?.reject(Throwable("`window` is not available!"))
return
}
UiThreadUtil.runOnUiThread {
if (data.getBoolean("enabled")) {
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
} else {
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
promise?.resolve(null)
}
}

fun emitEvent(
event: String,
data: WritableMap,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ object HMSInteractivityDecoder {
private fun getPollAnswer(answer: HmsPollAnswer): WritableMap {
val data = Arguments.createMap()

answer.durationMillis.let { data.putDouble("duration", (it * 1000).toDouble()) }
answer.durationMillis?.let { data.putDouble("duration", (it * 1000).toDouble()) }

data.putInt("option", answer.selectedOption)

Expand Down
14 changes: 7 additions & 7 deletions packages/react-native-hms/example/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ GEM
rexml
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.894.0)
aws-partitions (1.896.0)
aws-sdk-core (3.191.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -126,18 +126,18 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-firebaseappdistribution_v1alpha (0.2.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-iamcredentials_v1 (0.19.0)
google-apis-iamcredentials_v1 (0.20.0)
google-apis-core (>= 0.14.0, < 2.a)
google-apis-playcustomapp_v1 (0.15.0)
google-apis-core (>= 0.14.0, < 2.a)
google-apis-storage_v1 (0.34.0)
google-apis-storage_v1 (0.35.0)
google-apis-core (>= 0.14.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-core (1.7.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.3.1)
google-cloud-errors (1.4.0)
google-cloud-storage (1.49.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
Expand All @@ -160,7 +160,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.1)
jwt (2.8.0)
jwt (2.8.1)
base64
mini_magick (4.12.0)
mini_mime (1.1.5)
Expand Down
14 changes: 7 additions & 7 deletions packages/react-native-hms/example/ios/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ GEM
rexml
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.894.0)
aws-partitions (1.896.0)
aws-sdk-core (3.191.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -119,18 +119,18 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
google-apis-iamcredentials_v1 (0.19.0)
google-apis-iamcredentials_v1 (0.20.0)
google-apis-core (>= 0.14.0, < 2.a)
google-apis-playcustomapp_v1 (0.15.0)
google-apis-core (>= 0.14.0, < 2.a)
google-apis-storage_v1 (0.34.0)
google-apis-storage_v1 (0.35.0)
google-apis-core (>= 0.14.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-core (1.7.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.3.1)
google-cloud-errors (1.4.0)
google-cloud-storage (1.49.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
Expand All @@ -153,7 +153,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.1)
jwt (2.8.0)
jwt (2.8.1)
base64
mini_magick (4.12.0)
mini_mime (1.1.5)
Expand Down
8 changes: 4 additions & 4 deletions packages/react-native-hms/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ PODS:
- React-Core
- react-native-document-picker (8.2.2):
- React-Core
- react-native-hms (1.10.0):
- react-native-hms (1.10.1):
- HMSBroadcastExtensionSDK (= 0.0.9)
- HMSHLSPlayerSDK (= 0.0.2)
- HMSSDK (= 1.6.0)
Expand Down Expand Up @@ -368,7 +368,7 @@ PODS:
- React-perflogger (= 0.64.4)
- rn-fetch-blob (0.12.0):
- React-Core
- RNCAsyncStorage (1.22.2):
- RNCAsyncStorage (1.22.3):
- React-Core
- RNDeviceInfo (9.0.2):
- React-Core
Expand Down Expand Up @@ -649,7 +649,7 @@ SPEC CHECKSUMS:
react-native-avoid-softinput: 71a692888f0c1d426ad9045dc8325773583962cd
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-document-picker: cd4d6b36a5207ad7a9e599ebb9eb0c2e84fa0b87
react-native-hms: 002adca217cf8c0b1bf28745e4b4c75f44430f58
react-native-hms: 70255b228ae3f7139905074845eb766a441236b2
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
React-perflogger: 5a890ca0911669421b7611661e9b58f91c805f5c
Expand All @@ -665,7 +665,7 @@ SPEC CHECKSUMS:
React-runtimeexecutor: 5b441857030bb6c3abaa7517f333cb01875ae499
ReactCommon: b4a65d2d6e9eeffd4b32dde1245962b3f43907d0
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCAsyncStorage: 014a78b2cc8cc107c9e92ee428dc0c1ac3223416
RNCAsyncStorage: 10591b9e0a91eaffee14e69b3721009759235125
RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
RNFlashList: ade81b4e928ebd585dd492014d40fb8d0e848aab
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
Expand Down
Loading

0 comments on commit 8b187a1

Please sign in to comment.