Browse Source

test: 🎶 test

master
niushuai233 1 year ago
parent
commit
b7d09547bd
  1. 3
      app/src/main/java/cc/niushuai/dididone/ui/base/BaseActivity.java
  2. 32
      app/src/main/java/cc/niushuai/dididone/ui/base/BaseFragment.java
  3. 22
      app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
  4. 7
      app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
  5. 6
      app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java
  6. 7
      app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticFragment.java
  7. 31
      app/src/main/java/cc/niushuai/dididone/ui/statistic/charts/BaseChartFragment.java
  8. 6
      app/src/main/java/cc/niushuai/dididone/ui/statistic/charts/ListFragment.java

3
app/src/main/java/cc/niushuai/dididone/ui/base/BaseActivity.java

@ -24,6 +24,7 @@ import java.util.List;
import cc.niushuai.dididone.biz.entity.SavedIcon; import cc.niushuai.dididone.biz.entity.SavedIcon;
import cc.niushuai.dididone.ui.setting.icon.recycle.IconRecycleAdapter; import cc.niushuai.dididone.ui.setting.icon.recycle.IconRecycleAdapter;
import cc.niushuai.dididone.util.Snowflake; import cc.niushuai.dididone.util.Snowflake;
import cc.niushuai.dididone.util.XLog;
public abstract class BaseActivity extends AppCompatActivity { public abstract class BaseActivity extends AppCompatActivity {
@ -49,7 +50,7 @@ public abstract class BaseActivity extends AppCompatActivity {
private void addFontMap(Class<? extends IIcon> iconClass) { private void addFontMap(Class<? extends IIcon> iconClass) {
if (!iconClass.isEnum()) { if (!iconClass.isEnum()) {
Log.d(this.getClass().getSimpleName(), iconClass.getName() + " class not enum class"); XLog.d(this.getClass().getSimpleName(), iconClass.getName() + " class not enum class");
return; return;
} }

32
app/src/main/java/cc/niushuai/dididone/ui/base/BaseFragment.java

@ -13,23 +13,53 @@ import cc.niushuai.dididone.util.XLog;
public abstract class BaseFragment extends Fragment implements InitAndSetListener { public abstract class BaseFragment extends Fragment implements InitAndSetListener {
@Override
public void onStart() {
XLog.d("{} onStart", getClass().getSimpleName());
super.onStart();
}
@Override
public void onDestroy() {
XLog.d("{} onDestroy", getClass().getSimpleName());
super.onDestroy();
}
@Override
public void onDestroyView() {
XLog.d("{} onDestroyView", getClass().getSimpleName());
super.onDestroyView();
}
@Override
public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
XLog.d("{} onViewStateRestored", getClass().getSimpleName());
super.onViewStateRestored(savedInstanceState);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
XLog.d("{} onCreate", getClass().getSimpleName());
super.onCreate(savedInstanceState);
}
@Nullable @Nullable
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
XLog.d("{} onCreateView", getClass().getSimpleName());
return super.onCreateView(inflater, container, savedInstanceState); return super.onCreateView(inflater, container, savedInstanceState);
} }
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
XLog.d("{} {} onViewCreated", getId(), getClass().getName());
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
init(); init();
setListeners(); setListeners();
XLog.d("{} onViewCreated", getId());
} }
} }

22
app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java

@ -43,6 +43,7 @@ import cc.niushuai.dididone.biz.entity.Project;
import cc.niushuai.dididone.biz.entity.Record; import cc.niushuai.dididone.biz.entity.Record;
import cc.niushuai.dididone.biz.roomx.DBManager; import cc.niushuai.dididone.biz.roomx.DBManager;
import cc.niushuai.dididone.databinding.FragmentCalendarBinding; import cc.niushuai.dididone.databinding.FragmentCalendarBinding;
import cc.niushuai.dididone.ui.base.BaseFragment;
import cc.niushuai.dididone.ui.component.ProjectPopupView; import cc.niushuai.dididone.ui.component.ProjectPopupView;
import cc.niushuai.dididone.util.IntSnowflake; import cc.niushuai.dididone.util.IntSnowflake;
import cc.niushuai.dididone.util.Toasts; import cc.niushuai.dididone.util.Toasts;
@ -59,7 +60,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
public class CalendarFragment extends Fragment { public class CalendarFragment extends BaseFragment {
private FragmentCalendarBinding binding; private FragmentCalendarBinding binding;
@ -69,23 +70,23 @@ public class CalendarFragment extends Fragment {
// private List<Project> floatingActionProjectList; // private List<Project> floatingActionProjectList;
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
XLog.d("{} onCreateView", getClass().getSimpleName());
CalendarViewModel calendarViewModel = new ViewModelProvider(this).get(CalendarViewModel.class); CalendarViewModel calendarViewModel = new ViewModelProvider(this).get(CalendarViewModel.class);
binding = FragmentCalendarBinding.inflate(inflater, container, false); binding = FragmentCalendarBinding.inflate(inflater, container, false);
View root = binding.getRoot(); View root = binding.getRoot();
// 初始化数据
init();
// 设置监听器
setListeners();
return root; return root;
} }
private void init() { @Override
public void init() {
initPointList(); initPointList();
binding.miui10Calendar.setInitializeDate(DateUtil.date().toDateStr()); XLog.d("lastDate: {}", lastDate);
if (StrUtil.isNotEmpty(lastDate)) {
rebuildRecordListViewByDate(lastDate);
}
// 构建弹出框内容 // 构建弹出框内容
// fetchNewestActionButtonData(); // fetchNewestActionButtonData();
@ -121,7 +122,8 @@ public class CalendarFragment extends Fragment {
} }
private void setListeners() { @Override
public void setListeners() {
// 日历选择变更事件 // 日历选择变更事件
addCalendarChangeListener(); addCalendarChangeListener();
// floatAction // floatAction
@ -221,7 +223,7 @@ public class CalendarFragment extends Fragment {
return; return;
} }
Log.d(getTag(), "当前选中 " + localDate); XLog.d("当前选中 " + localDate);
Lunar lunar = CalendarUtil.getCalendarDate(localDate).lunar; Lunar lunar = CalendarUtil.getCalendarDate(localDate).lunar;
String lunarDate = lunar.chineseEra + "年" + lunar.lunarMonthStr + lunar.lunarDayStr; String lunarDate = lunar.chineseEra + "年" + lunar.lunarMonthStr + lunar.lunarDayStr;

7
app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java

@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import cc.niushuai.dididone.databinding.FragmentSettingBinding; import cc.niushuai.dididone.databinding.FragmentSettingBinding;
import cc.niushuai.dididone.util.XLog;
public class SettingFragment extends Fragment { public class SettingFragment extends Fragment {
@ -37,15 +38,15 @@ public class SettingFragment extends Fragment {
private void iconClickListener() { private void iconClickListener() {
binding.sSetAppIcon.setOnClickListener(view -> { binding.sSetAppIcon.setOnClickListener(view -> {
Log.d(getTag(), "sSetAppIcon click"); XLog.d( "sSetAppIcon click");
Log.d(getTag(), "sSetAppIcon click complete"); XLog.d( "sSetAppIcon click complete");
}); });
} }
private void projectClickListener() { private void projectClickListener() {
binding.sSetAppProject.setOnClickListener(view -> { binding.sSetAppProject.setOnClickListener(view -> {
Log.d(getTag(), "sSetAppProject click"); XLog.d( "sSetAppProject click");
}); });
} }

6
app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java

@ -25,10 +25,11 @@ import java.util.function.Predicate;
import cc.niushuai.dididone.biz.entity.SavedIcon; import cc.niushuai.dididone.biz.entity.SavedIcon;
import cc.niushuai.dididone.databinding.FragmentIconBinding; import cc.niushuai.dididone.databinding.FragmentIconBinding;
import cc.niushuai.dididone.ui.base.BaseFragment;
import cc.niushuai.dididone.ui.base.InitAndSetListener; import cc.niushuai.dididone.ui.base.InitAndSetListener;
import cc.niushuai.dididone.ui.setting.icon.recycle.IconRecycleAdapter; import cc.niushuai.dididone.ui.setting.icon.recycle.IconRecycleAdapter;
public class IconFragment extends Fragment implements InitAndSetListener { public class IconFragment extends BaseFragment {
private FragmentIconBinding binding; private FragmentIconBinding binding;
@ -40,9 +41,6 @@ public class IconFragment extends Fragment implements InitAndSetListener {
binding = FragmentIconBinding.inflate(inflater, container, false); binding = FragmentIconBinding.inflate(inflater, container, false);
View root = binding.getRoot(); View root = binding.getRoot();
init();
setListeners();
return root; return root;
} }

7
app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticFragment.java

@ -18,19 +18,22 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cc.niushuai.dididone.databinding.FragmentStatisticBinding; import cc.niushuai.dididone.databinding.FragmentStatisticBinding;
import cc.niushuai.dididone.ui.base.BaseFragment;
import cc.niushuai.dididone.ui.statistic.charts.BaseChartFragment; import cc.niushuai.dididone.ui.statistic.charts.BaseChartFragment;
import cc.niushuai.dididone.ui.statistic.charts.ListFragment; import cc.niushuai.dididone.ui.statistic.charts.ListFragment;
import cc.niushuai.dididone.ui.statistic.charts.MonthFragment; import cc.niushuai.dididone.ui.statistic.charts.MonthFragment;
import cc.niushuai.dididone.ui.statistic.charts.OtherFragment; import cc.niushuai.dididone.ui.statistic.charts.OtherFragment;
import cc.niushuai.dididone.ui.statistic.charts.WeekFragment; import cc.niushuai.dididone.ui.statistic.charts.WeekFragment;
import cc.niushuai.dididone.util.XLog;
public class StatisticFragment extends Fragment { public class StatisticFragment extends BaseFragment {
private FragmentStatisticBinding binding; private FragmentStatisticBinding binding;
List<BaseChartFragment> fragments = new ArrayList<>(4);; private List<BaseChartFragment> fragments = new ArrayList<>(4);;
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { ViewGroup container, Bundle savedInstanceState) {
XLog.d("{} onCreateView", getClass().getSimpleName());
StatisticViewModel statisticViewModel = StatisticViewModel statisticViewModel =
new ViewModelProvider(this).get(StatisticViewModel.class); new ViewModelProvider(this).get(StatisticViewModel.class);

31
app/src/main/java/cc/niushuai/dididone/ui/statistic/charts/BaseChartFragment.java

@ -37,35 +37,4 @@ public class BaseChartFragment extends BaseFragment {
return DateUtil.parseDate(date).getTime(); return DateUtil.parseDate(date).getTime();
} }
@Override
public void onStart() {
super.onStart();
XLog.d("{} onStart", getTitle());
}
@Override
public void onDestroy() {
super.onDestroy();
XLog.d("{} onDestroy", getTitle());
}
@Override
public void onDestroyView() {
super.onDestroyView();
XLog.d("{} onDestroyView", getTitle());
}
@Override
public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
XLog.d("{} onViewStateRestored", getTitle());
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
setRetainInstance(true);
super.onCreate(savedInstanceState);
XLog.d("{} onCreate", getTitle());
}
} }

6
app/src/main/java/cc/niushuai/dididone/ui/statistic/charts/ListFragment.java

@ -158,5 +158,9 @@ public class ListFragment extends BaseChartFragment {
} }
@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}
} }
Loading…
Cancel
Save