fix: switch device trigger work incorrect issue

Author: lijiahao

android/app/build.gradle

@@ -82,7 +82,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
 //        applicationId "com.gamepass"
 //        versionCode 1999999999
-        versionName "2.4.3"
+        versionName "2.4.4"
     }
     signingConfigs {
         debug {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xstreaming",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

src/pages/NativeStream.jsx

@@ -122,6 +122,8 @@ function NativeStreamScreen({navigation, route}) {
   const isRequestExit = React.useRef(false);
   const isConnected = React.useRef(false);
 
+  const isTriggerWork = React.useRef(false);
+
   // event
   const usbGpEventListener = React.useRef(undefined);
   const sensorEventListener = React.useRef(undefined);
@@ -378,7 +380,13 @@ function NativeStreamScreen({navigation, route}) {
       triggerEventListener.current = eventEmitter.addListener(
         'onTrigger',
         event => {
-          // console.log('onTrigger:', event);
+          // Notice: some controllers will emit onTrigger and onGamepadKeyDown at the same time
+
+          if (!isTriggerWork.current && (event.leftTrigger > 0 || event.rightTrigger > 0)) {
+            isTriggerWork.current = true
+          }
+
+          if (!isTriggerWork.current) return
 
           // Short trigger
           if (_settings.short_trigger) {

src/pages/Stream.jsx

@@ -116,6 +116,7 @@ function StreamScreen({navigation, route}) {
   const triggerEventListener = React.useRef(undefined);
   const timer = React.useRef(undefined);
   const isRightstickMoving = React.useRef(false);
+  const isTriggerWork = React.useRef(false);
 
   const usbGpEventListener = React.useRef(undefined);
   const sensorEventListener = React.useRef(undefined);
@@ -387,7 +388,15 @@ function StreamScreen({navigation, route}) {
       triggerEventListener.current = eventEmitter.addListener(
         'onTrigger',
         event => {
-          console.log('onTrigger:', event);
+          // console.log('onTrigger:', event);
+
+          // Notice: some controllers will emit onTrigger and onGamepadKeyDown at the same time
+          if (!isTriggerWork.current && (event.leftTrigger > 0 || event.rightTrigger > 0)) {
+            isTriggerWork.current = true
+          }
+
+          if (!isTriggerWork.current) return
+          
           // Short trigger
           if (_settings.short_trigger) {
             triggerMax = _settings.dead_zone;

src/xCloud/index.js

@@ -354,7 +354,7 @@ export default class XcloudApi {
             )
             .then(res => {
               log.info('[sendSChatSdp] res.data:', res.data);
-              if (res.data.exchangeResponse) {
+              if (res.data && res.data.exchangeResponse) {
                 resolve(res.data);
               } else {
                 const checkInterval = setInterval(() => {
@@ -373,7 +373,7 @@ export default class XcloudApi {
                       },
                     )
                     .then(res2 => {
-                      if (res2.data.exchangeResponse) {
+                      if (res2.data && res2.data.exchangeResponse) {
                         resolve(res2.data);
                         clearInterval(checkInterval);
                       }
@@ -403,9 +403,9 @@ export default class XcloudApi {
           const iceResult = iceResponse.data;
           log.info('[checkIceResponse] res:', iceResult);
 
-          if (iceResult === '' || iceResult === null) {
+           // If result is empty, continue check
+          if (!iceResult) {
             setTimeout(() => {
-              // Continue check
               this.checkIceResponse()
                 .then(state => {
                   resolve(state);