p9vt2p3ui
/
ISRR
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
chenghonghao_branch
Marcus 1 year ago
parent 3475def4b1 ad1544d275
commit f7f957a18c
5 changed files with 625 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
src/app/src/main/AndroidManifest.xml
Unescape View File

@ -16,9 +16,11 @@
<application
android:icon="@drawable/icon"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:label="@string/app_name" >
<activity
android:name="wificar.SettingsActivity"
android:screenOrientation="landscape"
android:exported="false" />
<activity
android:name="wificar.MyMainFrm"

53
src/app/src/main/java/wificar/MyMainFrm.java
Unescape View File

@ -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,31 +52,47 @@ 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(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, MyVideo.class);
//通过Intent对象启动另外一个Activity
startActivity(intent);
finish();
});
Button_go.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, MyVideo.class);
//通过Intent对象启动另外一个Activity
MyMainFrm.this.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();
});
}

4
src/app/src/main/java/wificar/SettingsActivity.java
Unescape View File

@ -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);
}
}

623
src/app/src/main/res/layout/activity_settings.xml
Unescape View File

@ -6,59 +6,592 @@
android:layout_height="match_parent"
tools:context="wificar.SettingsActivity">
<LinearLayout
android:layout_width="180dp"
android:layout_height="180dp"
app:layout_constraintBottom_toBottomOf="parent"
<TextView
android:id="@+id/textView57"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginStart="15dp"
android:gravity="center"
android:text="云台水平反转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/textView56"
app:layout_constraintStart_toEndOf="@+id/checkBox"
app:layout_constraintTop_toTopOf="@+id/textView56"
app:layout_constraintVertical_bias="0.0" />
<CheckBox
android:id="@+id/checkBox3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView57"
app:layout_constraintStart_toEndOf="@+id/textView57"
app:layout_constraintTop_toTopOf="@+id/textView57" />
<Button
android:id="@+id/button6"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_marginStart="144dp"
android:text="绝对位置模式"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
android:orientation="vertical"
>
app:layout_constraintTop_toTopOf="@+id/textView" />
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="312dp"
android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/button7"
app:layout_constraintStart_toEndOf="@+id/button7"
app:layout_constraintTop_toTopOf="@+id/button7"
app:layout_constraintVertical_bias="1.0">
<Button
android:id="@+id/save"
android:layout_width="135dp"
android:layout_height="60dp"
android:text="开始"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
/>
android:layout_height="40dp"
android:text="保存"
android:textSize="15sp"
android:textStyle="bold" />
<Button
android:id="@+id/defaultsetting"
android:layout_width="135dp"
android:layout_height="60dp"
android:text="设置"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
/>
android:layout_height="40dp"
android:layout_marginStart="49dp"
android:layout_marginEnd="50dp"
android:text="恢复默认设置"
android:textSize="15sp"
android:textStyle="bold"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="440dp"
android:layout_height="180dp"
<CheckBox
android:id="@+id/checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView56"
app:layout_constraintStart_toEndOf="@+id/textView56"
app:layout_constraintTop_toTopOf="@+id/textView56" />
<TextView
android:id="@+id/textView56"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginTop="25dp"
android:gravity="center"
android:text="开启触屏云台："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/textView54"
app:layout_constraintTop_toBottomOf="@+id/textView54" />
<Button
android:id="@+id/button7"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_marginStart="32dp"
android:text="相对位置模式"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/button6"
app:layout_constraintStart_toEndOf="@+id/button6"
app:layout_constraintTop_toTopOf="@+id/button6"
app:layout_constraintVertical_bias="1.0" />
<CheckBox
android:id="@+id/checkBox4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView58"
app:layout_constraintStart_toEndOf="@+id/textView58"
app:layout_constraintTop_toTopOf="@+id/textView58" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="68dp"
android:text="云台模式"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="连接模式"
android:textSize="20dp"
android:textColor="#000000"
android:layout_marginTop="60dp"
android:layout_marginEnd="20dp"
/>
<Button
android:layout_width="135dp"
android:layout_height="60dp"
android:layout_marginTop="60dp"
android:text="WIFI模式"
/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView56" />
<TextView
android:id="@+id/textView58"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginStart="4dp"
android:gravity="center"
android:text="云台竖直反转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/textView57"
app:layout_constraintStart_toEndOf="@+id/checkBox3"
app:layout_constraintTop_toTopOf="@+id/textView57"
app:layout_constraintVertical_bias="0.0" />
<CheckBox
android:id="@+id/checkBox2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="872dp"
android:layout_marginTop="376dp"
app:layout_constraintStart_toEndOf="@+id/textView56"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/editTextText52"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView55"
app:layout_constraintStart_toEndOf="@+id/textView55" />
<TextView
android:id="@+id/textView54"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="视频地址2："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/textView53"
app:layout_constraintTop_toBottomOf="@+id/textView53" />
<EditText
android:id="@+id/editTextText51"
android:layout_width="492dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView53"
app:layout_constraintStart_toEndOf="@+id/textView53" />
<EditText
android:id="@+id/editTextText50"
android:layout_width="492dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView54"
app:layout_constraintStart_toEndOf="@+id/textView54" />
<EditText
android:id="@+id/editTextText48"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView47"
app:layout_constraintStart_toEndOf="@+id/textView51" />
<TextView
android:id="@+id/textView46"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="控制端口"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText25"
app:layout_constraintStart_toEndOf="@+id/editTextText25" />
<TextView
android:id="@+id/textView47"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右后："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText37"
app:layout_constraintStart_toEndOf="@+id/editTextText37" />
<EditText
android:id="@+id/editTextText44"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView50"
app:layout_constraintStart_toEndOf="@+id/textView50" />
<TextView
android:id="@+id/textView49"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="后退："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/editTextText_left"
app:layout_constraintStart_toEndOf="@+id/editText_forward" />
<EditText
android:id="@+id/editTextText45"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView46"
app:layout_constraintStart_toEndOf="@+id/textView46" />
<TextView
android:id="@+id/textView50"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText_left"
app:layout_constraintStart_toEndOf="@+id/editTextText_left" />
<EditText
android:id="@+id/editTextText46"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView47"
app:layout_constraintStart_toEndOf="@+id/textView47" />
<EditText
android:id="@+id/editTextText47"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView52"
app:layout_constraintStart_toEndOf="@+id/textView52" />
<EditText
android:id="@+id/editTextText49"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView49"
app:layout_constraintStart_toEndOf="@+id/textView49" />
<TextView
android:id="@+id/textView52"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右旋转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText42"
app:layout_constraintStart_toEndOf="@+id/editTextText42" />
<TextView
android:id="@+id/textView51"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右前："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText38"
app:layout_constraintStart_toEndOf="@+id/editTextText38" />
<EditText
android:id="@+id/editTextText38"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView30"
app:layout_constraintStart_toEndOf="@+id/textView41" />
<EditText
android:id="@+id/editTextText41"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView44"
app:layout_constraintStart_toEndOf="@+id/textView44" />
<EditText
android:id="@+id/editTextText42"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView45"
app:layout_constraintStart_toEndOf="@+id/textView42" />
<EditText
android:id="@+id/editTextText_left"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView41"
app:layout_constraintStart_toEndOf="@+id/textView25" />
<EditText
android:id="@+id/editTextText25"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView45"
app:layout_constraintStart_toEndOf="@+id/textView45" />
<EditText
android:id="@+id/editText_forward"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView25"
app:layout_constraintStart_toEndOf="@+id/textView25" />
<EditText
android:id="@+id/editTextText37"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView30"
app:layout_constraintStart_toEndOf="@+id/textView30" />
<TextView
android:id="@+id/textView30"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左后："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView41" />
<TextView
android:id="@+id/textView42"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左旋转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView30" />
<TextView
android:id="@+id/textView45"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="停止："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView42" />
<TextView
android:id="@+id/textView55"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="云台灵敏度："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText41"
app:layout_constraintStart_toEndOf="@+id/editTextText41" />
<TextView
android:id="@+id/textView44"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="控制地址"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView45" />
<TextView
android:id="@+id/textView53"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="视频地址1："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView44" />
<TextView
android:id="@+id/textView41"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左前："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView25" />
<TextView
android:id="@+id/textView25"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView_forward" />
<TextView
android:id="@+id/textView_forward"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:layout_marginTop="52dp"
android:gravity="center"
android:text="前进:"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/back"
android:layout_width="80dp"
android:layout_height="40dp"
android:text="返回"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:layout_width="135dp"
android:layout_height="60dp"
android:layout_marginTop="60dp"
android:layout_marginStart="20dp"
android:text="蓝牙模式"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

5
src/app/src/main/res/layout/mymainfrm.xml
Unescape View File

@ -35,6 +35,11 @@
android:layout_height="wrap_content"
android:text="启动" />
<Button
android:id="@+id/button_set"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="设置" />
</LinearLayout>

Write Preview
Loading…
Cancel
Save