From 044da69a5068fca023d1355a9e16a7cadbfaebb1 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Wed, 19 Oct 2022 17:16:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/powerswitch/PowerSwitchActivity.java   | 10 ++--
 .../main/res/layout/activity_common_title.xml | 55 +++++++++++++++++
 .../main/res/layout/activity_power_switch.xml | 59 +------------------
 app/src/main/res/values/ids.xml               | 16 ++---
 4 files changed, 73 insertions(+), 67 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_common_title.xml

diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java
index a01a4ec..24c1e41 100644
--- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java
+++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/powerswitch/PowerSwitchActivity.java
@@ -49,11 +49,11 @@ public class PowerSwitchActivity extends BaseActivity {
         if (null != data) {
             this.device = data;
             // 标题名称
-            TextView titleTextView = findViewById(R.id.power_switch_activity_title_name);
+            TextView titleTextView = findViewById(R.id.activity_title_name);
             titleTextView.setText(device.getName());
 
             // 副标题名称
-            TextView descTextView = findViewById(R.id.power_switch_activity_title_description);
+            TextView descTextView = findViewById(R.id.activity_title_description);
             descTextView.setText(device.getDescription());
 
             // 开关底部的名称
@@ -73,10 +73,12 @@ public class PowerSwitchActivity extends BaseActivity {
         binding.powerSwitchActivityContentSwitch.setOnClickListener(this::imageSwitchClickListener);
 
         // 标题栏 返回
-        binding.powerSwitchActivityTitleBack.setOnClickListener(this::buttonBackClickListener);
+        findViewById(R.id.activity_title_back).setOnClickListener(this::buttonBackClickListener);
+//        binding.powerSwitchActivityTitleBack.setOnClickListener(this::buttonBackClickListener);
 
         // 标题栏 更多设置
-        binding.powerSwitchActivityTitleMoreSet.setOnClickListener(this::buttonMoreSetClickListener);
+        findViewById(R.id.activity_title_more_set).setOnClickListener(this::buttonMoreSetClickListener);
+//        binding.powerSwitchActivityTitleMoreSet.setOnClickListener(this::buttonMoreSetClickListener);
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_common_title.xml b/app/src/main/res/layout/activity_common_title.xml
new file mode 100644
index 0000000..8bd6218
--- /dev/null
+++ b/app/src/main/res/layout/activity_common_title.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@id/activity_layout_title"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/main_bg_color"
+        android:gravity="center">
+
+    <!--标题栏 返回-->
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@id/activity_title_back"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="5dp"
+        android:layout_weight="1"
+        android:background="@color/empty"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_back_32" />
+
+    <!--标题中间部分-->
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="5">
+
+        <!--name名称-->
+        <TextView
+            android:id="@id/activity_title_name"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:text="@string/test_hello_blank_textview_1"
+            android:textSize="16dp" />
+        <!--描述信息-->
+        <TextView
+            android:id="@id/activity_title_description"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_below="@id/activity_title_name"
+            android:gravity="center"
+            android:text="@string/test_hello_blank_textview_3"
+            android:textSize="12dp" />
+    </RelativeLayout>
+
+    <!--标题栏 更多设置-->
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@id/activity_title_more_set"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginRight="5dp"
+        android:layout_weight="1"
+        android:background="@color/empty"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_more_v_32" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_power_switch.xml b/app/src/main/res/layout/activity_power_switch.xml
index 1da95bb..2c78dc7 100644
--- a/app/src/main/res/layout/activity_power_switch.xml
+++ b/app/src/main/res/layout/activity_power_switch.xml
@@ -12,67 +12,14 @@
         android:layout_height="match_parent"
         android:background="@color/main_bg_color">
 
-        <LinearLayout
-            android:id="@id/power_switch_activity_layout_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/power_switch_activity_title_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/power_switch_activity_title_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/power_switch_activity_title_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="20dp"
-                    android:gravity="center"
-                    android:textSize="12dp"
-                    android:layout_below="@id/power_switch_activity_title_name"
-                    android:text="@string/test_hello_blank_textview_3"/>
-            </RelativeLayout>
-
-            <!--标题栏 更多设置-->
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@id/power_switch_activity_title_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>
+        <include layout="@layout/activity_common_title"/>
 
         <RelativeLayout
             android:id="@id/power_switch_activity_layout_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/power_switch_activity_layout_title"
-            android:background="@color/main_bg_color"
-            >
-
+            android:layout_below="@id/activity_layout_title"
+            android:background="@color/main_bg_color">
 
             <!--中间开关图片 可点击-->
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index f3c7437..8fbbd7f 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <!--common start-->
+    <item name="activity_layout_title" type="id"/>
+    <item name="activity_title_back" type="id"/>
+    <item name="activity_title_name" type="id"/>
+    <item name="activity_title_description" type="id"/>
+    <item name="activity_title_more_set" type="id"/>
+    <!--common end-->
+
     <!-- 首页 底部导航栏 start-->
     <item name="bottom_nav_device" type="id"/>
     <item name="bottom_nav_log" type="id"/>
@@ -18,15 +27,8 @@
     <!--开关操作页 start-->
     <item name="power_switch_activity" type="id"/>
     <item name="power_switch_activity_layout" type="id"/>
-    <item name="power_switch_activity_layout_title" type="id"/>
     <item name="power_switch_activity_layout_content" type="id"/>
 
-    <!--标题栏-->
-    <item name="power_switch_activity_title_back" type="id"/>
-    <item name="power_switch_activity_title_name" type="id"/>
-    <item name="power_switch_activity_title_description" type="id"/>
-    <item name="power_switch_activity_title_more_set" type="id"/>
-
     <!--内容栏-->
     <item name="power_switch_activity_content_icon" type="id"/>
     <item name="power_switch_activity_content_switch" type="id"/>