diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 07cae1eb2a365bb3110291887b1cfec1215370e8..6de909dec0e446c40a6947e54ee10c8a34457f1b 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -71,7 +71,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -87,7 +87,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -103,7 +103,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -119,7 +119,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -135,7 +135,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -151,7 +151,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -167,7 +167,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -183,7 +183,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -199,7 +199,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -215,7 +215,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -231,7 +231,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -247,7 +247,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -263,7 +263,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -279,7 +279,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" } ] } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java index 6fcc84dfaf2141f9cf3f97e288b31292d83cb5b3..41566317f7a8ae5037c0a4276767e0c26df2b883 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/base/BaseAbilitySlice.java @@ -30,15 +30,9 @@ import ohos.agp.window.service.WindowManager; * @since 2021-04-22 */ public class BaseAbilitySlice extends AbilitySlice { - @Override protected void onStart(Intent intent) { super.onStart(intent); WindowManager.getInstance().getTopWindow().get().setStatusBarColor(Color.rgb(220,126,44)); - } - - - - } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java index ab735206e5199ca6b6f738eb62a928f634844fef..5a8907676865d544ad7dfc3c684c0d0859af48a0 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; @@ -26,7 +25,6 @@ import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import java.util.List; @@ -40,6 +38,7 @@ public class AttrSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); @@ -47,7 +46,7 @@ public class AttrSlice extends BaseAbilitySlice { mySubjects = SubjectRepertory.loadDefaultSubjects(); initTimetableView(); - intents=intent; + intents = intent; } /** @@ -86,29 +85,4 @@ public class AttrSlice extends BaseAbilitySlice { } ToastViewDialog.toast(AttrSlice.this, str); } - - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java index 7466a3c753cd5009147399fbafddbfa6cfc50c45..3b00c72f07e0abc829c1c80f1d5c15146adc91d4 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.bean.WeekChooseBean; @@ -32,7 +31,6 @@ import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.view.WeekView; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; import ohos.agp.components.Text; @@ -48,6 +46,9 @@ import java.util.List; * @since 2021-03-29 */ public class BaseFuncSlice extends BaseAbilitySlice implements Component.ClickedListener { + private static final String[] SPIN_MUNE = {"月份宽度增大", "月份宽度恢复", "隐藏周末", "显示周末", + "添加一门课程", "删除一门课程", "隐藏非本周课程", "显示非本周课程", "最大节次8节", + "最大节次10节", "最大节次12节", "显示节次时间", "隐藏节次时间", "显示周次选择", "隐藏周次选择"}; /** * 控件 */ @@ -68,7 +69,7 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_base_func); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -241,10 +242,6 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked ToastViewDialog.toast(this, str); } - private static final String[] SPIN_MUNE = {"月份宽度增大", "月份宽度恢复", "隐藏周末", "显示周末", - "添加一门课程", "删除一门课程", "隐藏非本周课程", "显示非本周课程", "最大节次8节", - "最大节次10节", "最大节次12节", "显示节次时间", "隐藏节次时间", "显示周次选择", "隐藏周次选择"}; - private void selectLayout(int position) { switch (position) { @@ -447,28 +444,4 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked private void showWeekends() { mTimetableView.isShowWeekends(true).updateView(); } - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java index 2f3e8e4131619c40c1c9a1b0f6d06c8f18d89d87..72622ff7d26755c0a0f25d6204d3fcd819189a2c 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java @@ -14,7 +14,6 @@ */ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.model.MySubject; @@ -23,7 +22,6 @@ import com.zhuangfei.android_timetableview.spinner.MaterialSpinner; import com.zhuangfei.timetable.TimetableView; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.colors.RgbColor; import java.util.HashMap; @@ -36,16 +34,18 @@ import java.util.Map; * @since 2021-03-29 */ public class ColorPoolSlice extends BaseAbilitySlice { + private static final String[] SPIN_MUNE = {"指定三种颜色", "默认颜色池", "扩充颜色池", "指定课程颜色"}; TimetableView mTimetableView; MaterialSpinner moreButton; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_color_pool); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -94,8 +94,6 @@ public class ColorPoolSlice extends BaseAbilitySlice { .showView(); } - private static final String[] SPIN_MUNE = {"指定三种颜色", "默认颜色池", "扩充颜色池", "指定课程颜色"}; - private void selectLayout(int position) { switch (position) { case 0: @@ -149,33 +147,9 @@ public class ColorPoolSlice extends BaseAbilitySlice { */ public void forColor() { Map colorMap = new HashMap<>(); - colorMap.put("数字图像处理", new RgbColor(255,0,0)); + colorMap.put("数字图像处理", new RgbColor(255, 0, 0)); colorMap.put("算法分析与设计", new RgbColor(0, 0, 255)); mTimetableView.colorPool().setIgnoreUserlessColor(false).setColorMap(colorMap); mTimetableView.updateView(); } - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java index bf84a0060deb35dcb77c02879d995d5cc7c94b89..d480ec9d692d6086f3b5f107ed80786b7e17af51 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java @@ -14,7 +14,6 @@ */ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.custom.CustomOperater; @@ -27,7 +26,6 @@ import com.zhuangfei.timetable.listener.OnDateBuildAapter; import com.zhuangfei.timetable.listener.OnSpaceItemClickAdapter; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; import ohos.agp.components.StackLayout; @@ -47,13 +45,14 @@ public class CustomWidthSlice extends BaseAbilitySlice { CustomOperater operater; List mySubjects; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_custom_width); mySubjects = SubjectRepertory.loadDefaultSubjects2(); mySubjects.addAll(SubjectRepertory.loadDefaultSubjects()); - intents=intent; + intents = intent; initViews(); } @@ -131,28 +130,4 @@ public class CustomWidthSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java index c6647497bffcf32fb5c3a440a21482c13eddb4ba..9340af32c42109489f5406a939aa1e3269a243c6 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java @@ -14,7 +14,6 @@ */ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.adapter.OnDateDelayAdapter; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; @@ -25,7 +24,6 @@ import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Text; import ohos.global.icu.text.SimpleDateFormat; @@ -56,7 +54,7 @@ public class DateDelaySlice extends BaseAbilitySlice { spinner.setShowFalse(true); initTimetableView(); data(); - intents=intent; + intents = intent; } private void data() { @@ -134,28 +132,4 @@ public class DateDelaySlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java index 0b7aee31cd48de040c87180b3859ad9ded0c2dbc..af7e9a93cf97385bceeac49680c4bddd0f45680c 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.model.MySubject; @@ -26,7 +25,6 @@ import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnDateBuildAapter; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; import ohos.agp.components.LayoutScatter; @@ -40,19 +38,19 @@ import java.util.List; * @since 2021-03-29 */ public class DateSlice extends BaseAbilitySlice { + private static final String[] SPIN_MUNE = {"隐藏日期栏", "显示日期栏", "自定义日期栏", "恢复默认日期栏"}; TimetableView mTimetableView; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_date); initViews(); showPopmenu(); - intents=intent; + intents = intent; } - private static final String[] SPIN_MUNE = {"隐藏日期栏", "显示日期栏", "自定义日期栏", "恢复默认日期栏"}; - private void showPopmenu() { MaterialSpinner spinner = (MaterialSpinner) findComponentById(ResourceTable.Id_id_more); spinner.setOnItemSelectedListener((MaterialSpinner.OnItemSelectedListener) ( @@ -166,27 +164,4 @@ public class DateSlice extends BaseAbilitySlice { mTimetableView.callback((ISchedule.OnDateBuildListener) null) .updateDateView(); } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java index 1bac1e160a90b53a669aafdba74aee77f19853d4..6fe6f9889c39355e123fc0c98e01ee7a4482a4cb 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java @@ -14,7 +14,6 @@ */ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.model.MySubject; @@ -23,7 +22,6 @@ import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.listener.ISchedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; @@ -37,12 +35,13 @@ import java.util.List; public class ElasticSlice extends BaseAbilitySlice { TimetableView mTimetableView; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_custom_scroll_view); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -61,7 +60,7 @@ public class ElasticSlice extends BaseAbilitySlice { .callback(new ISchedule.OnScrollViewBuildListener() { @Override public Component getScrollView(LayoutScatter scatter) { - scatter.parse(ResourceTable.Layout_custom_myscrollview, null, true); + scatter.parse(ResourceTable.Layout_custom_myscrollview, null, true); return scatter.parse(ResourceTable.Layout_custom_myscrollview, null, true); } }) @@ -77,27 +76,4 @@ public class ElasticSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java index 5f615ce2be725dde960358df90c745b220936f4e..fc7e3db31012af0fdfe74005e3f1b2ee91074e68 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; @@ -27,7 +26,6 @@ import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import java.util.List; @@ -41,6 +39,7 @@ public class ExtrasSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); @@ -49,7 +48,7 @@ public class ExtrasSlice extends BaseAbilitySlice { mySubjects = SubjectRepertory.loadDefaultSubjects(); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -92,27 +91,4 @@ public class ExtrasSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java index b735fe07f0892ce3f6c4133786ddca2ce1765eec..e5d80a00aa1d328f07508f5a7287824f9352ea6e 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.dialog.ToastViewDialog; @@ -27,7 +26,6 @@ import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.model.Schedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.colors.RgbColor; import ohos.agp.components.Component; @@ -39,20 +37,20 @@ import java.util.List; * @since 2021-03-29 */ public class FlaglayoutSlice extends BaseAbilitySlice { + private static final String[] SPIN_MUNE = {"点击空白格子试试~", "修改旗标布局背景", "重置旗标布局背景", "取消旗标布局", "恢复旗标布局"}; TimetableView mTimetableView; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_flaglayout); initViews(); showPopmenu(); - intents=intent; + intents = intent; } - private static final String[] SPIN_MUNE = {"点击空白格子试试~","修改旗标布局背景","重置旗标布局背景","取消旗标布局","恢复旗标布局"}; - /** * showPopmenu */ @@ -81,7 +79,8 @@ public class FlaglayoutSlice extends BaseAbilitySlice { case 3: resetFlaglayout(); break; - default:break; + default: + break; } } @@ -163,27 +162,4 @@ public class FlaglayoutSlice extends BaseAbilitySlice { private void resetFlaglayout() { mTimetableView.isShowFlaglayout(true).updateFlaglayout(); } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java index 1cf6da0f8b2833e0a663cf09a1a395a164925d3f..ce21f34e1cfc6705d37f8d61b40dc89641041f80 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.language.OnEnglishDateBuildAdapter; @@ -29,7 +28,6 @@ import com.zhuangfei.timetable.listener.OnItemBuildAdapter; import com.zhuangfei.timetable.model.Schedule; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.colors.RgbColor; import ohos.agp.components.Component; import ohos.agp.components.StackLayout; @@ -42,19 +40,21 @@ import java.util.List; * ItemStyleSlice * * @since 2021-03-29 - */ + * */ public class ItemStyleSlice extends BaseAbilitySlice { - TimetableView mTimetableView; + private static final String[] SPIN_MUNE = {"切换英文", "切换中文", "隐藏非本周课程", "显示非本周课程", + "边距与弧度设置", "课程项文本", "单个角弧度设置", "非本周背景设置", "修改课程重叠的样式"}; + TimetableView mTimetableView; MaterialSpinner moreButton; - Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_custom_item_style); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -101,10 +101,6 @@ public class ItemStyleSlice extends BaseAbilitySlice { .showView(); } - - private static final String[] SPIN_MUNE = {"切换英文", "切换中文", "隐藏非本周课程", "显示非本周课程", - "边距与弧度设置", "课程项文本", "单个角弧度设置", "非本周背景设置", "修改课程重叠的样式"}; - /** * 显示弹出菜单 */ @@ -280,26 +276,4 @@ public class ItemStyleSlice extends BaseAbilitySlice { .callback((ISchedule.OnItemBuildListener) null) .updateView(); } - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java index f42c40e02feb7840eed4b3b24d5285b3c7085ab4..5e210328095f21c5d9efe0aa575b9f2c084d5a0f 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.config.OnMyConfigHandleAdapter; @@ -28,7 +27,6 @@ import com.zhuangfei.timetable.TimetableView; import com.zhuangfei.timetable.model.ScheduleConfig; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.Text; import java.util.List; @@ -40,15 +38,6 @@ import java.util.Set; * @since 2021-03-29 */ public class LocalConfigSlice extends BaseAbilitySlice { - TimetableView timetableView; - MaterialSpinner moreButton; - Text titleTextView; - Intent intents; - List mySubjects; - int target = -1; - boolean initFinish = false; - ScheduleConfig mScheduleConfig; - Set configSet; /** * CONFIG_NAME */ @@ -58,13 +47,20 @@ public class LocalConfigSlice extends BaseAbilitySlice { */ private static final String[] SPIN_MUNE = {"加载本地配置", "清除本地配置", "导出配置至文本", "加载配置文本"}; + TimetableView timetableView; + MaterialSpinner moreButton; + Text titleTextView; + Intent intents; + List mySubjects; + ScheduleConfig mScheduleConfig; + Set configSet; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_local_config); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -187,27 +183,4 @@ public class LocalConfigSlice extends BaseAbilitySlice { } timetableView.updateView(); } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } 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 6c0bdf2fc8eeb45c46b49e5fd98751b52577d0bd..c6ffce9976329e6dfd8e6033c0d215dd91d4ca3e 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,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.ability.*; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; @@ -128,7 +127,8 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic nextPage(LocalConfigAbility.class); break; - default:break; + default: + break; } } @@ -149,5 +149,4 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic } - } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java index 649452b922707dc87781265b3623df97d26efc6c..f4062eec5c1fba8fbc8f5ac73e64e86394179051 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.adapter.NonViewAdapter; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; @@ -25,7 +24,6 @@ import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.model.ScheduleSupport; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.ListContainer; import ohos.eventhandler.EventHandler; import ohos.eventhandler.EventRunner; @@ -40,20 +38,21 @@ import java.util.List; * @since 2021-03-29 */ public class NonViewSlice extends BaseAbilitySlice { + private static final String[] SPIN_MUNE = {"全部课程", "第1周有课的课程", "第1周星期一有课的课程"}; + List schedules; ListContainer listView; NonViewAdapter adapter; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_non_view); initViews(); - intents=intent; + intents = intent; } - private static final String[] SPIN_MUNE = {"全部课程","第1周有课的课程","第1周星期一有课的课程"}; - private void initViews() { showPopmenu(); @@ -89,7 +88,8 @@ public class NonViewSlice extends BaseAbilitySlice { case 2: haveTimeWithMonday(); break; - default:break; + default: + break; } } @@ -181,26 +181,4 @@ public class NonViewSlice extends BaseAbilitySlice { } }).start(); } - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java index 69a51fefcf9792cf6a11a2eba07cd5b516700dc2..152d507145cb1b5582ffe607cfbd5aacb7b328ce 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.bean.WeekChooseBean; @@ -33,7 +32,6 @@ import com.zhuangfei.timetable.model.Schedule; import com.zhuangfei.timetable.view.WeekView; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.components.*; import ohos.agp.components.element.ShapeElement; import ohos.agp.utils.Color; @@ -91,7 +89,7 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_base_func); initViews(); - intents=intent; + intents = intent; } private void initViews() { @@ -330,7 +328,8 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi protected void display(List beans) { String str = ""; for (Schedule bean : beans) { - str += bean.getName() + "," + bean.getWeekList().toString() + "," + bean.getStart() + "," + bean.getStep() + "\n"; + str += bean.getName() + "," + bean.getWeekList().toString() + "," + + bean.getStart() + "," + bean.getStep() + "\n"; } ToastViewDialog.toast(this, str); } @@ -396,28 +395,4 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi } return pixelMap; } - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } - } diff --git a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java index 4fc0741a8e4e891e2a672ba8fafcaa905d31390c..5e6bedbee89f59fc3a53f8f85551c2d6dea90ece 100644 --- a/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java +++ b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SlideSlice.java @@ -15,7 +15,6 @@ package com.zhuangfei.android_timetableview.slice; -import com.zhuangfei.android_timetableview.MainAbility; import com.zhuangfei.android_timetableview.ResourceTable; import com.zhuangfei.android_timetableview.base.BaseAbilitySlice; import com.zhuangfei.android_timetableview.model.MySubject; @@ -26,7 +25,6 @@ import com.zhuangfei.timetable.listener.ISchedule; import com.zhuangfei.timetable.listener.OnSlideBuildAdapter; import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; import ohos.agp.colors.RgbColor; import ohos.agp.components.*; import ohos.agp.utils.Color; @@ -39,21 +37,21 @@ import java.util.List; * @since 2021-03-29 */ public class SlideSlice extends BaseAbilitySlice { + private static final String[] SPIN_MUNE = {"显示节次时间", "隐藏节次时间", "修改侧边栏背景", + "修改节次文本颜色", "修改时间文本颜色", "自定义侧边栏", "取消自定义侧边栏"}; TimetableView mTimetableView; Intent intents; + @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_slide); initViews(); showPopmenu(); - intents=intent; + intents = intent; } - private static final String[] SPIN_MUNE = {"显示节次时间", "隐藏节次时间", "修改侧边栏背景", - "修改节次文本颜色", "修改时间文本颜色", "自定义侧边栏", "取消自定义侧边栏"}; - private void showPopmenu() { MaterialSpinner spinner = (MaterialSpinner) findComponentById(ResourceTable.Id_id_more); spinner.setOnItemSelectedListener((MaterialSpinner.OnItemSelectedListener) ( @@ -209,28 +207,4 @@ public class SlideSlice extends BaseAbilitySlice { mTimetableView.callback((ISchedule.OnSlideBuildListener) null) .updateSlideView(); } - - - @Override - protected void onBackPressed() { - super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); - } - - /** - * nextPage - * - * @param pageName - */ - public void nextPage(Class pageName) { - Intent secondIntent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(this.getBundleName()) - .withAbilityName(pageName.getName()) - .build(); - secondIntent.setOperation(operation); - startAbility(secondIntent); - } }