From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成
---
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 2dab2a6..e41f787 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
@@ -18,6 +18,7 @@
import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.manager.AppManager;
+import com.android.app_base.utils.ScreenSizeUtils;
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;
@@ -33,12 +34,23 @@
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.PetDetailActivity;
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.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.main.MainActivity;
+import com.github.gzuliyujiang.wheelpicker.DatePicker;
+import com.github.gzuliyujiang.wheelpicker.OptionPicker;
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity;
+import com.github.gzuliyujiang.wheelpicker.impl.UnitDateFormatter;
+import com.github.gzuliyujiang.wheelpicker.widget.DateWheelLayout;
+import com.github.gzuliyujiang.wheelpicker.widget.OptionWheelLayout;
import com.hjq.bar.TitleBar;
+import java.util.Calendar;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -89,7 +101,7 @@
super.onCreate(savedInstanceState);
if (mDrawerLayout != null) {
- classMap.put(null,(LinearLayout) findViewById(R.id.dl_home_root_net));
+ classMap.put(HomeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
classMap.put(FamilyMemorabiliaActivity.class,(LinearLayout) findViewById(R.id.dl_family_memorabilia));
classMap.put(FamilyAssetsActivity.class,(LinearLayout) findViewById(R.id.dl_family_assets));
classMap.put(HomeDevicesActivity.class,(LinearLayout) findViewById(R.id.dl_home_devices));
@@ -114,7 +126,11 @@
if (linearLayout != null) {
linearLayout.setOnClickListener(v -> {
if (set.getKey() != null){
- AppManager.getAppManager().startActivity(set.getKey());
+ if (set.getKey() == HomeFragment.class) {
+ MainActivity.start(this, HomeFragment.class);
+ }else{
+ AppManager.getAppManager().startActivity(set.getKey());
+ }
}
});
} else {
@@ -168,4 +184,41 @@
popupWindow.setOutsideTouchable(false);
return popupWindow;
}
+
+ public DatePicker getDatePicker(){
+ DatePicker datePicker = new DatePicker(this);
+ DateWheelLayout wheelLayout = datePicker.getWheelLayout();
+ wheelLayout.getMonthWheelView().setCurtainCorner(0);//鑳屾櫙鏃犲渾瑙�
+ wheelLayout.getDayWheelView().setCurtainCorner(5);//鑳屾櫙鍙宠竟鏈夊渾瑙�
+ wheelLayout.getYearWheelView().setCurtainCorner(4);//鑳屾櫙宸﹁竟鏈夊渾瑙�
+ wheelLayout.setDateFormatter(new UnitDateFormatter());
+ wheelLayout.setPadding(50, 0, 50, 0);
+ wheelLayout.setItemSpace(ScreenSizeUtils.dip2px(getSelfActivity(), 20));
+ wheelLayout.setCurtainEnabled(true);
+ wheelLayout.setCurtainColor(Color.parseColor("#4D2F63F8"));
+ wheelLayout.setCurtainRadius(ScreenSizeUtils.dip2px(getSelfActivity(),4));
+ wheelLayout.setSelectedTextColor(Color.parseColor("#FF2F63F8"));
+ wheelLayout.setTextColor(Color.parseColor("#FF999999"));
+ wheelLayout.setIndicatorEnabled(false);
+ //鏃ユ湡鍙�夎寖鍥�
+ wheelLayout.setRange(DateEntity.target(1900, 1, 1), DateEntity.target(2500, 12, 31),DateEntity.target(Calendar.getInstance()));
+ datePicker.getWheelLayout().setResetWhenLinkage(false);
+ return datePicker;
+ }
+
+ public OptionPicker getOptionPicker(List<String> list){
+ OptionPicker picker = new OptionPicker(this);
+ OptionWheelLayout wheelLayout = picker.getWheelLayout();
+ wheelLayout.setCurtainCorner(1);//鑳屾櫙鏃犲渾瑙�
+ wheelLayout.setPadding(50, 0, 50, 0);
+ wheelLayout.setItemSpace(ScreenSizeUtils.dip2px(getSelfActivity(), 20));
+ wheelLayout.setCurtainEnabled(true);
+ wheelLayout.setCurtainColor(Color.parseColor("#4D2F63F8"));
+ wheelLayout.setCurtainRadius(ScreenSizeUtils.dip2px(getSelfActivity(),4));
+ wheelLayout.setSelectedTextColor(Color.parseColor("#FF2F63F8"));
+ wheelLayout.setTextColor(Color.parseColor("#FF999999"));
+ wheelLayout.setIndicatorEnabled(false);
+ picker.setData(list);
+ return picker;
+ }
}
--
Gitblit v1.9.1