From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
index 6c08b27..c5ec593 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
@@ -47,6 +47,30 @@
                 AppManager.getAppManager().startActivity(FamilyMemorabiliaActivity.class);
             }
         });
+        binding.layoutGrowingUp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
+            }
+        });
+        binding.layoutFamilyAssets.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AppManager.getAppManager().startActivity(FamilyAssetsActivity.class);
+            }
+        });
+        binding.layoutHomeDevices.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AppManager.getAppManager().startActivity(HomeDevicesActivity.class);
+            }
+        });
+        binding.layoutGrowingUp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
+            }
+        });
     }
 
     @Override

--
Gitblit v1.9.1