From 42ea59771a54d2591df0a6dd3936dda669be99ae Mon Sep 17 00:00:00 2001
From: gs <3129367635@qq.com>
Date: 星期一, 08 七月 2024 12:23:48 +0800
Subject: [PATCH] 会议统计接入增加，删除，修改接口
---
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 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 c5b1f88..cba1cb2 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,8 +1,10 @@
package com.application.zhangshi_app_android.ui;
+
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -31,25 +33,29 @@
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.HomeDevicesActivity;
import com.application.zhangshi_app_android.ui.function.HonorCollectionActivity;
import com.application.zhangshi_app_android.ui.function.HundredWishActivity;
import com.application.zhangshi_app_android.ui.function.IncomeAndExpensesActivity;
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.MeetingActivity;
+import com.application.zhangshi_app_android.ui.function.PersonalNotepadActivity;
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.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
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.TimePicker;
import com.github.gzuliyujiang.wheelpicker.entity.DateEntity;
import com.github.gzuliyujiang.wheelpicker.impl.UnitDateFormatter;
+import com.github.gzuliyujiang.wheelpicker.impl.UnitTimeFormatter;
import com.github.gzuliyujiang.wheelpicker.widget.DateWheelLayout;
import com.github.gzuliyujiang.wheelpicker.widget.OptionWheelLayout;
+import com.github.gzuliyujiang.wheelpicker.widget.TimeWheelLayout;
import com.hjq.bar.TitleBar;
import java.util.Calendar;
@@ -102,13 +108,23 @@
return R.layout.layout_drawer;
};
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+ //璁剧疆涓婚
+ if (UserManager.getInstance().getNightModeState()) {
+ setTheme(R.style.AppTheme_Night);
+ } else {
+ setTheme(R.style.AppTheme_Normal);
+ }
+
super.onCreate(savedInstanceState);
if (mDrawerLayout != null) {
- classMap.put(HomeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
+ classMap.put(TreeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
classMap.put(FamilyMemorabiliaActivity.class,(LinearLayout) findViewById(R.id.dl_family_memorabilia));
+ classMap.put(MeetingActivity.class,(LinearLayout) findViewById(R.id.dl_family_meeting));
classMap.put(FamilyAssetsActivity.class,(LinearLayout) findViewById(R.id.dl_family_assets));
classMap.put(HomeDevicesActivity.class,(LinearLayout) findViewById(R.id.dl_home_devices));
classMap.put(HonorCollectionActivity.class,(LinearLayout) findViewById(R.id.dl_honor_collection));
@@ -117,7 +133,7 @@
classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
classMap.put(PetActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
classMap.put(IncomeAndExpensesActivity.class,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
- classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
+ classMap.put(PersonalNotepadActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
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));
@@ -132,8 +148,8 @@
if (linearLayout != null) {
linearLayout.setOnClickListener(v -> {
if (set.getKey() != null){
- if (set.getKey() == HomeFragment.class) {
- MainActivity.start(this, HomeFragment.class);
+ if (set.getKey() == TreeFragment.class) {
+ MainActivity.start(this, TreeFragment.class);
}else{
if(this.getClass() != set.getKey()){
AppManager.getAppManager().startActivity(set.getKey());
@@ -179,8 +195,12 @@
}
TextView textView = (TextView) linearLayout.getChildAt(1);
ImageView imageView = (ImageView) linearLayout.getChildAt(2);
- textView.setTextColor(Color.parseColor("#FFF6739F"));
- imageView.setBackgroundResource(R.drawable.ic_vector_pink);
+ TypedValue textColor = new TypedValue();
+ getTheme().resolveAttribute(R.attr.drawerTextColor, textColor, true);
+ textView.setTextColor(textColor.data);
+ TypedValue icon = new TypedValue();
+ getTheme().resolveAttribute(R.attr.drawerSelectIcon, icon, true);
+ imageView.setBackgroundResource(icon.resourceId);
}
@@ -235,10 +255,47 @@
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 TimePicker getTimePicker(){
+ TimePicker timePicker = new TimePicker(this);
+ TimeWheelLayout wheelLayout = timePicker.getWheelLayout();
+ wheelLayout.getHourWheelView().setCurtainCorner(0);//鑳屾櫙鏃犲渾瑙�
+ wheelLayout.getMinuteWheelView().setCurtainCorner(5);//鑳屾櫙鍙宠竟鏈夊渾瑙�
+ wheelLayout.getSecondWheelView().setCurtainCorner(4);//鑳屾櫙宸﹁竟鏈夊渾瑙�
+ wheelLayout.setTimeFormatter(new UnitTimeFormatter());
+ 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()));
+
+ timePicker.getWheelLayout().setResetWhenLinkage(false);
+ return timePicker;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
public OptionPicker getOptionPicker(List<String> list){
OptionPicker picker = new OptionPicker(this);
OptionWheelLayout wheelLayout = picker.getWheelLayout();
--
Gitblit v1.9.1