From 98b10ab64c6c20f70bf03f3c2b0df740a3a8f610 Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 24 May 2021 15:01:12 +0800 Subject: [PATCH 1/3] commit --- CHANGELOG.md | 113 +----------------- README.OPENSOURCE | 10 ++ README.md | 6 - TimetableView/src/main/config.json | 2 +- .../base/layout/timetable_layout.xml | 2 - build.gradle | 2 +- entry/build.gradle | 1 + entry/src/main/config.json | 34 +++--- .../MainAbility.java | 4 +- .../MyApplication.java | 2 +- .../ability/AttrAbility.java | 4 +- .../ability/BaseFucAbility.java | 4 +- .../ability/ColorPoolAbility.java | 4 +- .../ability/CustomWidthAbility.java | 4 +- .../ability/DateAbility.java | 4 +- .../ability/DateDelayAbility.java | 4 +- .../ability/ElasticAbility.java | 4 +- .../ability/ExtrasAbility.java | 4 +- .../ability/FlaglayoutAbility.java | 4 +- .../ability/ItemStyleAbility.java | 4 +- .../ability/LocalConfigAbility.java | 4 +- .../ability/NonViewAbility.java | 4 +- .../ability/SimpleAbility.java | 4 +- .../ability/SlideAbility.java | 4 +- .../adapter/ChooseAdapter.java | 6 +- .../adapter/NonViewAdapter.java | 4 +- .../adapter/OnDateDelayAdapter.java | 2 +- .../base/BaseAbilitySlice.java | 4 +- .../bean/WeekChooseBean.java | 2 +- .../config/OnMyConfigHandleAdapter.java | 2 +- .../custom/CustomOperater.java | 2 +- .../dialog/ChooseWeekDialog.java | 8 +- .../dialog/DialogUtil.java | 4 +- .../dialog/TipsDialogUtil.java | 4 +- .../dialog/ToastUtil.java | 4 +- .../dialog/ToastViewDialog.java | 2 +- .../language/OnEnglishDateBuildAdapter.java | 2 +- .../language/OnEnglishItemBuildAdapter.java | 2 +- .../model/MySubject.java | 2 +- .../model/SubjectRepertory.java | 2 +- .../slice/AttrSlice.java | 12 +- .../slice/BaseFuncSlice.java | 20 ++-- .../slice/ColorPoolSlice.java | 12 +- .../slice/CustomWidthSlice.java | 14 +-- .../slice/DateDelaySlice.java | 16 +-- .../slice/DateSlice.java | 12 +- .../slice/ElasticSlice.java | 10 +- .../slice/ExtrasSlice.java | 14 +-- .../slice/FlaglayoutSlice.java | 16 +-- .../slice/ItemStyleSlice.java | 16 +-- .../slice/LocalConfigSlice.java | 20 ++-- .../slice/MainAbilitySlice.java | 10 +- .../slice/NonViewSlice.java | 12 +- .../slice/SimpleSlice.java | 22 ++-- .../slice/SlideSlice.java | 12 +- .../spinner/MaterialSpinner.java | 64 +++++----- .../spinner/MaterialSpinnerAdapter.java | 2 +- .../spinner/MaterialSpinnerBaseAdapter.java | 4 +- .../spinner/TypedAttrUtils.java | 2 +- .../spinner/Utils.java | 2 +- .../views/ElasticScrollView.java | 2 +- .../base/graphic/background_ability_main.xml | 6 - .../base/layout/ability_custom_item_style.xml | 2 - .../base/layout/ability_non_view.xml | 2 +- .../base/layout/custom_myscrollview.xml | 4 +- .../base/layout/header_base_func.xml | 2 +- .../resources/base/layout/header_simple.xml | 2 +- .../android_timetableview/ExampleTest.java | 23 ++++ .../ohos_timetableview/ExampleTest.java | 23 ++++ 69 files changed, 285 insertions(+), 357 deletions(-) create mode 100644 README.OPENSOURCE rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/MainAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/MyApplication.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/AttrAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/BaseFucAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ColorPoolAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/CustomWidthAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/DateAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/DateDelayAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ElasticAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ExtrasAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/FlaglayoutAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/ItemStyleAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/LocalConfigAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/NonViewAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/SimpleAbility.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/ability/SlideAbility.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/ChooseAdapter.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/NonViewAdapter.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/adapter/OnDateDelayAdapter.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/base/BaseAbilitySlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/bean/WeekChooseBean.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/config/OnMyConfigHandleAdapter.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/custom/CustomOperater.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ChooseWeekDialog.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/DialogUtil.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/TipsDialogUtil.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ToastUtil.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/dialog/ToastViewDialog.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/language/OnEnglishDateBuildAdapter.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/language/OnEnglishItemBuildAdapter.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/model/MySubject.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/model/SubjectRepertory.java (99%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/AttrSlice.java (86%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/BaseFuncSlice.java (96%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ColorPoolSlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/CustomWidthSlice.java (92%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/DateDelaySlice.java (90%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/DateSlice.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ElasticSlice.java (89%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ExtrasSlice.java (85%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/FlaglayoutSlice.java (91%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/ItemStyleSlice.java (94%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/LocalConfigSlice.java (90%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/MainAbilitySlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/NonViewSlice.java (93%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/SimpleSlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/slice/SlideSlice.java (95%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinner.java (88%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinnerAdapter.java (97%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/MaterialSpinnerBaseAdapter.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/TypedAttrUtils.java (98%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/spinner/Utils.java (99%) rename entry/src/main/java/com/zhuangfei/{android_timetableview => ohos_timetableview}/views/ElasticScrollView.java (98%) delete mode 100644 entry/src/main/resources/base/graphic/background_ability_main.xml create mode 100644 entry/src/test/java/com/zhuangfei/android_timetableview/ExampleTest.java create mode 100644 entry/src/test/java/com/zhuangfei/ohos_timetableview/ExampleTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 8004548..c594189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,122 +1,11 @@ ## 0.0.1-SNAPSHOT `2021/4/23` -* refactor: For module library Android-to-OpenHarmony -* 页面中，安卓与鸿蒙的课程表中的字体大小、以及颜色、间距会有轻微不一致 +* refactor: For module library to-OpenHarmony * 项目中点击【功能】按钮，没有水波纹效果 * 项目中打开周次选择后，下拉课表布局，点击旗标绘制错位 * 项目中重新绘制课程时，布局绘制会有瞬间卡顿 * 工具类页面，课程颜色会有轻微不一致 * toast提示内容背景长度无法自适应 -### v2.0.6 `2018/9/6` - -- 修复继承`SimpleOperator`、`AbsOperator`时出现的空指针问题 -- 修复设置`curWeek()`在`callback(onWeekChangedListener l)`之后时不触发`onWeekChangedListener`问题 -- 增大属性的访问权限，便于自定义，并演示如何自定义`Operator` - -### v2.0.5 `2018/9/3` - -- 完善课程过滤算法 -- 修复非本周设置无效的问题（`v2.0.4引入的问题`） - -### v2.0.4 `2018/9/3` - -- 修复重叠时点击课程时获取的课程不正确的问题 -- 增加WeekView对curWeek的校验 - -### v2.0.3 `2018/9/2` - -- 将业务逻辑和属性设置分离开 -- 月份宽度可设置 `new` -- 周末可设置隐藏 `new` -- 修复课程重叠显示错误的问题 -- 修复点击格子间隙出现的问题 - -**升级指南：** - -旧版本中，如果自定义周次选择栏时实现了`WeekViewEnable`,那么有这么一个方法需要实现： -```java -public WeekView isShow(boolean isShow){} -``` -在本版本更新中，该方法的返回类型修改为了泛型T，所以代码如下： -```java - @Override - public CustomWeekView isShow(boolean isShow){ - } -``` - -### v2.0.2 `2018/8/3` - -- 配置全部迁移到TimetableView中 -- TimetableView和WeekView中的方法改为`curWeek(int cur)`、`curWeek()`这种形式，取消set、get前缀 -- TimetableView中接口的设置统一为`callback(...)` -- 修改TimetableView中的大部分接口和默认实现 -- WeekView左侧按钮可隐藏、切换周次时可以推算新的日期 -- 可设置背景以及透明度（日期栏、侧边栏、课程项可分别设置） -- 数据源可添加额外信息 - -其他的用法可以参考`v2.0.2`文档，以下是日期推算的用法： -```java - mWeekView.source(mySubjects) - .curWeek(1) - .callback(new IWeekView.OnWeekItemClickedListener() { - @Override - public void onWeekClicked(int week) { - int cur = mTimetableView.curWeek(); - //更新切换后的日期，从当前周cur->切换的周week - mTimetableView.onDateBuildListener() - .onUpdateDate(cur, week); - mTimetableView.changeWeekOnly(week); - } - }) - .showView(); -``` - -这句话是精髓： -```java -//更新切换后的日期，从当前周cur->切换的周week - mTimetableView.onDateBuildListener() - .onUpdateDate(cur, week); -``` -### v2.0.1 `2018/6/24` -> v2.0.0修改幅度非常大，所以也引入了一些问题，遂立即对其修复 - -- 修复`v2.0.0`引入的周日崩溃问题:WeekView由于日期计算错误导致周日就会崩溃 -- 修复课程重叠时显示不全的问题 -- 修复若干其他问题 [Issues#3](https://github.com/zfman/TimetableView/issues/3) - -### v2.0.0 `2018/6/23` - -- 增加自定义属性 -- 增加默认的周次选择栏 -- 增加周次选择、日期栏、侧边栏自定义 -- 优化项目结构 -- 增加课程颜色管理 -- 增加课程项配置 -- 增加滚动布局替换方案 -- 增加若干个有用的课程工具方法 -- 将36个课程样式文件减少到1个 - -### v1.0.4 `2018/5/3` - -- 可自定义背景图层 -- 提供一个网格背景图层的实现 - -### v1.0.3 `2018/5/1` - -- 彻底修复特定情况下角标计算错误的问题，上一版本在特定情况下依然会计算错误 - -### v1.0.2 - -- 修复特定情况下角标计算错误的问题 - -### v1.0.1 - -- 在工具类中增加了获取某天课程的方法 - -### v1.0.0 - -- 将项目上传到了jcenter，以后将重点维护AndroidStudio的版本 - diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..5d9402c --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,10 @@ +[ + { + "Name": "TimetableView", + "License": "MIT License", + "License File": "LICENSE", + "Version Number": " master ", + "Upstream URL": https://github.com/zfman/TimetableView", + "Description": "一款开源、完善、高效的Android课程表控件，支持添加广告、课程重叠自动处理、透明背景设置、空白格子点击事件处理等丰富的功能，并且有完善的开发文档、案例以供参考" + } +] \ No newline at end of file diff --git a/README.md b/README.md index c9d2f1e..bdf5ec8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # TimetableView -**本项目基于开源项目TimetableView 进行openharmony的移植和开发，可以通过项目标签以及github地址（ https://github.com/zfman/TimetableView ）追踪到原项目版本** - #### 项目介绍 - 项目名称：TimetableView超级课程表 - 所属系列：openharmony的第三方组件适配移植 @@ -9,9 +7,6 @@ - 项目移植状态：主功能完成 - 调用差异：无 - 开发版本：sdk5，DevEco Studio2.1 beta3 -- 项目作者和维护人：蒋军 -- 联系方式：jiangjun073@chinasoftinc.com -- 原项目Doc地址：https://github.com/zfman/TimetableView - 基线版本：TimetableView组件Release版本号 v2.0.7-beta #### 支持的功能 @@ -2403,7 +2398,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员：陈翔，朱品，邓世雄 #### 版本迭代 diff --git a/TimetableView/src/main/config.json b/TimetableView/src/main/config.json index b47dad2..5715de5 100644 --- a/TimetableView/src/main/config.json +++ b/TimetableView/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.zhuangfei.android_timetableview", + "bundleName": "com.zhuangfei.ohos_timetableview", "vendor": "zhuangfei", "version": { "code": 1, diff --git a/TimetableView/src/main/resources/base/layout/timetable_layout.xml b/TimetableView/src/main/resources/base/layout/timetable_layout.xml index 0390b14..42d8b33 100644 --- a/TimetableView/src/main/resources/base/layout/timetable_layout.xml +++ b/TimetableView/src/main/resources/base/layout/timetable_layout.xml @@ -1,7 +1,5 @@ - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/layout/ability_custom_item_style.xml b/entry/src/main/resources/base/layout/ability_custom_item_style.xml index a535290..7ce113a 100644 --- a/entry/src/main/resources/base/layout/ability_custom_item_style.xml +++ b/entry/src/main/resources/base/layout/ability_custom_item_style.xml @@ -1,7 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/entry/src/main/resources/base/layout/header_base_func.xml b/entry/src/main/resources/base/layout/header_base_func.xml index db33571..bba155d 100644 --- a/entry/src/main/resources/base/layout/header_base_func.xml +++ b/entry/src/main/resources/base/layout/header_base_func.xml @@ -27,7 +27,7 @@ ohos:text_size="10fp" /> - - Date: Mon, 24 May 2021 15:02:45 +0800 Subject: [PATCH 2/3] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bdf5ec8..270bbd2 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ - 课程颜色可指定 #### 效果演示 -![](https://images.gitee.com/uploads/images/2021/0415/175209_4c600fae_8784697.png "截图.PNG") +![演示图片](https://images.gitee.com/uploads/images/2021/0524/150227_9cac956a_7918188.gif "timetableview.gif") #### 安装教程 -- Gitee From fa97622b98e3fd06ce5568c85f2a451b89812bb5 Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 24 May 2021 15:29:38 +0800 Subject: [PATCH 3/3] update CHANGELOG.md. --- CHANGELOG.md | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c594189..e02d0e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,2 @@ -## 0.0.1-SNAPSHOT `2021/4/23` -* refactor: For module library to-OpenHarmony -* 项目中点击【功能】按钮，没有水波纹效果 -* 项目中打开周次选择后，下拉课表布局，点击旗标绘制错位 -* 项目中重新绘制课程时，布局绘制会有瞬间卡顿 -* 工具类页面，课程颜色会有轻微不一致 -* toast提示内容背景长度无法自适应 - - - - - - +## 0.0.1-SNAPSHOT +ohos 第一个版本，完整实现了原库的全部 api \ No newline at end of file -- Gitee