From 57a5a675ef84882a87a50fa98249e1514516bc43 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Mon, 31 Oct 2022 11:47:34 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2UI?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90(by=20okjack)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/tvbox/osc/server/ControlManager.java   |  2 +-
 .../github/tvbox/osc/ui/activity/PushActivity.java    |  2 +-
 app/src/main/res/layout/fragment_model.xml            | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java b/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java
index 006568af..e80d1491 100644
--- a/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java
+++ b/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java
@@ -80,7 +80,7 @@ public class ControlManager {
 
                 @Override
                 public void onPushReceived(String url) {
-                    Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(url);
+                    Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\+\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(url);
                     String finalUrl = url;
                     if (m.find()) {
                         finalUrl = m.group(1);
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PushActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PushActivity.java
index ab6c33f3..d9dd2a26 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PushActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PushActivity.java
@@ -46,7 +46,7 @@ public class PushActivity extends BaseActivity {
                         if (manager.hasPrimaryClip() && manager.getPrimaryClip() != null && manager.getPrimaryClip().getItemCount() > 0) {
                             ClipData.Item addedText = manager.getPrimaryClip().getItemAt(0);
                             String clipText = addedText.getText().toString().trim();
-                            Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(clipText);
+                            Matcher m = Pattern.compile("(https?://[A-Za-z0-9:_@$#\\+\\|\\/\\.\\?\\=\\&\\%\\-]+)").matcher(clipText);
                             if (m.find()) {
                                 clipText = m.group(1);
                             }
diff --git a/app/src/main/res/layout/fragment_model.xml b/app/src/main/res/layout/fragment_model.xml
index 76bce642..ee122c12 100644
--- a/app/src/main/res/layout/fragment_model.xml
+++ b/app/src/main/res/layout/fragment_model.xml
@@ -641,17 +641,18 @@
                 <LinearLayout
                     android:layout_width="@dimen/vs_0"
                     android:layout_height="match_parent"
-                    android:layout_marginEnd="@dimen/vs_5"
-                    android:layout_marginRight="@dimen/vs_5"
+                    android:layout_marginStart="@dimen/vs_5"
+                    android:layout_marginLeft="@dimen/vs_5"
                     android:layout_weight="1"
                     android:focusable="false"
                     android:orientation="horizontal">
+
                     <LinearLayout
                         android:id="@+id/llSearchTv"
                         android:layout_width="@dimen/vs_0"
                         android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/vs_5"
-                        android:layout_marginLeft="@dimen/vs_5"
+                        android:layout_marginEnd="@dimen/vs_5"
+                        android:layout_marginRight="@dimen/vs_5"
                         android:layout_weight="1"
                         android:background="@drawable/shape_setting_model_focus"
                         android:focusable="true"
@@ -659,12 +660,14 @@
                         android:orientation="horizontal"
                         android:paddingLeft="@dimen/vs_20"
                         android:paddingRight="@dimen/vs_20">
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="搜索附近TVBox"
                             android:textColor="@android:color/white"
                             android:textSize="@dimen/ts_24" />
+
                         <Space
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"