niushuai233/DevControl
1
0
Fork 0
mirror of https://github.com/niushuai233/DevControl.git synced 2024-10-27 22:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 跳转到开关设置页面

Browse Source
This commit is contained in:
niushuai233 2022-10-19 15:50:43 +08:00
parent 61e6a875ed
commit fd1fb76537
7 changed files with 82 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/AndroidManifest.xml
View File

@ -9,6 +9,8 @@
android:roundIcon="@mipmap/app_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.DevControl">
<!--主页面-->
<activity
android:name=".MainActivity"
android:exported="true">
@ -19,12 +21,21 @@
</intent-filter>
</activity>
<!--开关操作-->
<activity
android:name=".ui.powerswitch.PowerSwitchActivity"
android:exported="true">
android:exported="false">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<category android:name="android.intent.category.DEFAULT"/>
<!--开关设置-->
<activity
android:name=".ui.powerswitch.PowerSwitchSetActivity"
android:exported="false">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>

29
app/src/main/java/cc/niushuai/project/devcontrol/base/util/ActivityUtil.java Normal file
View File

@ -0,0 +1,29 @@
package cc.niushuai.project.devcontrol.base.util;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import java.util.HashMap;
import java.util.Map;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
public class ActivityUtil {
public static void startActivity(Activity sourceActivity, Class<? extends BaseActivity> targetActivity) {
startActivity(sourceActivity, targetActivity, null);
}
public static void startActivity(Activity sourceActivity, Class<? extends BaseActivity> targetActivity,
Map<String, String> withData) {
Intent intent = new Intent(sourceActivity, targetActivity);
if (null != withData) {
for (String key : withData.keySet()) {
intent.putExtra(key, withData.get(key));
}
}
sourceActivity.startActivity(intent);
}
}

12
app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java
View File

@ -11,13 +11,14 @@ import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.base.enums.OnOffEnum;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
import cc.niushuai.project.devcontrol.base.util.ActivityUtil;
import cc.niushuai.project.devcontrol.base.util.GlobalVariables;
import cc.niushuai.project.devcontrol.base.util.Keys;
import cc.niushuai.project.devcontrol.databinding.DevicePowerSwitchActivityBinding;
import cc.niushuai.project.devcontrol.databinding.ActivityPowerSwitchBinding;
public class PowerSwitchActivity extends BaseActivity {
private DevicePowerSwitchActivityBinding binding;
private ActivityPowerSwitchBinding binding;
private DeviceInfo device;
@Override
@ -26,7 +27,7 @@ public class PowerSwitchActivity extends BaseActivity {
// 隐藏自带的标题栏
getSupportActionBar().hide();
binding = DevicePowerSwitchActivityBinding.inflate(getLayoutInflater());
binding = ActivityPowerSwitchBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
// 初始化页面数据
@ -85,11 +86,8 @@ public class PowerSwitchActivity extends BaseActivity {
* @author niushuai
* @date: 2022/10/19 14:47
*/
private void buttonMoreSetClickListener(View view) {
ActivityUtil.startActivity(this, PowerSwitchSetActivity.class);
}
/**

17
app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchSetActivity.java Normal file
View File

@ -0,0 +1,17 @@
package cc.niushuai.project.devcontrol.ui.powerswitch;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.ui.BaseActivity;
public class PowerSwitchSetActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_power_switch_set);
}
}

22
app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchViewModel.java
View File

@ -1,22 +0,0 @@
package cc.niushuai.project.devcontrol.ui.powerswitch;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
public class PowerSwitchViewModel extends ViewModel {
private MutableLiveData<DeviceInfo> deviceInfo;
public PowerSwitchViewModel() {
}
public MutableLiveData<DeviceInfo> getDeviceInfo() {
return deviceInfo;
}
public void setDeviceInfo(MutableLiveData<DeviceInfo> deviceInfo) {
this.deviceInfo = deviceInfo;
}
}

0
app/src/main/res/layout/device_power_switch_activity.xml → app/src/main/res/layout/activity_power_switch.xml
View File

18
app/src/main/res/layout/activity_power_switch_set.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.powerswitch.PowerSwitchSetActivity">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/test_hello_blank_textview_3"
/>
</androidx.constraintlayout.widget.ConstraintLayout>