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="鍚姩" />
-
+
+