From b2967495ffc11d6dfb222efbaa4e8c988cb53cc9 Mon Sep 17 00:00:00 2001 From: niushuai233 Date: Tue, 16 Apr 2024 19:32:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20:tokyo=5Ftower:=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/niushuai/dididone/biz/BizGlobal.java | 5 +---- .../niushuai/dididone/biz/dao/RecordDao.java | 2 +- .../niushuai/dididone/biz/entity/Project.java | 17 +++++--------- .../niushuai/dididone/biz/entity/Record.java | 18 +++++---------- .../ui/component/ProjectPopupView.java | 3 --- .../dididone/ui/setting/SettingFragment.java | 1 - .../ui/setting/icon/IconFragment.java | 7 ------ .../icon/recycle/IconRecycleAdapter.java | 20 ++++++++--------- .../cc/niushuai/dididone/util/Snowflake.java | 22 +++++++------------ app/src/main/res/drawable/bg_miui10.xml | 3 +-- .../main/res/drawable/ic_menu_calendar.xml | 12 +++++----- app/src/main/res/drawable/ic_menu_icon.xml | 6 ++--- app/src/main/res/drawable/ic_menu_project.xml | 12 +++++----- .../res/drawable/round_text_view_15dp.xml | 3 +-- app/src/main/res/layout/nav_header_main.xml | 5 ++--- app/src/main/res/layout/project_grid_item.xml | 10 ++++----- .../main/res/navigation/mobile_navigation.xml | 18 +++++++-------- 17 files changed, 62 insertions(+), 102 deletions(-) diff --git a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java index 33e6b02..7ba1f36 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java @@ -1,7 +1,5 @@ package cc.niushuai.dididone.biz; -import org.json.JSONArray; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,12 +23,11 @@ public class BizGlobal { public static final String PROJECT_ICON_COLOR = "projectIconColor"; public static final Map CACHE_PROJECT = new HashMap<>(); public static final Map CACHE_PROJECT_COUNT = new HashMap<>(); + public static int REQUEST_CODE_GENERAL = 1; private BizGlobal() { } - public static int REQUEST_CODE_GENERAL = 1; - public static void buildCache() { // 打卡项缓存 diff --git a/app/src/main/java/cc/niushuai/dididone/biz/dao/RecordDao.java b/app/src/main/java/cc/niushuai/dididone/biz/dao/RecordDao.java index 1654152..e97e1f5 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/dao/RecordDao.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/dao/RecordDao.java @@ -6,8 +6,8 @@ import androidx.room.Insert; import androidx.room.Query; import java.util.List; -import cc.niushuai.dididone.biz.entity.Record; +import cc.niushuai.dididone.biz.entity.Record; import cc.niushuai.dididone.biz.vo.ProjectCount; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/app/src/main/java/cc/niushuai/dididone/biz/entity/Project.java b/app/src/main/java/cc/niushuai/dididone/biz/entity/Project.java index 9b320c9..7272f75 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/entity/Project.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/entity/Project.java @@ -9,30 +9,25 @@ import cc.niushuai.dididone.util.Snowflake; @Entity(tableName = "t_project") public class Project { - public Project() { - this.id = Snowflake.next_id(); - this.deleted = 0; - this.createDate = System.currentTimeMillis(); - } - @PrimaryKey private Long id; - @ColumnInfo(name = "name") private String name; - @ColumnInfo(name = "icon") private String icon; - @ColumnInfo(name = "icon_color") private Integer iconColor; - @ColumnInfo(name = "create_date") private Long createDate; - @ColumnInfo(name = "deleted") private Integer deleted; + public Project() { + this.id = Snowflake.next_id(); + this.deleted = 0; + this.createDate = System.currentTimeMillis(); + } + public Long getId() { return id; } diff --git a/app/src/main/java/cc/niushuai/dididone/biz/entity/Record.java b/app/src/main/java/cc/niushuai/dididone/biz/entity/Record.java index 3f950a3..a318718 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/entity/Record.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/entity/Record.java @@ -9,33 +9,27 @@ import cc.niushuai.dididone.util.Snowflake; @Entity(tableName = "t_record") public class Record { - public Record() { - this.id = Snowflake.next_id(); - this.deleted = 0; - this.createDate = System.currentTimeMillis(); - } - @PrimaryKey private Long id; - @ColumnInfo(name = "name") private String name; - @ColumnInfo(name = "check_date") private Long checkDate; - @ColumnInfo(name = "project_id") private Long projectId; - @ColumnInfo(name = "description") private String description; - @ColumnInfo(name = "create_date") private Long createDate; - @ColumnInfo(name = "deleted") private Integer deleted; + public Record() { + this.id = Snowflake.next_id(); + this.deleted = 0; + this.createDate = System.currentTimeMillis(); + } + public Long getId() { return id; } diff --git a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java index 4e3a658..3a5000c 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java @@ -17,15 +17,12 @@ import com.lxj.xpopup.util.XPopupUtils; import com.lxj.xpopup.widget.VerticalRecyclerView; import com.mikepenz.iconics.IconicsDrawable; -import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.function.Consumer; import cc.niushuai.dididone.R; import cc.niushuai.dididone.biz.BizGlobal; import cc.niushuai.dididone.biz.entity.Project; -import cc.niushuai.dididone.util.Toasts; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java index aa006bc..9c672df 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java @@ -10,7 +10,6 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import cc.niushuai.dididone.databinding.FragmentSettingBinding; -import cc.niushuai.dididone.util.ActivityUtil; public class SettingFragment extends Fragment { diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java index 5ce0eb5..a12e277 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java @@ -8,7 +8,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,20 +15,14 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.mikepenz.community_material_typeface_library.CommunityMaterial; -import com.mikepenz.fontawesome_typeface_library.FontAwesome; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import cc.niushuai.dididone.R; import cc.niushuai.dididone.biz.entity.SavedIcon; import cc.niushuai.dididone.databinding.FragmentIconBinding; import cc.niushuai.dididone.ui.base.InitAndSetListener; diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/recycle/IconRecycleAdapter.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/recycle/IconRecycleAdapter.java index 38ea374..e3aacc1 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/recycle/IconRecycleAdapter.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/icon/recycle/IconRecycleAdapter.java @@ -28,10 +28,11 @@ import cc.niushuai.dididone.util.XLog; public class IconRecycleAdapter extends RecyclerView.Adapter { public static final Map> ICON_MAP = new HashMap<>(); + int selectedPosition = -1; + int lastSelectedPosition = -1; private Class iconClass; private List savedIconList; private Activity activity; - private String selectedIcon; public IconRecycleAdapter(Activity activity, Class iconClass) { @@ -40,6 +41,12 @@ public class IconRecycleAdapter extends RecyclerView.Adapter true); } + public static String getIconClassName(Class iconClass) { + String iconClassName = iconClass.getName(); + return iconClassName.substring(iconClassName.lastIndexOf(".") + 1, iconClassName.indexOf("$")); + + } + public String getSelectedIcon() { return selectedIcon; } @@ -66,8 +73,6 @@ public class IconRecycleAdapter extends RecyclerView.Adapter iconClass) { - String iconClassName = iconClass.getName(); - return iconClassName.substring(iconClassName.lastIndexOf(".") + 1, iconClassName.indexOf("$")); - - } - - public class IconRecycleViewHolder extends RecyclerView.ViewHolder { - private IconGridItemBinding binding; protected ImageView iconView; protected TextView txtView; + private IconGridItemBinding binding; public IconRecycleViewHolder(@NonNull View itemView) { diff --git a/app/src/main/java/cc/niushuai/dididone/util/Snowflake.java b/app/src/main/java/cc/niushuai/dididone/util/Snowflake.java index f884d0c..2674644 100644 --- a/app/src/main/java/cc/niushuai/dididone/util/Snowflake.java +++ b/app/src/main/java/cc/niushuai/dididone/util/Snowflake.java @@ -26,35 +26,22 @@ import java.util.concurrent.atomic.AtomicLong; */ public class Snowflake { private static final Snowflake snowflake = new Snowflake(0L); - - public static long next_id() { - return snowflake.nextId(); - } - - public static String next_id_str() { - return snowflake.nextId() + ""; - } - /** * Start time cut (2020-05-03) */ private final long twepoch = 1588435200000L; - /** * The number of bits occupied by workerId */ private final int workerIdBits = 10; - /** * The number of bits occupied by timestamp */ private final int timestampBits = 41; - /** * The number of bits occupied by sequence */ private final int sequenceBits = 12; - /** * Maximum supported machine id, the result is 1023 */ @@ -78,7 +65,6 @@ public class Snowflake { * lowest 12 bit: sequence */ private AtomicLong timestampAndSequence; - /** * instantiate an IdWorker using given workerId * @@ -89,6 +75,14 @@ public class Snowflake { initWorkerId(workerId); } + public static long next_id() { + return snowflake.nextId(); + } + + public static String next_id_str() { + return snowflake.nextId() + ""; + } + /** * init first timestamp and sequence immediately */ diff --git a/app/src/main/res/drawable/bg_miui10.xml b/app/src/main/res/drawable/bg_miui10.xml index f0e713b..a564865 100644 --- a/app/src/main/res/drawable/bg_miui10.xml +++ b/app/src/main/res/drawable/bg_miui10.xml @@ -2,8 +2,7 @@ - + diff --git a/app/src/main/res/drawable/ic_menu_calendar.xml b/app/src/main/res/drawable/ic_menu_calendar.xml index 21ee1b8..7f8c720 100644 --- a/app/src/main/res/drawable/ic_menu_calendar.xml +++ b/app/src/main/res/drawable/ic_menu_calendar.xml @@ -3,10 +3,10 @@ android:height="128dp" android:viewportWidth="1024" android:viewportHeight="1024"> - - + + diff --git a/app/src/main/res/drawable/ic_menu_icon.xml b/app/src/main/res/drawable/ic_menu_icon.xml index f76c55d..8992c82 100644 --- a/app/src/main/res/drawable/ic_menu_icon.xml +++ b/app/src/main/res/drawable/ic_menu_icon.xml @@ -3,7 +3,7 @@ android:height="128dp" android:viewportWidth="1024" android:viewportHeight="1024"> - + diff --git a/app/src/main/res/drawable/ic_menu_project.xml b/app/src/main/res/drawable/ic_menu_project.xml index 9ce1946..73bccf5 100644 --- a/app/src/main/res/drawable/ic_menu_project.xml +++ b/app/src/main/res/drawable/ic_menu_project.xml @@ -3,10 +3,10 @@ android:height="128dp" android:viewportWidth="1024" android:viewportHeight="1024"> - - + + diff --git a/app/src/main/res/drawable/round_text_view_15dp.xml b/app/src/main/res/drawable/round_text_view_15dp.xml index f0e713b..a564865 100644 --- a/app/src/main/res/drawable/round_text_view_15dp.xml +++ b/app/src/main/res/drawable/round_text_view_15dp.xml @@ -2,8 +2,7 @@ - + diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index dc9cf34..177637a 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -19,9 +19,8 @@ android:contentDescription="@string/nav_header_desc" android:paddingTop="@dimen/nav_header_vertical_spacing" app:ico_color="@color/red" - app:ico_icon="ion_ios_heart" - /> - + app:ico_icon="ion_ios_heart" /> + + android:layout_marginTop="15dp" + android:src="@mipmap/ic_launcher" /> + android:textSize="20dp" /> \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 3a7969b..adbadc8 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -16,23 +16,21 @@ android:name="cc.niushuai.dididone.ui.statistic.StatisticFragment" android:label="@string/n_menu_name_statistic" tools:layout="@layout/fragment_statistic" /> - + + android:label="@string/n_menu_name_project" /> + android:label="@string/n_menu_name_icon" /> \ No newline at end of file