From 3bbfba9679715ea5774354108db1888ca3e56ac5 Mon Sep 17 00:00:00 2001
From: GenshinGanyu <1437099831@qq.com>
Date: Sun, 24 Sep 2023 21:57:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/src/main/java/wificar/MyMainFrm.java | 25 +-
.../src/main/res/layout/activity_settings.xml | 648 ++++++++++++++++--
src/app/src/main/res/layout/mymainfrm.xml | 7 +-
3 files changed, 637 insertions(+), 43 deletions(-)
diff --git a/src/app/src/main/java/wificar/MyMainFrm.java b/src/app/src/main/java/wificar/MyMainFrm.java
index 336184e..9dd630c 100644
--- a/src/app/src/main/java/wificar/MyMainFrm.java
+++ b/src/app/src/main/java/wificar/MyMainFrm.java
@@ -23,6 +23,7 @@ public class MyMainFrm extends Activity {
public static String CameraIp;
EditText CameraIP, ControlIP, Port;
Button Button_go;
+ Button Button_set;
String videoUrl, controlUrl, port;
/*
* 以下为按一下返回键后，提示“再按一次退出程序”
@@ -51,13 +52,14 @@ public class MyMainFrm extends Activity {
Port = findViewById(R.id.port);
Button_go = findViewById(R.id.button_go);
+ Button_set = findViewById(R.id.button_set);
videoUrl = CameraIP.getText().toString();
controlUrl = ControlIP.getText().toString();
port = Port.getText().toString();
Button_go.requestFocusFromTouch();
-
+ Button_set.requestFocusFromTouch();
Button_go.setOnClickListener(new Button.OnClickListener() {
public void onClick(View v) {
@@ -73,7 +75,26 @@ public class MyMainFrm extends Activity {
//设置Intent对象要启动的Activity
intent.setClass(MyMainFrm.this, MyVideo.class);
//通过Intent对象启动另外一个Activity
- MyMainFrm.this.startActivity(intent);
+ startActivity(intent);
+ finish();
+ }
+ });
+
+ Button_set.setOnClickListener(new Button.OnClickListener() {
+ public void onClick(View v) {
+ // TODO Auto-generated method stub
+ //生成一个Intent对象
+ Intent intent = new Intent();
+ //在Intent对象当中添加一个键值对
+ intent.putExtra("CameraIp", videoUrl);
+ intent.putExtra("ControlUrl", controlUrl);
+ intent.putExtra("Port", port);
+
+ intent.putExtra("Is_Scale", true);
+ //设置Intent对象要启动的Activity
+ intent.setClass(MyMainFrm.this, SettingsActivity.class);
+ //通过Intent对象启动另外一个Activity
+ startActivity(intent);
finish();
}
});
diff --git a/src/app/src/main/res/layout/activity_settings.xml b/src/app/src/main/res/layout/activity_settings.xml
index 2d0fb6b..44fac76 100644
--- a/src/app/src/main/res/layout/activity_settings.xml
+++ b/src/app/src/main/res/layout/activity_settings.xml
@@ -6,59 +6,627 @@
android:layout_height="match_parent"
tools:context="wificar.SettingsActivity">
-
-
+ app:layout_constraintTop_toTopOf="parent" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:layout_marginBottom="64dp"
+ android:text="淇濆瓨"
+ android:textSize="18sp"
+ android:textStyle="bold" />
+ android:layout_marginStart="49dp"
+ android:layout_marginEnd="50dp"
+ android:text="鎭㈠榛樿璁剧疆"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:visibility="visible" />
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/mymainfrm.xml b/src/app/src/main/res/layout/mymainfrm.xml
index 2e65316..fc1f319 100644
--- a/src/app/src/main/res/layout/mymainfrm.xml
+++ b/src/app/src/main/res/layout/mymainfrm.xml
@@ -34,7 +34,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="鍚姩" />
-
+
+
From ad1544d2753ee57874efa1d3be4e8288dde5053c Mon Sep 17 00:00:00 2001
From: MikkoAyaka <3401286177@qq.com>
Date: Sun, 24 Sep 2023 22:50:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/src/main/AndroidManifest.xml | 2 +
src/app/src/main/java/wificar/MyMainFrm.java | 64 ++-
.../main/java/wificar/SettingsActivity.java | 4 +
.../src/main/res/layout/activity_settings.xml | 503 ++++++++----------
4 files changed, 270 insertions(+), 303 deletions(-)
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
index 4f2eb3c..66a89f5 100644
--- a/src/app/src/main/AndroidManifest.xml
+++ b/src/app/src/main/AndroidManifest.xml
@@ -16,9 +16,11 @@
{
+ // TODO Auto-generated method stub
+ //生成一个Intent对象
+ Intent intent = new Intent();
+ //在Intent对象当中添加一个键值对
+ intent.putExtra("CameraIp", videoUrl);
+ intent.putExtra("ControlUrl", controlUrl);
+ intent.putExtra("Port", port);
+
+ intent.putExtra("Is_Scale", true);
+ //设置Intent对象要启动的Activity
+ intent.setClass(MyMainFrm.this, MyVideo.class);
+ //通过Intent对象启动另外一个Activity
+ startActivity(intent);
+ finish();
});
- Button_set.setOnClickListener(new Button.OnClickListener() {
- public void onClick(View v) {
- // TODO Auto-generated method stub
- //生成一个Intent对象
- Intent intent = new Intent();
- //在Intent对象当中添加一个键值对
- intent.putExtra("CameraIp", videoUrl);
- intent.putExtra("ControlUrl", controlUrl);
- intent.putExtra("Port", port);
-
- intent.putExtra("Is_Scale", true);
- //设置Intent对象要启动的Activity
- intent.setClass(MyMainFrm.this, SettingsActivity.class);
- //通过Intent对象启动另外一个Activity
- startActivity(intent);
- finish();
- }
+ Button_set.setOnClickListener(v -> {
+ // TODO Auto-generated method stub
+ //生成一个Intent对象
+ Intent intent = new Intent();
+ //在Intent对象当中添加一个键值对
+ intent.putExtra("CameraIp", videoUrl);
+ intent.putExtra("ControlUrl", controlUrl);
+ intent.putExtra("Port", port);
+
+ intent.putExtra("Is_Scale", true);
+ //设置Intent对象要启动的Activity
+ intent.setClass(MyMainFrm.this, SettingsActivity.class);
+ //通过Intent对象启动另外一个Activity
+ startActivity(intent);
+ finish();
});
}
diff --git a/src/app/src/main/java/wificar/SettingsActivity.java b/src/app/src/main/java/wificar/SettingsActivity.java
index 92b0b3f..604262b 100644
--- a/src/app/src/main/java/wificar/SettingsActivity.java
+++ b/src/app/src/main/java/wificar/SettingsActivity.java
@@ -3,6 +3,8 @@ package wificar;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
import my.wificar.R;
@@ -11,6 +13,8 @@ public class SettingsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ this.requestWindowFeature(Window.FEATURE_NO_TITLE);//隐去标题（应用的名字必须要写在setContentView之前，否则会有异常）
+ this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_settings);
}
}
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/activity_settings.xml b/src/app/src/main/res/layout/activity_settings.xml
index 44fac76..03c2f93 100644
--- a/src/app/src/main/res/layout/activity_settings.xml
+++ b/src/app/src/main/res/layout/activity_settings.xml
@@ -7,85 +7,146 @@
tools:context="wificar.SettingsActivity">
+ app:layout_constraintBottom_toBottomOf="@+id/textView56"
+ app:layout_constraintStart_toEndOf="@+id/checkBox"
+ app:layout_constraintTop_toTopOf="@+id/textView56"
+ app:layout_constraintVertical_bias="0.0" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView57"
+ app:layout_constraintStart_toEndOf="@+id/textView57"
+ app:layout_constraintTop_toTopOf="@+id/textView57" />
-
+ app:layout_constraintTop_toTopOf="@+id/textView" />
+
+
+
+
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/textView56" />
+ app:layout_constraintStart_toStartOf="@+id/textView54"
+ app:layout_constraintTop_toBottomOf="@+id/textView54" />
+
+
+ app:layout_constraintBottom_toBottomOf="@+id/textView58"
+ app:layout_constraintStart_toEndOf="@+id/textView58"
+ app:layout_constraintTop_toTopOf="@+id/textView58" />
+
+
+
+
-
-
+ app:layout_constraintBottom_toBottomOf="@+id/textView55"
+ app:layout_constraintStart_toEndOf="@+id/textView55" />
+ app:layout_constraintStart_toStartOf="@+id/textView53"
+ app:layout_constraintTop_toBottomOf="@+id/textView53" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView53"
+ app:layout_constraintStart_toEndOf="@+id/textView53" />
-
-
+ app:layout_constraintBottom_toBottomOf="@+id/textView54"
+ app:layout_constraintStart_toEndOf="@+id/textView54" />
+ app:layout_constraintBottom_toTopOf="@+id/textView47"
+ app:layout_constraintStart_toEndOf="@+id/textView51" />
+ app:layout_constraintBottom_toBottomOf="@+id/editTextText25"
+ app:layout_constraintStart_toEndOf="@+id/editTextText25" />
+ app:layout_constraintBottom_toBottomOf="@+id/editTextText37"
+ app:layout_constraintStart_toEndOf="@+id/editTextText37" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView50"
+ app:layout_constraintStart_toEndOf="@+id/textView50" />
+ app:layout_constraintBottom_toTopOf="@+id/editTextText_left"
+ app:layout_constraintStart_toEndOf="@+id/editText_forward" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView46"
+ app:layout_constraintStart_toEndOf="@+id/textView46" />
+ app:layout_constraintBottom_toBottomOf="@+id/editTextText_left"
+ app:layout_constraintStart_toEndOf="@+id/editTextText_left" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView47"
+ app:layout_constraintStart_toEndOf="@+id/textView47" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView52"
+ app:layout_constraintStart_toEndOf="@+id/textView52" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView49"
+ app:layout_constraintStart_toEndOf="@+id/textView49" />
+ app:layout_constraintBottom_toBottomOf="@+id/editTextText42"
+ app:layout_constraintStart_toEndOf="@+id/editTextText42" />
+ app:layout_constraintBottom_toBottomOf="@+id/editTextText38"
+ app:layout_constraintStart_toEndOf="@+id/editTextText38" />
+ app:layout_constraintBottom_toTopOf="@+id/textView30"
+ app:layout_constraintStart_toEndOf="@+id/textView41" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView44"
+ app:layout_constraintStart_toEndOf="@+id/textView44" />
+ app:layout_constraintBottom_toTopOf="@+id/textView45"
+ app:layout_constraintStart_toEndOf="@+id/textView42" />
+ app:layout_constraintBottom_toTopOf="@+id/textView41"
+ app:layout_constraintStart_toEndOf="@+id/textView25" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView45"
+ app:layout_constraintStart_toEndOf="@+id/textView45" />
+ app:layout_constraintBottom_toTopOf="@+id/textView25"
+ app:layout_constraintStart_toEndOf="@+id/textView25" />
+ app:layout_constraintBottom_toBottomOf="@+id/textView30"
+ app:layout_constraintStart_toEndOf="@+id/textView30" />
+ app:layout_constraintTop_toBottomOf="@+id/textView41" />
+ app:layout_constraintTop_toBottomOf="@+id/textView30" />
+ app:layout_constraintTop_toBottomOf="@+id/textView42" />
+
+
+ app:layout_constraintTop_toBottomOf="@+id/textView45" />
+
+
+ app:layout_constraintTop_toBottomOf="@+id/textView25" />
+ app:layout_constraintTop_toBottomOf="@+id/textView_forward" />
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file