From cebeaf7f6f754db37227155fa0f57ad01ac4a78a Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Fri, 23 Apr 2021 15:18:12 +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.=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 + README.md | 6 +- entry/build.gradle | 1 - entry/src/main/config.json | 32 +-- .../chinasoft/ohos/model/MyListSubject.java | 28 --- .../chinasoft/ohos/model/SubjectExtras.java | 182 ------------------ .../android_timetableview}/MainAbility.java | 4 +- .../android_timetableview}/MyApplication.java | 2 +- .../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 | 2 +- .../bean/WeekChooseBean.java | 2 +- .../config/OnMyConfigHandleAdapter.java | 2 +- .../custom/CustomOperater.java | 2 +- .../dialog/ChooseWeekDialog.java | 8 +- .../dialog/DialogUtil.java | 4 +- .../dialog/TipsDialogUtil.java | 5 +- .../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 | 8 +- .../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 +- .../android_timetableview}/spinner/Utils.java | 4 +- .../views/ElasticScrollView.java | 2 +- .../base/layout/ability_local_config.xml | 6 +- .../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 +- timetable/src/main/config.json | 2 +- .../timetable/listener/OnDateBuildAapter.java | 2 +- .../listener/OnScrollViewBuildAdapter.java | 2 +- .../listener/OnSlideBuildAdapter.java | 2 +- .../timetable/operater/SimpleOperater.java | 2 +- .../zhuangfei/timetable/view/WeekView.java | 2 +- 69 files changed, 239 insertions(+), 444 deletions(-) delete mode 100644 entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java delete mode 100644 entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/MainAbility.java (89%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/MyApplication.java (94%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/BaseFucAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/ColorPoolAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/CustomWidthAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/DateAbility.java (89%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/DateDelayAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/ElasticAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/ExtrasAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/FlaglayoutAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/ItemStyleAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/LocalConfigAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/NonViewAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/SimpleAbility.java (88%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/ability/SlideAbility.java (89%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/adapter/ChooseAdapter.java (94%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/adapter/NonViewAdapter.java (96%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/adapter/OnDateDelayAdapter.java (98%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/base/BaseAbilitySlice.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/bean/WeekChooseBean.java (96%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/config/OnMyConfigHandleAdapter.java (97%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/custom/CustomOperater.java (97%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/dialog/ChooseWeekDialog.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/dialog/DialogUtil.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/dialog/TipsDialogUtil.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/dialog/ToastUtil.java (97%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/dialog/ToastViewDialog.java (97%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/language/OnEnglishDateBuildAdapter.java (94%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/language/OnEnglishItemBuildAdapter.java (93%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/model/MySubject.java (98%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/model/SubjectRepertory.java (99%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/AttrSlice.java (86%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/BaseFuncSlice.java (96%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/ColorPoolSlice.java (92%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/CustomWidthSlice.java (92%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/DateDelaySlice.java (90%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/DateSlice.java (93%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/ElasticSlice.java (89%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/ExtrasSlice.java (84%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/FlaglayoutSlice.java (91%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/ItemStyleSlice.java (94%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/LocalConfigSlice.java (90%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/MainAbilitySlice.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/NonViewSlice.java (92%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/SimpleSlice.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/slice/SlideSlice.java (95%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/spinner/MaterialSpinner.java (87%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/spinner/MaterialSpinnerAdapter.java (97%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/spinner/MaterialSpinnerBaseAdapter.java (98%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/spinner/TypedAttrUtils.java (98%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/spinner/Utils.java (98%) rename entry/src/main/java/com/{chinasoft/ohos => zhuangfei/android_timetableview}/views/ElasticScrollView.java (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index af9e824..c658624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.2-SNAPSHOT +* checkstytle: checkstytle code + ## 0.0.1-SNAPSHOT * refactor: For module library Android-to-OpenHarmony diff --git a/README.md b/README.md index 6f7efb2..2f4f5f1 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ allprojects { ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.2-SNAPSHOT') ...... } ``` @@ -2407,9 +2407,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- ``` - 0.0.1-SNAPSHO - ``` +- 0.0.2-SNAPSHOT #### 版权和许可信息 diff --git a/entry/build.gradle b/entry/build.gradle index 42100a2..8470eb5 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -11,7 +11,6 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) implementation project(path: ':timetable') 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/config.json b/entry/src/main/config.json index 68c8a33..d33d1ec 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.chinasoft.ohos", + "package": "com.zhuangfei.android_timetableview", "name": ".MyApplication", "deviceType": [ "phone" @@ -50,7 +50,7 @@ } ], "orientation": "unspecified", - "name": "com.chinasoft.ohos.MainAbility", + "name": "com.zhuangfei.android_timetableview.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "timetableview", @@ -67,7 +67,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.AttrAbility", + "name": "com.zhuangfei.android_timetableview.ability.AttrAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -83,7 +83,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.BaseFucAbility", + "name": "com.zhuangfei.android_timetableview.ability.BaseFucAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -99,7 +99,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.CustomWidthAbility", + "name": "com.zhuangfei.android_timetableview.ability.CustomWidthAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -115,7 +115,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.DateAbility", + "name": "com.zhuangfei.android_timetableview.ability.DateAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -131,7 +131,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.DateDelayAbility", + "name": "com.zhuangfei.android_timetableview.ability.DateDelayAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -147,7 +147,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ElasticAbility", + "name": "com.zhuangfei.android_timetableview.ability.ElasticAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -163,7 +163,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ExtrasAbility", + "name": "com.zhuangfei.android_timetableview.ability.ExtrasAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -179,7 +179,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.FlaglayoutAbility", + "name": "com.zhuangfei.android_timetableview.ability.FlaglayoutAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -195,7 +195,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ItemStyleAbility", + "name": "com.zhuangfei.android_timetableview.ability.ItemStyleAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -211,7 +211,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.LocalConfigAbility", + "name": "com.zhuangfei.android_timetableview.ability.LocalConfigAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -227,7 +227,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.NonViewAbility", + "name": "com.zhuangfei.android_timetableview.ability.NonViewAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -243,7 +243,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.SimpleAbility", + "name": "com.zhuangfei.android_timetableview.ability.SimpleAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -259,7 +259,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.SlideAbility", + "name": "com.zhuangfei.android_timetableview.ability.SlideAbility", "icon": "$media:icon", "label": "entry", "type": "page", @@ -275,7 +275,7 @@ ] }, "orientation": "unspecified", - "name": "com.chinasoft.ohos.ability.ColorPoolAbility", + "name": "com.zhuangfei.android_timetableview.ability.ColorPoolAbility", "icon": "$media:icon", "label": "entry", "type": "page", diff --git a/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java b/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java deleted file mode 100644 index c1e42ab..0000000 --- a/entry/src/main/java/com/chinasoft/ohos/model/MyListSubject.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chinasoft.ohos.model; - -import java.util.List; - -public class MyListSubject { - - List subjects; - - public void setSubjects(List subjects) { - this.subjects = subjects; - } - - public MyListSubject() { - } - - public List getSubjects() { - return subjects; - } - - public MyListSubject(List subjects) { - this.subjects = subjects; - } - - @Override - public String toString() { - return "MyListSubject{" + "subjects=" + subjects + '}'; - } -} diff --git a/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java b/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java deleted file mode 100644 index a1ee116..0000000 --- a/entry/src/main/java/com/chinasoft/ohos/model/SubjectExtras.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.chinasoft.ohos.model; - -import com.zhuangfei.timetable.model.Schedule; -import com.zhuangfei.timetable.model.ScheduleEnable; - -import java.util.List; - -/** - * 自定义实体类需要实现ScheduleEnable接口并实现getSchedule() - * - * @see ScheduleEnable#getSchedule() - */ -public class SubjectExtras implements ScheduleEnable { - - public static final String EXTRAS_ID = "extras_id"; - - private int id; - - /** - * 课程名 - */ - private String name; - - private String time; - - /** - * 教室 - */ - private String room; - - /** - * 教师 - */ - private String teacher; - - /** - * 第几周至第几周上 - */ - private List weekList; - - /** - * 开始上课的节次 - */ - private int start; - - /** - * 上课节数 - */ - private int step; - - /** - * 周几上 - */ - private int day; - - private String term; - - /** - * 一个随机数，用于对应课程的颜色 - */ - private int colorRandom = 0; - - public SubjectExtras() { - } - - public void setTime(String time) { - this.time = time; - } - - public String getTime() { - return time; - } - - public void setTerm(String term) { - this.term = term; - } - - public String getTerm() { - return term; - } - - public SubjectExtras(String term, String name, String room, String teacher, List weekList, int start, int step, int day, int colorRandom, String time) { - super(); - this.term = term; - this.name = name; - this.room = room; - this.teacher = teacher; - this.weekList = weekList; - this.start = start; - this.step = step; - this.day = day; - this.colorRandom = colorRandom; - this.time = time; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRoom() { - return room; - } - - public void setRoom(String room) { - this.room = room; - } - - public String getTeacher() { - return teacher; - } - - public void setTeacher(String teacher) { - this.teacher = teacher; - } - - public void setWeekList(List weekList) { - this.weekList = weekList; - } - - public List getWeekList() { - return weekList; - } - - public int getStart() { - return start; - } - - public void setStart(int start) { - this.start = start; - } - - public int getStep() { - return step; - } - - public void setStep(int step) { - this.step = step; - } - - public int getDay() { - return day; - } - - public void setDay(int day) { - this.day = day; - } - - public int getColorRandom() { - return colorRandom; - } - - public void setColorRandom(int colorRandom) { - this.colorRandom = colorRandom; - } - - @Override - public Schedule getSchedule() { - Schedule schedule = new Schedule(); - schedule.setDay(getDay()); - schedule.setName(getName()); - schedule.setRoom(getRoom()); - schedule.setStart(getStart()); - schedule.setStep(getStep()); - schedule.setTeacher(getTeacher()); - schedule.setWeekList(getWeekList()); - schedule.setColorRandom(2); - schedule.putExtras(EXTRAS_ID,getId()); - return schedule; - } - - public void setId(int id) { - this.id = id; - } - - public int getId() { - return id; - } -} diff --git a/entry/src/main/java/com/chinasoft/ohos/MainAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/MainAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java index ff3285b..e37c23a 100644 --- a/entry/src/main/java/com/chinasoft/ohos/MainAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/MainAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos; +package com.zhuangfei.android_timetableview; -import com.chinasoft.ohos.slice.MainAbilitySlice; +import com.zhuangfei.android_timetableview.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/MyApplication.java b/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/MyApplication.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java index fa0954d..e173d39 100644 --- a/entry/src/main/java/com/chinasoft/ohos/MyApplication.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/MyApplication.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos; +package com.zhuangfei.android_timetableview; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java index eb1e245..3f98664 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/BaseFucAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/BaseFucAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.BaseFuncSlice; +import com.zhuangfei.android_timetableview.slice.BaseFuncSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java index c41636f..06ecdb8 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ColorPoolAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ColorPoolAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ColorPoolSlice; +import com.zhuangfei.android_timetableview.slice.ColorPoolSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java index 343bdf1..c5ab3be 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/CustomWidthAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/CustomWidthAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.CustomWidthSlice; +import com.zhuangfei.android_timetableview.slice.CustomWidthSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java index 2b9701a..57bc5a5 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/DateAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.DateSlice; +import com.zhuangfei.android_timetableview.slice.DateSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java index e398e11..65c4963 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/DateDelayAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/DateDelayAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.DateDelaySlice; +import com.zhuangfei.android_timetableview.slice.DateDelaySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java index c83e699..218c8d2 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ElasticAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ElasticAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ElasticSlice; +import com.zhuangfei.android_timetableview.slice.ElasticSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java index 2600e1b..57cac9b 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ExtrasAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ExtrasAbility.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ExtrasSlice; +import com.zhuangfei.android_timetableview.slice.ExtrasSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java index 62703a9..f1db19d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/FlaglayoutAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/FlaglayoutAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.FlaglayoutSlice; +import com.zhuangfei.android_timetableview.slice.FlaglayoutSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java index c9cf282..d1678a5 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/ItemStyleAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/ItemStyleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.ItemStyleSlice; +import com.zhuangfei.android_timetableview.slice.ItemStyleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java index 702ec5c..ded4ed9 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/LocalConfigAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/LocalConfigAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.LocalConfigSlice; +import com.zhuangfei.android_timetableview.slice.LocalConfigSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java index 2c25b25..12155a7 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/NonViewAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/NonViewAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.NonViewSlice; +import com.zhuangfei.android_timetableview.slice.NonViewSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java similarity index 88% rename from entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java index bb88a21..9891310 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/SimpleAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SimpleAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.SimpleSlice; +import com.zhuangfei.android_timetableview.slice.SimpleSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java index 7c0e2c7..734e894 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/SlideAbility.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/ability/SlideAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.ability; +package com.zhuangfei.android_timetableview.ability; -import com.chinasoft.ohos.slice.SlideSlice; +import com.zhuangfei.android_timetableview.slice.SlideSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java index 60e68f6..42ff61d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/ChooseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/ChooseAdapter.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; import ohos.agp.components.*; import ohos.app.Context; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java index a1cf6a6..dd91220 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/NonViewAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/NonViewAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleColorPool; diff --git a/entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java index bee2a79..31001b0 100644 --- a/entry/src/main/java/com/chinasoft/ohos/adapter/OnDateDelayAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/adapter/OnDateDelayAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.adapter; +package com.zhuangfei.android_timetableview.adapter; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java index ec9a9a4..a05be86 100644 --- a/entry/src/main/java/com/chinasoft/ohos/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.base; +package com.zhuangfei.android_timetableview.base; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java b/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java index e2a3794..c3f0475 100644 --- a/entry/src/main/java/com/chinasoft/ohos/bean/WeekChooseBean.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/bean/WeekChooseBean.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.bean; +package com.zhuangfei.android_timetableview.bean; import ohos.agp.components.RadioButton; diff --git a/entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java index 93e87d2..5567216 100644 --- a/entry/src/main/java/com/chinasoft/ohos/config/OnMyConfigHandleAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/config/OnMyConfigHandleAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.config; +package com.zhuangfei.android_timetableview.config; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java b/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java index 328be70..72080ba 100644 --- a/entry/src/main/java/com/chinasoft/ohos/custom/CustomOperater.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/custom/CustomOperater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.custom; +package com.zhuangfei.android_timetableview.custom; import com.zhuangfei.timetable.operater.SimpleOperater; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java index 33a4e15..8f7124e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ChooseWeekDialog.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ChooseWeekDialog.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.ChooseAdapter; -import com.chinasoft.ohos.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.adapter.ChooseAdapter; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java index 5232ec6..17e9fc3 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/DialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/DialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java index 264ddf3..5127da8 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/TipsDialogUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/TipsDialogUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.agp.components.ComponentContainer; @@ -62,7 +62,6 @@ public class TipsDialogUtil { toastDialog.setContentCustomComponent(customToastLayout); toastDialog.setAutoClosable(false); - toastDialog.setTransparent(true); toastDialog.setSize(ScreenUtils.getDisplayWidth(context) / 7 * 6, DirectionalLayout.LayoutConfig.MATCH_CONTENT); toastDialog.setAlignment(LayoutAlignment.CENTER); toastDialog.show(); diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java index e84d4e6..f8ea5a7 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastUtil.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastUtil.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import ohos.agp.components.*; import ohos.agp.utils.LayoutAlignment; diff --git a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java index 5180af0..692cb5a 100644 --- a/entry/src/main/java/com/chinasoft/ohos/dialog/ToastViewDialog.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/dialog/ToastViewDialog.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.dialog; +package com.zhuangfei.android_timetableview.dialog; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; diff --git a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java index 64c8144..22f3f9c 100644 --- a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishDateBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishDateBuildAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.language; +package com.zhuangfei.android_timetableview.language; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java similarity index 93% rename from entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java index e800814..782aecf 100644 --- a/entry/src/main/java/com/chinasoft/ohos/language/OnEnglishItemBuildAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/language/OnEnglishItemBuildAdapter.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.language; +package com.zhuangfei.android_timetableview.language; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/model/MySubject.java b/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/model/MySubject.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java index 743faa2..60945aa 100644 --- a/entry/src/main/java/com/chinasoft/ohos/model/MySubject.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/model/MySubject.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.model; +package com.zhuangfei.android_timetableview.model; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleEnable; diff --git a/entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java b/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java similarity index 99% rename from entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java index f56c3ae..ffb4766 100644 --- a/entry/src/main/java/com/chinasoft/ohos/model/SubjectRepertory.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/model/SubjectRepertory.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.model; +package com.zhuangfei.android_timetableview.model; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java similarity index 86% rename from entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java index 8ff9b03..be9886b 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/AttrSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java similarity index 96% rename from entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java index 1820713..2768153 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/BaseFuncSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.bean.WeekChooseBean; -import com.chinasoft.ohos.dialog.ChooseWeekDialog; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +package com.zhuangfei.android_timetableview.slice; + +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.dialog.ChooseWeekDialog; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.IWeekView; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ColorPoolSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/ColorPoolSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java index 1d2ef0a..21db3df 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ColorPoolSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java index aaf239a..ef853fe 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/CustomWidthSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.custom.CustomOperater; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.custom.CustomOperater; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java similarity index 90% rename from entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java index f224a64..ad7046e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/DateDelaySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.OnDateDelayAdapter; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +package com.zhuangfei.android_timetableview.slice; + +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.adapter.OnDateDelayAdapter; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java similarity index 93% rename from entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java index 3d1adfd..f171f5f 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/DateSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java similarity index 89% rename from entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java index 51f0255..34bd714 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ElasticSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java similarity index 84% rename from entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java index 9d76bd0..0400a2d 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ExtrasSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java similarity index 91% rename from entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java index 293f22c..3c493d8 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/FlaglayoutSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +package com.zhuangfei.android_timetableview.slice; + +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/ItemStyleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java similarity index 94% rename from entry/src/main/java/com/chinasoft/ohos/slice/ItemStyleSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java index 59b7329..cc6f5bc 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/ItemStyleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.language.OnEnglishDateBuildAdapter; -import com.chinasoft.ohos.language.OnEnglishItemBuildAdapter; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.language.OnEnglishDateBuildAdapter; +import com.zhuangfei.android_timetableview.language.OnEnglishItemBuildAdapter; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnItemBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java similarity index 90% rename from entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java index 1a5510b..41febdf 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/LocalConfigSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.config.OnMyConfigHandleAdapter; -import com.chinasoft.ohos.dialog.DialogUtil; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +package com.zhuangfei.android_timetableview.slice; + +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.config.OnMyConfigHandleAdapter; +import com.zhuangfei.android_timetableview.dialog.DialogUtil; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.model.ScheduleConfig; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java index dc2e13f..fb800e0 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.ability.*; -import com.chinasoft.ohos.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.ability.*; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java similarity index 92% rename from entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java index d5f97f1..5a8eaad 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/NonViewSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.adapter.NonViewAdapter; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.adapter.NonViewAdapter; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleSupport; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java index 14dfe56..b36a658 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/SimpleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; - -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.bean.WeekChooseBean; -import com.chinasoft.ohos.dialog.ChooseWeekDialog; -import com.chinasoft.ohos.dialog.TipsDialogUtil; -import com.chinasoft.ohos.dialog.ToastViewDialog; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +package com.zhuangfei.android_timetableview.slice; + +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.bean.WeekChooseBean; +import com.zhuangfei.android_timetableview.dialog.ChooseWeekDialog; +import com.zhuangfei.android_timetableview.dialog.TipsDialogUtil; +import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.IWeekView; diff --git a/entry/src/main/java/com/chinasoft/ohos/slice/SlideSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java similarity index 95% rename from entry/src/main/java/com/chinasoft/ohos/slice/SlideSlice.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java index f73e1ca..81ef0a7 100644 --- a/entry/src/main/java/com/chinasoft/ohos/slice/SlideSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.chinasoft.ohos.slice; +package com.zhuangfei.android_timetableview.slice; -import com.chinasoft.ohos.ResourceTable; -import com.chinasoft.ohos.base.BaseAbilitySlice; -import com.chinasoft.ohos.model.MySubject; -import com.chinasoft.ohos.model.SubjectRepertory; -import com.chinasoft.ohos.spinner.MaterialSpinner; +import com.zhuangfei.android_timetableview.ResourceTable; +import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; +import com.zhuangfei.android_timetableview.model.MySubject; +import com.zhuangfei.android_timetableview.model.SubjectRepertory; +import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnSlideBuildAdapter; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java similarity index 87% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java index 8ecb00f..9c871d3 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinner.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinner.java @@ -30,9 +30,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.timetable.utils.ScreenUtils; import ohos.aafwk.ability.Ability; @@ -74,7 +74,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private OnNothingSelectedListener onNothingSelectedListener; private OnItemSelectedListener onItemSelectedListener; - private com.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter adapter; + private com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter adapter; private PopupDialog popupWindow; private ListContainer listView; private PixelMapElement arrowDrawable; @@ -97,7 +97,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private int popupPaddingBottom; private int popupPaddingRight; private String hintText; - private com.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter mAdapter; + private com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter mAdapter; /** * MaterialSpinner @@ -137,7 +137,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene private void init(Context context, AttrSet attrs) { HiLog.info(LABEL, "init() "); Color defaultColor = getTextColor(); - rtl = com.chinasoft.ohos.spinner.Utils.isRtl(context); + rtl = com.zhuangfei.android_timetableview.spinner.Utils.isRtl(context); int paddingLeft = 0; int paddingTop = 0; @@ -173,41 +173,41 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene defaultPopupPaddingBottom = (int) resourceManager.getElement( ResourceTable.Float_ms__padding_top).getFloat(); - backgroundColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + backgroundColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_background_color", Color.WHITE.getValue()); backgroundSelector = attrs.getAttr("ms_background_selector").get().getElement(); HiLog.info(LABEL, "backgroundSelector = " + backgroundSelector); - textColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", + textColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color", defaultColor.getValue()); - textColorButton = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + textColorButton = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_text_color_button", defaultColor.getValue()); - hintColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, + hintColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_hint_color", defaultColor.getValue()); - arrowColor = com.chinasoft.ohos.spinner.TypedAttrUtils.getIntColor(attrs, "ms_arrow_tint", textColor); - hideArrow = com.chinasoft.ohos.spinner.TypedAttrUtils.getBoolean(attrs, "ms_hide_arrow", false); - hintText = com.chinasoft.ohos.spinner.TypedAttrUtils.getString(attrs, "ms_hint", ""); + arrowColor = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getIntColor(attrs, "ms_arrow_tint", textColor); + hideArrow = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getBoolean(attrs, "ms_hide_arrow", false); + hintText = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getString(attrs, "ms_hint", ""); - popupWindowMaxHeight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupWindowMaxHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_dropdown_max_height", 1680); - popupWindowHeight = com.chinasoft.ohos.spinner.TypedAttrUtils.getLayoutDimension(attrs, + popupWindowHeight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getLayoutDimension(attrs, "ms_dropdown_height", ComponentContainer.LayoutConfig.MATCH_CONTENT); - paddingTop = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_top", defaultPaddingTop); - paddingLeft = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_left", defaultPaddingLeft); - paddingBottom = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_bottom", defaultPaddingBottom); - paddingRight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + paddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_padding_right", defaultPaddingRight); - popupPaddingTop = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingTop = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_top", defaultPopupPaddingTop); - popupPaddingLeft = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingLeft = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_left", defaultPopupPaddingLeft); - popupPaddingBottom = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingBottom = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_bottom", defaultPopupPaddingBottom); - popupPaddingRight = com.chinasoft.ohos.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, + popupPaddingRight = com.zhuangfei.android_timetableview.spinner.TypedAttrUtils.getDimensionPixelSize(attrs, "ms_popup_padding_right", defaultPopupPaddingRight); - arrowColorDisabled = com.chinasoft.ohos.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.android_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); HiLog.info(LABEL, "arrowColorDisabled = " + arrowColorDisabled); HiLog.info(LABEL, "init textColor = " + textColor @@ -235,7 +235,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene } if (!hideArrow) { - arrowDrawable = com.chinasoft.ohos.spinner.Utils.getPixelMapElement(context, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(context, ResourceTable.Media_ic_more); Element[] drawables = getAroundElements(); if (rtl) { drawables[0] = arrowDrawable; @@ -446,7 +446,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene * @param The item type */ public void setItems(List items) { - adapter = new com.chinasoft.ohos.spinner.MaterialSpinnerAdapter<>(getContext(), items) + adapter = new com.zhuangfei.android_timetableview.spinner.MaterialSpinnerAdapter<>(getContext(), items) .setPopupPadding(popupPaddingLeft, popupPaddingTop, popupPaddingRight, popupPaddingBottom) .setTextSize(textSize) .setTextColor(textColor); @@ -459,24 +459,24 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene * @param adapter The adapter * @param The type */ - public void setAdapter(com.chinasoft.ohos.spinner.MaterialSpinnerAdapter adapter) { + public void setAdapter(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerAdapter adapter) { this.adapter = adapter; this.adapter.setTextColor(textColor); this.adapter.setPopupPadding(popupPaddingLeft, popupPaddingTop, popupPaddingRight, popupPaddingBottom); setAdapterInternal(adapter); } - private void setAdapterInternal(com.chinasoft.ohos.spinner.MaterialSpinnerBaseAdapter adapterInternal) { + private void setAdapterInternal(com.zhuangfei.android_timetableview.spinner.MaterialSpinnerBaseAdapter adapterInternal) { this.mAdapter = adapterInternal; boolean shouldResetPopupHeight = listView.getItemProvider() != null; - adapterInternal.setHintEnabled(!com.chinasoft.ohos.spinner.Utils.isEmpty(hintText)); + adapterInternal.setHintEnabled(!com.zhuangfei.android_timetableview.spinner.Utils.isEmpty(hintText)); listView.setItemProvider(adapterInternal); HiLog.info(LABEL, "selectedIndex = " + selectedIndex + ", shouldResetPopupHeight = " + shouldResetPopupHeight); if (selectedIndex >= adapterInternal.getCount()) { selectedIndex = 0; } if (adapterInternal.getItems().size() > 0) { - if (nothingSelected && !com.chinasoft.ohos.spinner.Utils.isEmpty(hintText)) { + if (nothingSelected && !com.zhuangfei.android_timetableview.spinner.Utils.isEmpty(hintText)) { setText(hintText); setHintColor(new Color(hintColor)); } else { @@ -537,7 +537,7 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene */ public void setArrowColor(int color) { arrowColor = color; - arrowColorDisabled = com.chinasoft.ohos.spinner.Utils.lighter(arrowColor, 0.8f); + arrowColorDisabled = com.zhuangfei.android_timetableview.spinner.Utils.lighter(arrowColor, 0.8f); } private boolean canShowPopup() { @@ -569,9 +569,9 @@ public class MaterialSpinner extends Text implements Component.TouchEventListene setLayoutDirection(LayoutDirection.RTL); } if (shouldRotateUp) { - arrowDrawable = com.chinasoft.ohos.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } else { - arrowDrawable = com.chinasoft.ohos.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); + arrowDrawable = com.zhuangfei.android_timetableview.spinner.Utils.getPixelMapElement(mContext, ResourceTable.Media_ic_more); } /** * 旋转图片 动作 diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java similarity index 97% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java index 0f270d2..91b525c 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerAdapter.java @@ -30,7 +30,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.app.Context; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java index e334cea..d899a73 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/MaterialSpinnerBaseAdapter.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/MaterialSpinnerBaseAdapter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; -import com.chinasoft.ohos.ResourceTable; +import com.zhuangfei.android_timetableview.ResourceTable; import ohos.agp.colors.RgbColor; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java index c14f1fc..be3d0ee 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/TypedAttrUtils.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/TypedAttrUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.agp.components.Attr; diff --git a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java index 4914614..09c816e 100644 --- a/entry/src/main/java/com/chinasoft/ohos/spinner/Utils.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/spinner/Utils.java @@ -15,7 +15,7 @@ * */ -package com.chinasoft.ohos.spinner; +package com.zhuangfei.android_timetableview.spinner; import ohos.agp.components.element.PixelMapElement; @@ -105,6 +105,8 @@ final class Utils { * * @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) { diff --git a/entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java b/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java similarity index 98% rename from entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java rename to entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java index e967988..f518612 100644 --- a/entry/src/main/java/com/chinasoft/ohos/views/ElasticScrollView.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/views/ElasticScrollView.java @@ -1,4 +1,4 @@ -package com.chinasoft.ohos.views; +package com.zhuangfei.android_timetableview.views; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorProperty; diff --git a/entry/src/main/resources/base/layout/ability_local_config.xml b/entry/src/main/resources/base/layout/ability_local_config.xml index 48307a6..db73cbc 100644 --- a/entry/src/main/resources/base/layout/ability_local_config.xml +++ b/entry/src/main/resources/base/layout/ability_local_config.xml @@ -5,7 +5,11 @@ ohos:orientation="vertical" xmlns:ohos="http://schemas.huawei.com/res/ohos"> - + - - - \ 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 d6780db..db33571 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: Fri, 23 Apr 2021 15:21:41 +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.=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java | 2 +- .../zhuangfei/android_timetableview/slice/MainAbilitySlice.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java b/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java index 3350b28..bffcbfe 100644 --- a/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java +++ b/entry/src/main/java/com/chinasoft/ohos/ability/AttrAbility.java @@ -14,8 +14,8 @@ */ package com.chinasoft.ohos.ability; -import com.chinasoft.ohos.slice.AttrSlice; +import com.zhuangfei.android_timetableview.slice.AttrSlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java index fb800e0..137a705 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java @@ -15,10 +15,10 @@ package com.zhuangfei.android_timetableview.slice; +import com.chinasoft.ohos.ability.AttrAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.ability.*; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; - import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.agp.components.Button; -- Gitee From 40bdf59342a5f69a3ee8c5c906b3c333505b33f2 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Fri, 23 Apr 2021 15:55:35 +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.=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/entry/build.gradle b/entry/build.gradle index 8470eb5..d1bd362 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -12,5 +12,4 @@ dependencies { implementation project(path: ':timetable') testCompile 'junit:junit:4.12' implementation 'com.alibaba:fastjson:1.2.55' - //implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') } -- Gitee