-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 优化修改分辨率算法，避免元素缩放过大过小问题 - 完善分辨率自适应功能 - UI界面优化 - 修复部分设备UI显示问题 - 局域网设备扫描功能增强 - 完善自定义动作设置 - 增加连接时自定义分辨率功能 - 分辨率自动恢复从重置改为恢复成连接前分辨率（主控端设备长按恢复分辨率仍为重置） - 支持多设备自启动 - 修复直连与隧道无法自动切换的问题 - 增加间距减少误触
- Loading branch information
1 parent
f2e60e3
commit 7666fb6
Showing
69 changed files
with
1,398 additions
and
1,307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
easycontrol/app/src/main/java/top/saymzx/easycontrol/app/DeviceDetailActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package top.saymzx.easycontrol.app; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.ClipData; | ||
| import android.content.ClipDescription; | ||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
| import android.view.View; | ||
| import android.widget.ArrayAdapter; | ||
| import android.widget.Toast; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| import top.saymzx.easycontrol.app.databinding.ActivityDeviceDetailBinding; | ||
| import top.saymzx.easycontrol.app.entity.AppData; | ||
| import top.saymzx.easycontrol.app.entity.Device; | ||
| import top.saymzx.easycontrol.app.helper.MyBroadcastReceiver; | ||
| import top.saymzx.easycontrol.app.helper.ViewTools; | ||
|
|
||
| public class DeviceDetailActivity extends Activity { | ||
| private ActivityDeviceDetailBinding activityDeviceDetailBinding; | ||
| private boolean isNew; | ||
| private Device device; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| ViewTools.setStatusAndNavBar(this); | ||
| ViewTools.setLocale(this); | ||
| activityDeviceDetailBinding = ActivityDeviceDetailBinding.inflate(this.getLayoutInflater()); | ||
| setContentView(activityDeviceDetailBinding.getRoot()); | ||
| // 获取Device | ||
| String uuid = getIntent().getStringExtra("uuid"); | ||
| isNew = uuid == null; | ||
| if (isNew) device = new Device(UUID.randomUUID().toString(), Device.TYPE_NETWORK); | ||
| else device = AppData.dbHelper.getByUUID(uuid); | ||
| // 绘制UI | ||
| drawUI(); | ||
| // 设置监听 | ||
| setListener(); | ||
| super.onCreate(savedInstanceState); | ||
| } | ||
|
|
||
| // 绘制UI | ||
| private static final String[] maxSizeList = new String[]{"2560", "1920", "1600", "1280", "1024", "800"}; | ||
| private static final String[] maxFpsList = new String[]{"90", "60", "40", "30", "20", "10"}; | ||
| private static final String[] maxVideoBitList = new String[]{"12", "8", "4", "2", "1"}; | ||
|
|
||
| private void drawUI() { | ||
| // UUID | ||
| activityDeviceDetailBinding.uuid.setOnClickListener(v -> { | ||
| AppData.clipBoard.setPrimaryClip(ClipData.newPlainText(ClipDescription.MIMETYPE_TEXT_PLAIN, device.uuid)); | ||
| Toast.makeText(this, getString(R.string.toast_copy), Toast.LENGTH_SHORT).show(); | ||
| }); | ||
| // 预填写参数 | ||
| activityDeviceDetailBinding.name.setText(device.name); | ||
| activityDeviceDetailBinding.address.setText(device.address); | ||
| if (!device.isNetworkDevice()) activityDeviceDetailBinding.address.setEnabled(false); | ||
| activityDeviceDetailBinding.customResolution.setVisibility(device.customResolutionOnConnect ? View.VISIBLE : View.GONE); | ||
| activityDeviceDetailBinding.customResolutionWidth.setText(String.valueOf(device.customResolutionWidth)); | ||
| activityDeviceDetailBinding.customResolutionHeight.setText(String.valueOf(device.customResolutionHeight)); | ||
| // 连接时操作 | ||
| activityDeviceDetailBinding.layoutOnConnect.setOnClickListener(v -> activityDeviceDetailBinding.layoutOnConnectSub.setVisibility(activityDeviceDetailBinding.layoutOnConnectSub.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE)); | ||
| activityDeviceDetailBinding.layoutOnConnectSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_custom_resolution_on_connect), getString(R.string.device_custom_resolution_on_connect_detail), device.customResolutionOnConnect, isChecked -> activityDeviceDetailBinding.customResolution.setVisibility(isChecked ? View.VISIBLE : View.GONE)).getRoot(), 0); | ||
| activityDeviceDetailBinding.layoutOnConnectSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_wake_on_connect), getString(R.string.device_wake_on_connect_detail), device.wakeOnConnect, isChecked -> device.wakeOnConnect = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnConnectSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_light_off_on_connect), getString(R.string.device_light_off_on_connect_detail), device.lightOffOnConnect, isChecked -> device.lightOffOnConnect = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnConnectSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_show_nav_bar_on_connect), getString(R.string.device_show_nav_bar_on_connect_detail), device.showNavBarOnConnect, isChecked -> device.showNavBarOnConnect = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnConnectSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_change_to_full_on_connect), getString(R.string.device_change_to_full_on_connect_detail), device.changeToFullOnConnect, isChecked -> device.changeToFullOnConnect = isChecked).getRoot()); | ||
| // 运行时操作 | ||
| activityDeviceDetailBinding.layoutOnRunning.setOnClickListener(v -> activityDeviceDetailBinding.layoutOnRunningSub.setVisibility(activityDeviceDetailBinding.layoutOnRunningSub.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE)); | ||
| activityDeviceDetailBinding.layoutOnRunningSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_keep_wake_on_running), getString(R.string.device_keep_wake_on_running_detail), device.keepWakeOnRunning, isChecked -> device.keepWakeOnRunning = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnRunningSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_change_resolution_on_running), getString(R.string.device_change_resolution_on_running_detail), device.changeResolutionOnRunning, isChecked -> device.changeResolutionOnRunning = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnRunningSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_small_to_mini_on_running), getString(R.string.device_small_to_mini_on_running_detail), device.smallToMiniOnRunning, isChecked -> device.smallToMiniOnRunning = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnRunningSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_full_to_mini_on_running), getString(R.string.device_full_to_mini_on_running_detail), device.fullToMiniOnRunning, isChecked -> device.fullToMiniOnRunning = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnRunningSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_mini_timeout_on_running), getString(R.string.device_mini_timeout_on_running_detail), device.miniTimeoutOnRunning, isChecked -> device.miniTimeoutOnRunning = isChecked).getRoot()); | ||
| // 断开时操作 | ||
| activityDeviceDetailBinding.layoutOnClose.setOnClickListener(v -> activityDeviceDetailBinding.layoutOnCloseSub.setVisibility(activityDeviceDetailBinding.layoutOnCloseSub.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE)); | ||
| activityDeviceDetailBinding.layoutOnCloseSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_lock_on_close), getString(R.string.device_lock_on_close_detail), device.lockOnClose, isChecked -> device.lockOnClose = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnCloseSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_light_on_close), getString(R.string.device_light_on_close_detail), device.lightOnClose, isChecked -> device.lightOnClose = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOnCloseSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_reconnect_on_close), getString(R.string.device_reconnect_on_close_detail), device.reconnectOnClose, isChecked -> device.reconnectOnClose = isChecked).getRoot()); | ||
| // 参数 | ||
| activityDeviceDetailBinding.layoutOption.setOnClickListener(v -> activityDeviceDetailBinding.layoutOptionSub.setVisibility(activityDeviceDetailBinding.layoutOptionSub.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE)); | ||
| ArrayAdapter<String> maxSizeAdapter = new ArrayAdapter<>(AppData.applicationContext, R.layout.item_spinner_item, maxSizeList); | ||
| ArrayAdapter<String> maxFpsAdapter = new ArrayAdapter<>(AppData.applicationContext, R.layout.item_spinner_item, maxFpsList); | ||
| ArrayAdapter<String> maxVideoBitAdapter = new ArrayAdapter<>(AppData.applicationContext, R.layout.item_spinner_item, maxVideoBitList); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_is_audio), getString(R.string.device_is_audio_detail), device.isAudio, isChecked -> device.isAudio = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSpinnerCard(this, getString(R.string.device_max_size), getString(R.string.device_max_size_detail), String.valueOf(device.maxSize), maxSizeAdapter, str -> device.maxSize = Integer.parseInt(str)).getRoot()); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSpinnerCard(this, getString(R.string.device_max_fps), getString(R.string.device_max_fps_detail), String.valueOf(device.maxFps), maxFpsAdapter, str -> device.maxFps = Integer.parseInt(str)).getRoot()); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSpinnerCard(this, getString(R.string.device_max_video_bit), getString(R.string.device_max_video_bit_detail), String.valueOf(device.maxVideoBit), maxVideoBitAdapter, str -> device.maxVideoBit = Integer.parseInt(str)).getRoot()); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_use_h265), getString(R.string.device_use_h265_detail), device.useH265, isChecked -> device.useH265 = isChecked).getRoot()); | ||
| activityDeviceDetailBinding.layoutOptionSub.addView(ViewTools.createSwitchCard(this, getString(R.string.device_connect_on_start), getString(R.string.device_connect_on_start_detail), device.connectOnStart, isChecked -> device.connectOnStart = isChecked).getRoot()); | ||
| } | ||
|
|
||
| // 设置监听 | ||
| private void setListener() { | ||
| activityDeviceDetailBinding.backButton.setOnClickListener(v -> finish()); | ||
| // 设置确认按钮监听 | ||
| activityDeviceDetailBinding.ok.setOnClickListener(v -> { | ||
| if (device.isNetworkDevice() && String.valueOf(activityDeviceDetailBinding.address.getText()).equals("")) return; | ||
| device.name = String.valueOf(activityDeviceDetailBinding.name.getText()); | ||
| device.address = String.valueOf(activityDeviceDetailBinding.address.getText()); | ||
| // 自定义分辨率 | ||
| String width = String.valueOf(activityDeviceDetailBinding.customResolutionWidth.getText()); | ||
| String height = String.valueOf(activityDeviceDetailBinding.customResolutionHeight.getText()); | ||
| device.customResolutionOnConnect = false; | ||
| if (activityDeviceDetailBinding.customResolution.getVisibility() != View.GONE && !width.equals("") && !height.equals("") && Integer.parseInt(width) >= 500 && Integer.parseInt(height) >= 500) { | ||
| device.customResolutionOnConnect = true; | ||
| device.customResolutionWidth = Integer.parseInt(width); | ||
| device.customResolutionHeight = Integer.parseInt(height); | ||
| } | ||
| // 更新数据库 | ||
| if (isNew) AppData.dbHelper.insert(device); | ||
| else AppData.dbHelper.update(device); | ||
| Intent intent = new Intent(); | ||
| intent.setAction(MyBroadcastReceiver.ACTION_UPDATE_DEVICE_LIST); | ||
| sendBroadcast(intent); | ||
| finish(); | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.