From 59188818c6d551e9273d651c18dfac7d077d1ec7 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Thu, 22 Apr 2021 19:05:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=911.=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 1 + .../spinner/MaterialSpinnerBaseAdapter.java | 2 +- .../com/chinasoft/ohos/spinner/Utils.java | 2 +- .../zhuangfei/timetable/TimetableView.java | 8 +++--- .../timetable/listener/ISchedule.java | 17 +++++++----- .../timetable/listener/OnDateBuildAapter.java | 6 ++--- .../timetable/model/ScheduleConfig.java | 2 +- .../timetable/model/ScheduleSupport.java | 15 ++++++----- .../timetable/operater/SimpleOperater.java | 18 ++++++++----- .../timetable/utils/ScreenUtils.java | 2 +- .../zhuangfei/timetable/view/WeekView.java | 27 ++++++++++--------- 11 files changed, 59 insertions(+), 41 deletions(-) diff --git a/entry/build.gradle b/entry/build.gradle index 3881a49..42100a2 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -13,4 +13,5 @@ dependencies { testCompile 'junit:junit:4.12' compile project(path: ':timetable') implementation 'com.alibaba:fastjson:1.2.55' + //implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') } diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java b/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java index f45c212..e334cea 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java +++ b/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java @@ -92,7 +92,7 @@ public abstract class MaterialSpinnerBaseAdapter extends RecycleItemProvider /** * getItemText * - * @param position + * @param position 位置信息 * @return ItemText */ public String getItemText(int position) { diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java b/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java index 080a57d..7f9716a 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java +++ b/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java @@ -103,7 +103,7 @@ final class Utils { *

Starting in {@link }, the returned drawable will be styled for the * specified Context's theme.

* - * @param drawableId The desired resource identifier, as generated by the aapt tool. + * @param drawableId 图片id，The desired resource identifier, as generated by the aapt tool. * This integer encodes the package, type, and resource entry. * The value 0 is an invalid identifier. * @return Drawable An object that can be used to draw this resource. diff --git a/timetable/src/main/java/com/zhuangfei/timetable/TimetableView.java b/timetable/src/main/java/com/zhuangfei/timetable/TimetableView.java index 62fbe7d..e121c97 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/TimetableView.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/TimetableView.java @@ -142,8 +142,8 @@ public class TimetableView extends DirectionalLayout { /** * callback * - * @param onConfigHandleListener - * @return + * @param onConfigHandleListener 监听 + * @return TimetableView */ public TimetableView callback(ISchedule.OnConfigHandleListener onConfigHandleListener) { this.onConfigHandleListener = onConfigHandleListener; @@ -651,6 +651,8 @@ public class TimetableView extends DirectionalLayout { /** * 周次改变时的回调 + * + * @param cur 回调week的index */ private void onBind(int cur) { onWeekChangedListener().onWeekChanged(cur); @@ -881,7 +883,7 @@ public class TimetableView extends DirectionalLayout { /** * 显示旗标布局，立即生效 * - * @return TimetableView + * @return TimetableView 返回布局自身 */ public TimetableView showFlaglayout() { flagLayout().setVisibility(VISIBLE); diff --git a/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java b/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java index ccc0787..6a4fed0 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java @@ -51,6 +51,7 @@ public interface ISchedule { */ void onSpaceItemClick(int day, int start); + /** * 初始化方法 * @@ -59,6 +60,7 @@ public interface ISchedule { * @param itemWidth 课程项宽度，itemWidth：是包含了边距的，设置宽度时所以需要减去边距 * @param itemHeight 课程项高度 * @param marTop 外边距 + * @param marLeft 距离左侧距离 */ void onInit(DirectionalLayout flagLayout, int monthWidth, int itemWidth, int itemHeight, int marTop, int marLeft); @@ -100,7 +102,7 @@ public interface ISchedule { * * @param schedule 该位置对应的课程实体 * @param isThisWeek 该课程是否是本周上 - * @return + * @return 文本 */ String getItemText(Schedule schedule, boolean isThisWeek); @@ -150,8 +152,8 @@ public interface ISchedule { /** * 构建滚动布局时回调 * - * @param scatter - * @return + * @param scatter LayoutScatter + * @return Component */ Component getScrollView(LayoutScatter scatter); } @@ -173,11 +175,11 @@ public interface ISchedule { * 获取View数组 * 被废弃，自v2.0.3起该方法无效 * - * @param scatter 转换器 + * @param scatter 转换器 * @param monthWidth 月份宽度px * @param perWidth 日期每项宽度px * @param height 默认的日期栏高度 - * @return + * @return Component合集 */ Component[] getDateViews(LayoutScatter scatter, float monthWidth, float perWidth, int height); @@ -187,7 +189,10 @@ public interface ISchedule { void onHighLight(); /** - * 更新日期时回调 + * onUpdateDate + * + * @param curWeek 目前周次 + * @param targetWeek 目标周次 */ void onUpdateDate(int curWeek, int targetWeek); } diff --git a/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java b/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java index 792e4ea..2ce9cc3 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java @@ -35,9 +35,9 @@ public class OnDateBuildAapter implements ISchedule.OnDateBuildListener { protected DirectionalLayout layout; /** - * @javadoc - * @param background - * @return + * @javadoc 设置背景色 + * @param background 背景色 + * @return OnDateBuildAapter */ public OnDateBuildAapter setBackground(int background) { this.background = background; diff --git a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleConfig.java b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleConfig.java index 993f002..4ba242e 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleConfig.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleConfig.java @@ -112,7 +112,7 @@ public class ScheduleConfig { /** * 获取缓存的属性Map * - * @return + * @return Map */ public Map getConfigMap() { return mConfigMap; diff --git a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java index c2ccede..95c23b6 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java @@ -84,9 +84,9 @@ public class ScheduleSupport { /** * 获取两个日期之间的日期集合 * - * @param start - * @param end - * @return + * @param start 开始日期 + * @param end 结束日期 + * @return list合集 */ private static List getBetweenDates(Date start, Date end) { SimpleDateFormat sdf = new SimpleDateFormat("dd"); @@ -112,7 +112,7 @@ public class ScheduleSupport { * 根据开学时间计算当前周 * * @param startTime 满足"yyyy-MM-dd HH:mm:ss"模式的字符串 - * @return + * @return 时间 */ public static int timeTransfrom(String startTime) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -299,7 +299,7 @@ public class ScheduleSupport { /** * 判断该课是否为本周的 * - * @param cur_week + * @param cur_week 本周周次 * @return cur_week */ public static boolean isThisWeek(Schedule subject, int cur_week) { @@ -314,8 +314,9 @@ public class ScheduleSupport { /** * 根据当前周过滤课程，获取本周有效的课程（忽略重叠的） * - * @param data - * @param curWeek + * @param data 数据 + * @param curWeek 当前周 + * @param isShowNotCurWeek 是否显示本周 * @return List<> */ public static List fliterSchedule(List data, int curWeek, boolean isShowNotCurWeek) { diff --git a/timetable/src/main/java/com/zhuangfei/timetable/operater/SimpleOperater.java b/timetable/src/main/java/com/zhuangfei/timetable/operater/SimpleOperater.java index eee9871..2e5e4fc 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/operater/SimpleOperater.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/operater/SimpleOperater.java @@ -146,7 +146,7 @@ public class SimpleOperater extends AbsOperater { /** * 获取旗标布局,需要在showView方法执行后执行 * - * @return + * @return DirectionalLayout */ @Override public DirectionalLayout getFlagLayout() { @@ -181,12 +181,13 @@ public class SimpleOperater extends AbsOperater { } /** - * 构建课程项 + * newItemView * - * @param data 某一天的数据集合 + * @param originData 数据源 + * @param data 某一天的数据集合 * @param subject 当前的课程数据 - * @param pre 上一个课程数据 - * @param i 构建的索引 + * @param pre 上一个课程数据 + * @param i 构建的索引 * @param curWeek 当前周 * @return View */ @@ -583,7 +584,7 @@ public class SimpleOperater extends AbsOperater { /** * getPerWidth * - * @return + * @return 宽度 */ protected float getPerWidth() { float perWidth = 0; @@ -648,6 +649,11 @@ public class SimpleOperater extends AbsOperater { } } + /** + * 日志显示 + * + * @param message 日志信息 + */ private void debug(String message) { HiLog.debug(LOG_LABEL, message); } diff --git a/timetable/src/main/java/com/zhuangfei/timetable/utils/ScreenUtils.java b/timetable/src/main/java/com/zhuangfei/timetable/utils/ScreenUtils.java index c8fee5b..ff21b42 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/utils/ScreenUtils.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/utils/ScreenUtils.java @@ -136,7 +136,7 @@ public class ScreenUtils { /** * rgb颜色 * - * @param + * @param color 色值 * @return RgbColor */ private RgbColor getRgbColor(Color color) { diff --git a/timetable/src/main/java/com/zhuangfei/timetable/view/WeekView.java b/timetable/src/main/java/com/zhuangfei/timetable/view/WeekView.java index d17cadd..529a1b0 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/view/WeekView.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/view/WeekView.java @@ -118,7 +118,7 @@ public class WeekView extends DirectionalLayout implements WeekViewEnable list) { @@ -176,8 +176,8 @@ public class WeekView extends DirectionalLayout implements WeekViewEnable scheduleList) { @@ -191,7 +191,7 @@ public class WeekView extends DirectionalLayout implements WeekViewEnable dataSource() { @@ -225,6 +225,8 @@ public class WeekView extends DirectionalLayout implements WeekViewEnable Date: Thu, 22 Apr 2021 19:30:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=911.=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zhuangfei/timetable/listener/ISchedule.java | 1 - .../com/zhuangfei/timetable/listener/OnDateBuildAapter.java | 3 ++- .../java/com/zhuangfei/timetable/model/ScheduleSupport.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java b/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java index 6a4fed0..d7acf07 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/listener/ISchedule.java @@ -51,7 +51,6 @@ public interface ISchedule { */ void onSpaceItemClick(int day, int start); - /** * 初始化方法 * diff --git a/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java b/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java index 2ce9cc3..6d22ffd 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/listener/OnDateBuildAapter.java @@ -35,7 +35,8 @@ public class OnDateBuildAapter implements ISchedule.OnDateBuildListener { protected DirectionalLayout layout; /** - * @javadoc 设置背景色 + * 设置背景色 + * * @param background 背景色 * @return OnDateBuildAapter */ diff --git a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java index 95c23b6..31a7bf9 100644 --- a/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java +++ b/timetable/src/main/java/com/zhuangfei/timetable/model/ScheduleSupport.java @@ -299,6 +299,7 @@ public class ScheduleSupport { /** * 判断该课是否为本周的 * + * @param subject 数据 * @param cur_week 本周周次 * @return cur_week */ -- Gitee From 389591b8a64ed55b87431eaeae73052a1550e802 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Thu, 22 Apr 2021 19:40:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=911.=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java b/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java index 7f9716a..4914614 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java +++ b/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java @@ -103,9 +103,8 @@ final class Utils { *

Starting in {@link }, the returned drawable will be styled for the * specified Context's theme.

* - * @param drawableId 图片id，The desired resource identifier, as generated by the aapt tool. - * This integer encodes the package, type, and resource entry. - * The value 0 is an invalid identifier. + * @param drawableId The desired resource identifier + * @param context context * @return Drawable An object that can be used to draw this resource. */ static PixelMapElement getPixelMapElement(Context context, int drawableId) { -- Gitee