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

fix: 设备详情页ui

Browse Source
This commit is contained in:
niushuai233
2022-10-18 18:01:23 +08:00
parent 801731f675
commit 355353b0e7
20 changed files with 190 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/cc/niushuai/project/devcontrol/base/activity/BaseActivity.java Normal file
View File

@@ -0,0 +1,12 @@
package cc.niushuai.project.devcontrol.base.activity;
import androidx.appcompat.app.AppCompatActivity;
/**
* Activity基类
*
* @author niushuai
* @date: 2022/10/18 14:24
*/
public class BaseActivity extends AppCompatActivity {
}

12
app/src/main/java/cc/niushuai/project/devcontrol/base/fragment/BaseFragment.java Normal file
View File

@@ -0,0 +1,12 @@
package cc.niushuai.project.devcontrol.base.fragment;
import androidx.fragment.app.Fragment;
/**
* Fragment基类
*
* @author niushuai
* @date: 2022/10/18 14:25
*/
public class BaseFragment extends Fragment {
}

7
app/src/main/java/cc/niushuai/project/devcontrol/ui/device/DeviceActivity.java
View File

@@ -2,17 +2,18 @@ package cc.niushuai.project.devcontrol.ui.device;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import cc.niushuai.project.devcontrol.base.activity.BaseActivity;
import cc.niushuai.project.devcontrol.databinding.DeviceActivityBinding;
public class DeviceActivity extends AppCompatActivity {
public class DeviceActivity extends BaseActivity {
private DeviceActivityBinding binding;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// 隐藏自带的标题栏
getSupportActionBar().hide();
binding = DeviceActivityBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());

32
app/src/main/java/cc/niushuai/project/devcontrol/ui/device/DeviceOperate.java
View File

@@ -1,32 +0,0 @@
package cc.niushuai.project.devcontrol.ui.device;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
import cc.niushuai.project.devcontrol.databinding.DeviceOperateBinding;
/**
* 设备操作页面
*
* @author niushuai
* @date: 2022/10/17 17:41
* @return: {@link }
*/
public class DeviceOperate extends Fragment {
private DeviceOperateBinding thisBinding;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
thisBinding = DeviceOperateBinding.inflate(inflater, container, false);
CharSequence text = thisBinding.deviceOperateFullInfo.getText();
System.out.println(text);
return thisBinding.getRoot();
}
}

1
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java
View File

@@ -25,7 +25,6 @@ import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;
import cc.niushuai.project.devcontrol.databinding.DeviceItemBinding;
import cc.niushuai.project.devcontrol.databinding.MainNavFragmentDeviceBinding;
import cc.niushuai.project.devcontrol.ui.device.DeviceActivity;
import cc.niushuai.project.devcontrol.ui.device.DeviceOperate;
import cn.hutool.core.util.RandomUtil;
/**

9
app/src/main/res/drawable/ic_back.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M929.71,487.73 L167.94,487.73l358.79,-318.92c12.39,-11.01 13.51,-29.98 2.49,-42.37 -11.01,-12.39 -29.98,-13.51 -42.37,-2.49L74.84,490.17c-6.41,5.7 -10.07,13.86 -10.07,22.43 0,8.57 3.67,16.74 10.07,22.43l412.02,366.23c5.72,5.08 12.84,7.58 19.93,7.58 8.28,-0 16.52,-3.4 22.44,-10.07 11.01,-12.39 9.9,-31.36 -2.49,-42.37L179.89,548.1l749.81,0c16.58,0 30.01,-13.61 30.01,-30.19S946.28,487.73 929.71,487.73z"/>
</vector>

9
app/src/main/res/drawable/ic_back_32.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M929.71,487.73 L167.94,487.73l358.79,-318.92c12.39,-11.01 13.51,-29.98 2.49,-42.37 -11.01,-12.39 -29.98,-13.51 -42.37,-2.49L74.84,490.17c-6.41,5.7 -10.07,13.86 -10.07,22.43 0,8.57 3.67,16.74 10.07,22.43l412.02,366.23c5.72,5.08 12.84,7.58 19.93,7.58 8.28,-0 16.52,-3.4 22.44,-10.07 11.01,-12.39 9.9,-31.36 -2.49,-42.37L179.89,548.1l749.81,0c16.58,0 30.01,-13.61 30.01,-30.19S946.28,487.73 929.71,487.73z"/>
</vector>

9
app/src/main/res/drawable/ic_more_h.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M320,512c0,35.2 -28.8,64 -64,64s-64,-28.8 -64,-64 28.8,-64 64,-64 64,28.8 64,64zM512,448c-35.2,0 -64,28.8 -64,64s28.8,64 64,64 64,-28.8 64,-64 -28.8,-64 -64,-64zM768,448c-35.2,0 -64,28.8 -64,64s28.8,64 64,64 64,-28.8 64,-64 -28.8,-64 -64,-64z" />
</vector>

9
app/src/main/res/drawable/ic_more_h_32.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M320,512c0,35.2 -28.8,64 -64,64s-64,-28.8 -64,-64 28.8,-64 64,-64 64,28.8 64,64zM512,448c-35.2,0 -64,28.8 -64,64s28.8,64 64,64 64,-28.8 64,-64 -28.8,-64 -64,-64zM768,448c-35.2,0 -64,28.8 -64,64s28.8,64 64,64 64,-28.8 64,-64 -28.8,-64 -64,-64z"/>
</vector>

9
app/src/main/res/drawable/ic_more_v.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M512,704c35.2,0 64,28.8 64,64s-28.8,64 -64,64 -64,-28.8 -64,-64 28.8,-64 64,-64zM448,512c0,35.2 28.8,64 64,64s64,-28.8 64,-64 -28.8,-64 -64,-64 -64,28.8 -64,64zM448,256c0,35.2 28.8,64 64,64s64,-28.8 64,-64 -28.8,-64 -64,-64 -64,28.8 -64,64z"/>
</vector>

9
app/src/main/res/drawable/ic_more_v_32.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FF000000"
android:pathData="M512,704c35.2,0 64,28.8 64,64s-28.8,64 -64,64 -64,-28.8 -64,-64 28.8,-64 64,-64zM448,512c0,35.2 28.8,64 64,64s64,-28.8 64,-64 -28.8,-64 -64,-64 -64,28.8 -64,64zM448,256c0,35.2 28.8,64 64,64s64,-28.8 64,-64 -28.8,-64 -64,-64 -64,28.8 -64,64z"/>
</vector>

BIN
app/src/main/res/drawable/img_switch_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
app/src/main/res/drawable/img_switch_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

111
app/src/main/res/layout/device_activity.xml
View File

@@ -1,43 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/device_activity"
android:id="@id/device_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.device.DeviceActivity">
<RelativeLayout
android:id="@+id/device_activity_rl"
android:id="@id/device_activity_outside"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/main_bg_color">
<Button
android:id="@+id/device_btn1"
<LinearLayout
android:id="@id/device_activity_inner_title"
android:background="@color/main_bg_color"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="50dp">
<!--标题栏 返回-->
<androidx.appcompat.widget.AppCompatImageButton
android:id="@id/device_activity_inner_back"
android:layout_weight="1"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@color/empty"
android:scaleType="centerInside"
android:src="@drawable/ic_back_32"/>
<!--标题中间部分-->
<RelativeLayout
android:layout_weight="5"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<!--name名称-->
<TextView
android:id="@id/device_activity_inner_name"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:textSize="16dp"
android:text="@string/test_hello_blank_textview_1"/>
<!--描述信息-->
<TextView
android:id="@id/device_activity_inner_description"
android:layout_width="match_parent"
android:layout_height="20dp"
android:gravity="center"
android:textSize="12dp"
android:layout_below="@id/device_activity_inner_name"
android:text="@string/test_hello_blank_textview_3"/>
</RelativeLayout>
<!--标题栏 更多设置-->
<androidx.appcompat.widget.AppCompatImageButton
android:id="@id/device_activity_inner_more_set"
android:layout_weight="1"
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerInside"
android:background="@color/empty"
android:src="@drawable/ic_more_v_32"/>
</LinearLayout>
<RelativeLayout
android:id="@id/device_activity_inner_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/test_btn_1">
android:layout_below="@id/device_activity_inner_title"
android:background="@color/main_bg_color"
>
</Button>
<TextView
android:id="@+id/device_tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/test_hello_blank_textview_1"/>
<!--中间开关图片 可点击-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@id/device_activity_inner_content_switch"
android:layout_margin="50dp"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/img_switch_close"/>
<TextView
android:id="@+id/device_tv2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/device_tv1"
android:text="@string/test_hello_blank_textview_2"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@id/device_activity_inner_content_icon"
android:layout_centerHorizontal="true"
android:layout_width="128dp"
android:layout_height="128dp"
android:src="@drawable/ic_device_light_1"/>
<TextView
android:id="@+id/device_tv3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/device_tv2"
android:text="@string/test_hello_blank_textview_3"/>
<TextView
android:id="@id/device_activity_inner_content_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="50dp"
android:gravity="center"
android:layout_centerHorizontal="true"
android:layout_below="@id/device_activity_inner_content_icon"
android:text="@string/test_btn_1"/>
</RelativeLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/device_operate.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.device.DeviceOperate">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@id/device_operate_fullInfo"/>
</RelativeLayout>

1
app/src/main/res/values/colors.xml
View File

@@ -9,4 +9,5 @@
<color name="white">#FFFFFFFF</color>
<color name="gray">#FFAFAFAF</color>
<color name="main_bg_color">#F6F6F6</color>
<color name="empty">#00FF0000</color>
</resources>

18
app/src/main/res/values/ids.xml
View File

@@ -15,7 +15,23 @@
<item name="device_item_cardView_image" type="id"/>
<item name="device_item_cardView_text" type="id"/>
<item name="device_operate_fullInfo" type="id"/>
<!--设备操作页 start-->
<item name="device_activity" type="id"/>
<item name="device_activity_outside" type="id"/>
<item name="device_activity_inner_title" type="id"/>
<item name="device_activity_inner_content" type="id"/>
<!--标题栏-->
<item name="device_activity_inner_back" type="id"/>
<item name="device_activity_inner_name" type="id"/>
<item name="device_activity_inner_description" type="id"/>
<item name="device_activity_inner_more_set" type="id"/>
<!--内容栏-->
<item name="device_activity_inner_content_icon" type="id"/>
<item name="device_activity_inner_content_switch" type="id"/>
<item name="device_activity_inner_content_text" type="id"/>
<!--设备操作页 end-->
<!--设备页 end-->
</resources>