wip: android closeDialog

dogu-team · Oct 20, 2023 · f0d6c3d · f0d6c3d
1 parent 9b49c40
commit f0d6c3d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...script-private/device-server/src/internal/services/shared-device/android-shared-device.ts b/...script-private/device-server/src/internal/services/shared-device/android-shared-device.ts
@@ -104,6 +104,7 @@ export class AndroidSharedDeviceService implements Zombieable {
         throw e;
       });
       this.state = 'preinstalling';
+      await this.appiumAdb.setDeviceLocale('en-US');
       await Adb.allowNonMarketApps(this.serial, this.printable).catch((e) => {
         this.printable.error(`AndroidSharedDeviceService.revive.allowNonMarketApps failed.`, { error: errorify(e) });
       });
@@ -123,13 +124,15 @@ export class AndroidSharedDeviceService implements Zombieable {
         this.printable.error(`AndroidSharedDeviceService.revive.joinWifi failed.`, { error: errorify(e) });
       });
       this.state = 'changing-locale';
-      await this.appiumAdb.setDeviceLocale('en-US');
+      await Adb.stayOnWhilePluggedIn(this.serial).catch((e) => {
+        this.printable.error(`AndroidSharedDeviceService.revive.stayOnWhilePluggedIn failed.`, { error: errorify(e) });
+      });
+      await this.closeDialog().catch((e) => {
+        this.printable.error(`AndroidSharedDeviceService.revive.closeDialog failed.`, { error: errorify(e) });
+      });
       this.isSetupDone = true;
       this.state = 'setup-done';
     }
-    await Adb.stayOnWhilePluggedIn(this.serial).catch((e) => {
-      this.printable.error(`AndroidSharedDeviceService.revive.stayOnWhilePluggedIn failed.`, { error: errorify(e) });
-    });
     this.startLogcatProcess(this.serial, this.printable).catch((e) => {
       this.printable.error(e);
     });
@@ -250,6 +253,12 @@ export class AndroidSharedDeviceService implements Zombieable {
     await Adb.keyevent(this.serial, DeviceControlKeycode.DEVICE_CONTROL_KEYCODE_MUTE);
   }
 
+  private async closeDialog(): Promise<void> {
+    for await (const _ of loop(30, 5)) {
+      await Adb.keyevent(this.serial, DeviceControlKeycode.DEVICE_CONTROL_KEYCODE_BACK);
+    }
+  }
+
   private killLogcatProcess(): void {
     if (!this.logcatProc) {
       return;

diff --git a/projects/go-device-controller/internal/pkg/streamer/labeled_datachannel.go b/projects/go-device-controller/internal/pkg/streamer/labeled_datachannel.go
@@ -610,9 +610,9 @@ func (ldc *DeviceServerWebSocketLabeledDatachannel) onMessage(msg webrtc.DataCha
 		log.Inst.Error("DeviceServerWebSocketLabeledDatachannel connection is nil", zap.String("name", ldc.label().Name))
 		return
 	}
-	name := ldc.label().Name
-	path := connection.GetPath()
-	log.Inst.Info("DeviceServerWebSocketLabeledDatachannel datachannel omMessage", zap.String("name", name), zap.String("path", path))
+	// name := ldc.label().Name
+	// path := connection.GetPath()
+	// log.Inst.Debug("DeviceServerWebSocketLabeledDatachannel datachannel omMessage", zap.String("name", name), zap.String("path", path))
 
 	if nil == ldc.conn {
 		log.Inst.Error("DeviceServerWebSocketLabeledDatachannel connection is nil")