From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交

---
 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java |   53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
index 3753b6d..bfa7809 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
@@ -1,10 +1,13 @@
 package com.application.zhangshi_app_android.ui;
 
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -16,10 +19,13 @@
 import com.android.app_base.base.viewmodel.BaseViewModel;
 import com.android.app_base.manager.AppManager;
 import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.ui.function.CertificateOfHonorActivity;
 import com.application.zhangshi_app_android.ui.function.CleanStorageActivity;
+import com.application.zhangshi_app_android.ui.function.ContactsActivity;
 import com.application.zhangshi_app_android.ui.function.FamilyAssetsActivity;
 import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivity;
 import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.HealthCareActivity;
 import com.application.zhangshi_app_android.ui.function.HomeDevicesActivity;
 import com.application.zhangshi_app_android.ui.function.HonorCollectionActivity;
 import com.application.zhangshi_app_android.ui.function.HundredWishActivity;
@@ -27,7 +33,9 @@
 import com.application.zhangshi_app_android.ui.function.LittleDoctorActivity;
 import com.application.zhangshi_app_android.ui.function.MarriageActivity;
 import com.application.zhangshi_app_android.ui.function.PetActivity;
+import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
 import com.application.zhangshi_app_android.ui.function.PropertyActivity;
+import com.application.zhangshi_app_android.ui.function.TourismActivity;
 import com.hjq.bar.TitleBar;
 
 import java.util.HashMap;
@@ -95,16 +103,23 @@
             classMap.put(MarriageActivity.class,(LinearLayout) findViewById(R.id.dl_marriage));
             classMap.put(PropertyActivity.class,(LinearLayout) findViewById(R.id.dl_property));
             classMap.put(HundredWishActivity.class,(LinearLayout) findViewById(R.id.dl_hundred_wish));
-            classMap.put(null,(LinearLayout) findViewById(R.id.dl_health_care));
-            classMap.put(null,(LinearLayout) findViewById(R.id.dl_certificate_of_honor));
-            classMap.put(null,(LinearLayout) findViewById(R.id.dl_privacy));
+            classMap.put(HealthCareActivity.class,(LinearLayout) findViewById(R.id.dl_health_care));
+            classMap.put(CertificateOfHonorActivity.class,(LinearLayout) findViewById(R.id.dl_certificate_of_honor));
+            classMap.put(PrivacyActivity.class,(LinearLayout) findViewById(R.id.dl_privacy));
+            classMap.put(null,(LinearLayout) findViewById(R.id.dl_tourism));
+
             setSelectItem(classMap.get(getClass()));
             for (Map.Entry<Class, LinearLayout> set : classMap.entrySet()) {
-                set.getValue().setOnClickListener(v -> {
-                    if (set.getKey() != null){
-                        AppManager.getAppManager().startActivity(set.getKey());
-                    }
-                });
+                LinearLayout linearLayout = set.getValue();
+                if (linearLayout != null) {
+                    linearLayout.setOnClickListener(v -> {
+                        if (set.getKey() != null){
+                            AppManager.getAppManager().startActivity(set.getKey());
+                        }
+                    });
+                } else {
+
+                }
             }
             mDrawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
         }
@@ -130,7 +145,27 @@
 
     @Override
     public void onLeftClick(TitleBar titleBar) {
-        super.onRightClick(titleBar);
+        super.onLeftClick(titleBar);
         mDrawerLayout.open();
     }
+
+    public PopupWindow initPopUpWindow(View view){
+        PopupWindow popupWindow = new PopupWindow(this);
+        // 璁剧疆甯冨眬鏂囦欢
+        popupWindow.setContentView(view);
+        // 涓轰簡閬垮厤閮ㄥ垎鏈哄瀷涓嶆樉绀猴紝闇�瑕侀噸鏂拌缃竴涓嬪楂�
+        popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        // 璁剧疆pop閫忔槑鏁堟灉
+        popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
+        // 璁剧疆pop鍑哄叆鍔ㄧ敾
+        popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
+        // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
+        popupWindow.setFocusable(true);
+        // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
+        popupWindow.setTouchable(true);
+        // 璁剧疆鐐瑰嚮pop澶栦晶娑堝け锛岄粯璁や负false锛涘湪focusable涓簍rue鏃剁偣鍑诲渚у缁堟秷澶�
+        popupWindow.setOutsideTouchable(false);
+        return popupWindow;
+    }
 }

--
Gitblit v1.9.1