feat: 实现多屏幕选择串流

qiin2333 · qiin2333 · commit be6d31401393 · 2025-12-17T20:32:00.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         minSdk 22
         targetSdk 35
 
-        versionName "12.4.6"
-        versionCode = 351
+        versionName "12.4.7"
+        versionCode = 352
 
         // Generate native debug symbols to allow Google Play to symbolicate our native crashes
         ndk.debugSymbolLevel = 'FULL'
diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
@@ -14,6 +14,8 @@
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.nvstream.http.PairingManager;
+import com.limelight.nvstream.http.NvHTTP.DisplayInfo;
+import com.limelight.binding.PlatformBinding;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.AdapterFragment;
 import com.limelight.ui.AdapterFragmentCallbacks;
@@ -27,6 +29,9 @@
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 import com.limelight.utils.AppSettingsManager;
+import com.limelight.LimeLog;
+import com.limelight.Game;
+import com.limelight.binding.PlatformBinding;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -101,6 +106,11 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     private LinearLayout lastSettingsInfo;
     private TextView lastSettingsText;
     private CheckBox useLastSettingsCheckbox;
+    
+    // 显示器选择相关
+    private LinearLayout displaySelectionInfo;
+    private android.widget.RadioGroup displayRadioGroup;
+    private List<DisplayInfo> availableDisplays;
 
     private final static int START_OR_RESUME_ID = 1;
     private final static int QUIT_ID = 2;
@@ -355,6 +365,10 @@ protected void onCreate(Bundle savedInstanceState) {
         lastSettingsText = findViewById(R.id.lastSettingsText);
         useLastSettingsCheckbox = findViewById(R.id.useLastSettingsCheckbox);
 
+        // Initialize display selection UI components
+        displaySelectionInfo = findViewById(R.id.displaySelectionInfo);
+        displayRadioGroup = findViewById(R.id.displayRadioGroup);
+
         // Set up event listeners
         useLastSettingsCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
             appSettingsManager.setUseLastSettingsEnabled(isChecked);
@@ -401,6 +415,11 @@ protected void onCreate(Bundle savedInstanceState) {
         // Bind to the computer manager service
         bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
                 Service.BIND_AUTO_CREATE);
+
+        // Delay checking displays to allow service connection to complete
+        new Handler(Looper.getMainLooper()).postDelayed(() -> {
+            checkDisplaysAndUpdateUI();
+        }, 500);
     }
 
     private void updateHiddenApps(boolean hideImmediately) {
@@ -551,7 +570,6 @@ private void handleSelectionChange(int position, AppObject app) {
             isFirstFocus = false; // 第一次后设置为false
         }
 
-        // 更新上一次设置信息显示
         updateLastSettingsInfo(app);
     }
 
@@ -591,14 +609,115 @@ private void updateLastSettingsInfo(AppObject app) {
      * @param app 应用对象
      */
     private void startStreamWithLastSettingsIfEnabled(AppObject app) {
+        String displayGuid = null;
+        if (displaySelectionInfo.getVisibility() == View.VISIBLE 
+                && availableDisplays != null) {
+            int selectedId = displayRadioGroup.getCheckedRadioButtonId();
+            if (selectedId >= 0 && selectedId < availableDisplays.size()) {
+                DisplayInfo selectedDisplay = availableDisplays.get(selectedId);
+                displayGuid = selectedDisplay.guid != null && !selectedDisplay.guid.isEmpty() 
+                        ? selectedDisplay.guid : selectedDisplay.name;
+            }
+        }
+        
+        doStartStream(app, displayGuid);
+    }
+    
+    /**
+     * 检查显示器并更新UI
+     */
+    private void checkDisplaysAndUpdateUI() {
+        if (computer == null || computer.activeAddress == null || managerBinder == null) {
+            displaySelectionInfo.setVisibility(View.GONE);
+            return;
+        }
+        
+        new Thread(() -> {
+            try {
+                NvHTTP httpConn = new NvHTTP(computer.activeAddress, computer.httpsPort,
+                        managerBinder.getUniqueId(), "", computer.serverCert,
+                        PlatformBinding.getCryptoProvider(this));
+                
+                List<DisplayInfo> displays = httpConn.getDisplays();
+                
+                runOnUiThread(() -> {
+                    if (displays != null && displays.size() > 1) {
+                        updateDisplaySelectionUI(displays);
+                    } else {
+                        displaySelectionInfo.setVisibility(View.GONE);
+                    }
+                });
+            } catch (Exception e) {
+                LimeLog.warning("Failed to get displays: " + e.getMessage());
+                runOnUiThread(() -> displaySelectionInfo.setVisibility(View.GONE));
+            }
+        }).start();
+    }
+    
+    /**
+     * 更新显示器选择UI
+     *
+     * @param displays 显示器列表
+     */
+    private void updateDisplaySelectionUI(List<DisplayInfo> displays) {
+        availableDisplays = displays;
+        
+        // 清除之前的单选按钮
+        displayRadioGroup.removeAllViews();
+        
+        LimeLog.info("Displays: " + displays.size());
+        for (int i = 0; i < displays.size(); i++) {
+            DisplayInfo display = displays.get(i);
+            // 使用友好名字显示
+            String displayName = display.name != null && !display.name.isEmpty() 
+                    ? display.name : "Display " + (display.index + 1);
+            LimeLog.info("Display " + (display.index + 1) + ": " + display.name + " (guid: " + display.guid + ")");
+            
+            // 创建单选按钮
+            android.widget.RadioButton radioButton = new android.widget.RadioButton(this);
+            radioButton.setId(i);
+            radioButton.setText(displayName);
+            radioButton.setTextColor(0xCCFFFFFF);
+            radioButton.setTextSize(12);
+            radioButton.setTypeface(android.graphics.Typeface.create("sans-serif-light", android.graphics.Typeface.NORMAL));
+            radioButton.setButtonTintList(android.content.res.ColorStateList.valueOf(0xFFFFFFFF));
+            radioButton.setPadding(0, 0, 20, 0); // 右边距
+            
+            displayRadioGroup.addView(radioButton);
+        }
+        
+        // 默认不选择任何显示器
+        displayRadioGroup.clearCheck();
+        
+        displaySelectionInfo.setVisibility(View.VISIBLE);
+    }
+    
+    /**
+     * 执行启动串流
+     *
+     * @param app 应用对象
+     * @param displayName 选择的显示器名称，如果为null则不指定显示器
+     */
+    private void doStartStream(AppObject app, String displayName) {
         if (appSettingsManager != null && computer != null) {
             // 使用AppSettingsManager统一管理启动逻辑
             Intent startIntent = appSettingsManager.createStartIntentWithLastSettingsIfEnabled(
                     this, app.app, computer, managerBinder);
+            if (displayName != null) {
+                startIntent.putExtra(Game.EXTRA_DISPLAY_NAME, displayName);
+            }
             startActivity(startIntent);
         } else {
             // 回退到默认方式启动
-            ServerHelper.doStart(this, app.app, computer, managerBinder);
+            if (displayName != null) {
+                Intent startIntent = ServerHelper.createStartIntent(this, app.app, computer, managerBinder);
+                startIntent.putExtra(Game.EXTRA_DISPLAY_NAME, displayName);
+                startActivity(startIntent);
+            } else {
+                if (computer != null) {
+                    ServerHelper.doStart(this, app.app, computer, managerBinder);
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
@@ -326,6 +326,7 @@ private void stopAndUnbindUsbDriverService() {
     public static final String EXTRA_SERVER_CERT = "ServerCert";
     public static final String EXTRA_PC_USEVDD = "usevdd";
     public static final String EXTRA_APP_CMD = "CmdList";
+    public static final String EXTRA_DISPLAY_NAME = "DisplayName";
 
     private ExternalDisplayManager externalDisplayManager;
 
@@ -506,6 +507,7 @@ public boolean onCapturedPointer(View view, MotionEvent motionEvent) {
         boolean pcUseVdd = Game.this.getIntent().getBooleanExtra(EXTRA_PC_USEVDD, false);
         byte[] derCertData = Game.this.getIntent().getByteArrayExtra(EXTRA_SERVER_CERT);
         String cmdList = Game.this.getIntent().getStringExtra(EXTRA_APP_CMD);
+        String displayName = Game.this.getIntent().getStringExtra(EXTRA_DISPLAY_NAME);
 
         app = new NvApp(appName != null ? appName : "app", appId, appSupportsHdr);
         if (cmdList != null) {
@@ -695,7 +697,7 @@ public void notifyCrash(Exception e) {
         conn = new NvConnection(getApplicationContext(),
                 new ComputerDetails.AddressTuple(host, port),
                 httpsPort, uniqueId, pairName, config,
-                PlatformBinding.getCryptoProvider(this), serverCert);
+                PlatformBinding.getCryptoProvider(this), serverCert, displayName);
         controllerHandler = new ControllerHandler(this, conn, this, prefConfig);
         keyboardTranslator = new KeyboardTranslator();
 
diff --git a/app/src/main/java/com/limelight/nvstream/ConnectionContext.java b/app/src/main/java/com/limelight/nvstream/ConnectionContext.java
@@ -36,4 +36,7 @@ public class ConnectionContext {
     public int minBrightness;
     public int maxBrightness;
     public int maxAverageBrightness;
+    
+    // 选择的显示器名称
+    public String displayName;
 }
diff --git a/app/src/main/java/com/limelight/nvstream/NvConnection.java b/app/src/main/java/com/limelight/nvstream/NvConnection.java
@@ -51,6 +51,11 @@ public class NvConnection {
     private ComputerDetails.AddressTuple host;
 
     public NvConnection(Context appContext, ComputerDetails.AddressTuple host, int httpsPort, String uniqueId, String pairName, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert)
+    {
+        this(appContext, host, httpsPort, uniqueId, pairName, config, cryptoProvider, serverCert, null);
+    }
+    
+    public NvConnection(Context appContext, ComputerDetails.AddressTuple host, int httpsPort, String uniqueId, String pairName, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert, String displayName)
     {
         this.appContext = appContext;
         this.host = host;
@@ -63,6 +68,7 @@ public NvConnection(Context appContext, ComputerDetails.AddressTuple host, int h
         this.context.httpsPort = httpsPort;
         this.context.streamConfig = config;
         this.context.serverCert = serverCert;
+        this.context.displayName = displayName;
 
         // This is unique per connection
         this.context.riKey = generateRiAesKey();
diff --git a/app/src/main/java/com/limelight/nvstream/http/NvHTTP.java b/app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
@@ -1,5 +1,6 @@
 package com.limelight.nvstream.http;
 
+import android.os.Build;
 import android.provider.Settings;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -21,13 +22,18 @@
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.ListIterator;
 import java.util.Objects;
 import java.util.Stack;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManager;
@@ -780,6 +786,59 @@ public InputStream getBoxArt(NvApp app) throws IOException, InterruptedException
         return resp.byteStream();
     }
     
+    /**
+     * 获取主机可用的显示器列表
+     * @return 显示器列表，每个显示器包含 index 和 name
+     * @throws IOException 如果请求失败
+     * @throws InterruptedException 如果请求被中断
+     */
+    public static class DisplayInfo {
+        public int index;
+        public String name;  // 友好名字，用于显示
+        public String guid;  // GUID，用于传递给服务端
+        
+        public DisplayInfo(int index, String name, String guid) {
+            this.index = index;
+            this.name = name;
+            this.guid = guid;
+        }
+    }
+    
+    public List<DisplayInfo> getDisplays() throws IOException, InterruptedException {
+        try {
+            String jsonStr = openHttpConnectionToString(httpClientLongConnectTimeout, getHttpsUrl(true), "displays");
+            JSONObject json = new JSONObject(jsonStr);
+            
+            int statusCode = json.optInt("status_code", 0);
+            if (statusCode != 200) {
+                throw new IOException("Failed to get displays: " + json.optString("status_message", "Unknown error"));
+            }
+            
+            JSONArray displaysArray = json.optJSONArray("displays");
+            if (displaysArray == null) {
+                return new ArrayList<>();
+            }
+            
+            List<DisplayInfo> displays = new ArrayList<>(displaysArray.length());
+            for (int i = 0; i < displaysArray.length(); i++) {
+                JSONObject displayObj = displaysArray.getJSONObject(i);
+                
+                String friendlyName = displayObj.optString("friendly_name", "");
+                if (friendlyName.isEmpty()) {
+                    friendlyName = displayObj.optString("display_name", "Display " + (i + 1));
+                }
+                
+                String guid = displayObj.optString("device_id", "");
+                
+                displays.add(new DisplayInfo(i, friendlyName, guid));
+            }
+            
+            return displays;
+        } catch (org.json.JSONException e) {
+            throw new IOException("Failed to parse displays response: " + e.getMessage(), e);
+        }
+    }
+    
     public int getServerMajorVersion(String serverInfo) throws XmlPullParserException, IOException {
         return getServerAppVersionQuad(serverInfo)[0];
     }
@@ -834,8 +893,7 @@ public boolean launchApp(ConnectionContext context, String verb, int appId, bool
             }
         }
 
-        String xmlStr = openHttpConnectionToString(httpClientLongConnectNoReadTimeout, getHttpsUrl(true), verb,
-            "appid=" + appId +
+        String queryParams = "appid=" + appId +
             "&mode=" + context.streamConfig.getReqWidth() + "x" + context.streamConfig.getReqHeight() + "x" + fps +
             "&additionalStates=1&sops=" + (enableSops ? 1 : 0) +
             "&resolutionScale=" + context.streamConfig.getResolutionScale() +
@@ -849,8 +907,16 @@ public boolean launchApp(ConnectionContext context, String verb, int appId, bool
             "&gcpersist=" + (context.streamConfig.getPersistGamepadsAfterDisconnect() ? 1 : 0) + "&useVdd="+(context.streamConfig.getUseVdd() ? 1 : 0) +
             "&minBrightness=" + context.minBrightness +
             "&maxBrightness=" + context.maxBrightness +
-            "&maxAverageBrightness=" + context.maxAverageBrightness +
-            MoonBridge.getLaunchUrlQueryParameters());
+            "&maxAverageBrightness=" + context.maxAverageBrightness;
+        
+        // 如果指定了显示器GUID，添加到查询参数中
+        if (context.displayName != null && !context.displayName.isEmpty()) {
+            queryParams += "&display_name=" + context.displayName;
+        }
+        
+        queryParams += MoonBridge.getLaunchUrlQueryParameters();
+        
+        String xmlStr = openHttpConnectionToString(httpClientLongConnectNoReadTimeout, getHttpsUrl(true), verb, queryParams);
         if ((verb.equals("launch") && !getXmlString(xmlStr, "gamesession", true).equals("0") ||
                 (verb.equals("resume") && !getXmlString(xmlStr, "resume", true).equals("0")))) {
             // sessionUrl0 will be missing for older GFE versions
diff --git a/app/src/main/res/layout/activity_app_view.xml b/app/src/main/res/layout/activity_app_view.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,7 @@ public class ConnectionContext {`
`36`	`36`	`public int minBrightness;`
`37`	`37`	`public int maxBrightness;`
`38`	`38`	`public int maxAverageBrightness;`
	`39`	`+`
	`40`	`+ // 选择的显示器名称`
	`41`	`+ public String displayName;`
`39`	`42`	`}`