diff --git a/entry/src/main/config.json b/entry/src/main/config.json index d33d1ecbd5817846aefb1136b38b154096fc28c7..07cae1eb2a365bb3110291887b1cfec1215370e8 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -69,7 +69,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.AttrAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -85,7 +85,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.BaseFucAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -101,7 +101,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.CustomWidthAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -117,7 +117,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.DateAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -133,7 +133,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.DateDelayAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -149,7 +149,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.ElasticAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -165,7 +165,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.ExtrasAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -181,7 +181,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.FlaglayoutAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -197,7 +197,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.ItemStyleAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -213,7 +213,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.LocalConfigAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -229,7 +229,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.NonViewAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -245,7 +245,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.SimpleAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -261,7 +261,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.SlideAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" }, @@ -277,7 +277,7 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.ColorPoolAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", "launchType": "singleton" } 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 a05be86cefc68ea3c15ac12bcc31ca623cb3bc79..6fcc84dfaf2141f9cf3f97e288b31292d83cb5b3 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 @@ -17,6 +17,7 @@ package com.zhuangfei.android_timetableview.base; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; +import ohos.aafwk.content.Operation; import ohos.agp.utils.Color; import ohos.agp.window.service.WindowManager; @@ -29,9 +30,15 @@ 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 be9886b810761600b01255dca0ea6f5e44f1f2eb..ab735206e5199ca6b6f738eb62a928f634844fef 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,6 +15,7 @@ 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; @@ -25,6 +26,7 @@ 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; @@ -37,7 +39,7 @@ import java.util.List; public class AttrSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -45,6 +47,7 @@ public class AttrSlice extends BaseAbilitySlice { mySubjects = SubjectRepertory.loadDefaultSubjects(); initTimetableView(); + intents=intent; } /** @@ -83,4 +86,29 @@ 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 276815325fbea36631aa79e62c4ab1e7991552a8..7466a3c753cd5009147399fbafddbfa6cfc50c45 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,6 +15,7 @@ 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; @@ -31,6 +32,7 @@ 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; @@ -54,7 +56,7 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked DirectionalLayout layout; Text titleTextView; List mySubjects; - + Intent intents; /** * 记录切换的周次，不一定是当前周 */ @@ -66,6 +68,7 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_base_func); initViews(); + intents=intent; } private void initViews() { @@ -444,4 +447,28 @@ 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 21db3dfb1b04f038add23d01fb42450e43436099..2f3e8e4131619c40c1c9a1b0f6d06c8f18d89d87 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,6 +14,7 @@ */ 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; @@ -22,6 +23,7 @@ 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; @@ -37,12 +39,13 @@ public class ColorPoolSlice extends BaseAbilitySlice { 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; } private void initViews() { @@ -151,4 +154,28 @@ public class ColorPoolSlice extends BaseAbilitySlice { 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 ef853fef899cbae502fd8f45163eb4b43ec6a50f..bf84a0060deb35dcb77c02879d995d5cc7c94b89 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,6 +14,7 @@ */ 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; @@ -26,6 +27,7 @@ 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; @@ -44,14 +46,14 @@ public class CustomWidthSlice extends BaseAbilitySlice { TimetableView mTimetableView; 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; initViews(); } @@ -129,4 +131,28 @@ 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 ad7046e74c63282875db70fb2a9b4980b2edea08..c6647497bffcf32fb5c3a440a21482c13eddb4ba 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,6 +14,7 @@ */ 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; @@ -24,6 +25,7 @@ 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; @@ -41,7 +43,7 @@ public class DateDelaySlice extends BaseAbilitySlice { Text titleTextView; List mySubjects; - + Intent intents; @Override public void onStart(Intent intent) { @@ -54,6 +56,7 @@ public class DateDelaySlice extends BaseAbilitySlice { spinner.setShowFalse(true); initTimetableView(); data(); + intents=intent; } private void data() { @@ -131,4 +134,28 @@ 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 f171f5f9d456bb1caedbcad9fa3228cbc4e5353b..0b7aee31cd48de040c87180b3859ad9ded0c2dbc 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,6 +15,7 @@ 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; @@ -25,6 +26,7 @@ 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; @@ -39,13 +41,14 @@ import java.util.List; */ public class DateSlice extends BaseAbilitySlice { TimetableView mTimetableView; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_date); initViews(); showPopmenu(); + intents=intent; } private static final String[] SPIN_MUNE = {"隐藏日期栏", "显示日期栏", "自定义日期栏", "恢复默认日期栏"}; @@ -163,4 +166,27 @@ 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 34bd714149922a078644238a1600d54cedf78aa6..1bac1e160a90b53a669aafdba74aee77f19853d4 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,6 +14,7 @@ */ 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; @@ -22,6 +23,7 @@ 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; @@ -34,12 +36,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; } private void initViews() { @@ -75,4 +78,26 @@ public class ElasticSlice extends BaseAbilitySlice { 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 0400a2d71a727f0884882b635e374acfca7eaaaa..5f615ce2be725dde960358df90c745b220936f4e 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,6 +15,7 @@ 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,6 +27,7 @@ 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; @@ -38,7 +40,7 @@ import java.util.List; public class ExtrasSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -47,6 +49,7 @@ public class ExtrasSlice extends BaseAbilitySlice { mySubjects = SubjectRepertory.loadDefaultSubjects(); initViews(); + intents=intent; } private void initViews() { @@ -90,4 +93,26 @@ public class ExtrasSlice extends BaseAbilitySlice { 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 3c493d86ff42e30de11cf7a180b93111fed43a87..b735fe07f0892ce3f6c4133786ddca2ce1765eec 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,6 +15,7 @@ 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,6 +27,7 @@ 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,13 +41,14 @@ import java.util.List; public class FlaglayoutSlice extends BaseAbilitySlice { TimetableView mTimetableView; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_flaglayout); initViews(); showPopmenu(); + intents=intent; } private static final String[] SPIN_MUNE = {"点击空白格子试试~","修改旗标布局背景","重置旗标布局背景","取消旗标布局","恢复旗标布局"}; @@ -160,4 +163,27 @@ 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 cc6f5bc450e1e2aba4be64b0997817665461e1f5..1cf6da0f8b2833e0a663cf09a1a395a164925d3f 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,6 +15,7 @@ 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; @@ -28,6 +29,7 @@ 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; @@ -46,11 +48,13 @@ public class ItemStyleSlice extends BaseAbilitySlice { MaterialSpinner moreButton; + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_custom_item_style); initViews(); + intents=intent; } private void initViews() { @@ -276,5 +280,26 @@ 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 41febdfed0004a4e5a13706fad6c281d5f3a2980..f42c40e02feb7840eed4b3b24d5285b3c7085ab4 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,6 +15,7 @@ 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; @@ -27,6 +28,7 @@ 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; @@ -41,7 +43,7 @@ public class LocalConfigSlice extends BaseAbilitySlice { TimetableView timetableView; MaterialSpinner moreButton; Text titleTextView; - + Intent intents; List mySubjects; int target = -1; boolean initFinish = false; @@ -62,6 +64,7 @@ public class LocalConfigSlice extends BaseAbilitySlice { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_local_config); initViews(); + intents=intent; } private void initViews() { @@ -184,4 +187,27 @@ 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 3e4c5f52866ad4ce3a43c8b5b38fd3ecd47ca55b..6c0bdf2fc8eeb45c46b49e5fd98751b52577d0bd 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,9 +15,11 @@ 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; + import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.agp.components.Button; @@ -130,7 +132,12 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic } } - private void nextPage(Class pageName) { + /** + * nextPage + * + * @param pageName + */ + public void nextPage(Class pageName) { Intent secondIntent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") 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 5a8eaadcd6cda87d4a4bbc56507d0aa7dc44a352..649452b922707dc87781265b3623df97d26efc6c 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,6 +15,7 @@ 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; @@ -24,6 +25,7 @@ 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; @@ -41,12 +43,13 @@ public class NonViewSlice extends BaseAbilitySlice { 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; } private static final String[] SPIN_MUNE = {"全部课程","第1周有课的课程","第1周星期一有课的课程"}; @@ -178,4 +181,26 @@ 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 b36a658b714a6dbf9627f0e7df7592fa51e22662..69a51fefcf9792cf6a11a2eba07cd5b516700dc2 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,6 +15,7 @@ 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,6 +33,7 @@ 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; @@ -70,7 +72,7 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi */ TimetableView mTimetableView; WeekView mWeekView; - + Intent intents; DirectionalLayout layout; Text titleTextView; List mySubjects; @@ -89,6 +91,7 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_base_func); initViews(); + intents=intent; } private void initViews() { @@ -393,4 +396,28 @@ 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 81ef0a73c0c59b7bc5509e3ab5f5254860c82bbe..4fc0741a8e4e891e2a672ba8fafcaa905d31390c 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,6 +15,7 @@ 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; @@ -25,6 +26,7 @@ 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,13 +41,14 @@ import java.util.List; public class SlideSlice extends BaseAbilitySlice { TimetableView mTimetableView; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_slide); initViews(); showPopmenu(); + intents=intent; } private static final String[] SPIN_MUNE = {"显示节次时间", "隐藏节次时间", "修改侧边栏背景", @@ -206,4 +209,28 @@ 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); + } }