From 2a13f1bf4890b9d1a5d44b14cc3457fe245a40c0 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Mon, 26 Apr 2021 19:23:29 +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.=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/config.json | 34 +++++++++---------- .../slice/AttrSlice.java | 25 ++++++++++++-- .../slice/BaseFuncSlice.java | 23 +++++++++++++ .../slice/ColorPoolSlice.java | 23 ++++++++++++- .../slice/CustomWidthSlice.java | 23 ++++++++++++- .../slice/DateDelaySlice.java | 23 ++++++++++++- .../slice/DateSlice.java | 23 ++++++++++++- .../slice/ElasticSlice.java | 22 +++++++++++- .../slice/ExtrasSlice.java | 21 ++++++++++++ .../slice/FlaglayoutSlice.java | 24 ++++++++++++- .../slice/ItemStyleSlice.java | 22 +++++++++++- .../slice/LocalConfigSlice.java | 23 ++++++++++++- .../slice/NonViewSlice.java | 22 ++++++++++++ .../slice/SimpleSlice.java | 23 +++++++++++++ .../slice/SlideSlice.java | 24 ++++++++++++- 15 files changed, 327 insertions(+), 28 deletions(-) diff --git a/entry/src/main/config.json b/entry/src/main/config.json index d33d1ec..0b54f8c 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -55,7 +55,7 @@ "description": "$string:mainability_description", "label": "timetableview", "type": "page", - "launchType": "standard" + "launchType": "singleton" }, { "metaData": { @@ -69,9 +69,9 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.AttrAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -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,9 +101,9 @@ "orientation": "unspecified", "name": "com.zhuangfei.android_timetableview.ability.CustomWidthAbility", "icon": "$media:icon", - "label": "entry", + "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -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/slice/AttrSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/AttrSlice.java index be9886b..6710de9 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,13 +39,13 @@ import java.util.List; public class AttrSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; - + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_attr); mySubjects = SubjectRepertory.loadDefaultSubjects(); - + intents=intent; initTimetableView(); } @@ -83,4 +85,23 @@ public class AttrSlice extends BaseAbilitySlice { } ToastViewDialog.toast(AttrSlice.this, str); } + + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 2768153..2e40a99 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,6 +56,7 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked DirectionalLayout layout; Text titleTextView; List mySubjects; + Intent intents; /** * 记录切换的周次，不一定是当前周 @@ -66,6 +69,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 +448,23 @@ 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); + } + + + private 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 21db3df..4e9c258 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; @@ -35,7 +37,7 @@ import java.util.Map; */ public class ColorPoolSlice extends BaseAbilitySlice { TimetableView mTimetableView; - + Intent intents; MaterialSpinner moreButton; @Override @@ -43,6 +45,7 @@ public class ColorPoolSlice extends BaseAbilitySlice { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_color_pool); initViews(); + intents=intent; } private void initViews() { @@ -151,4 +154,22 @@ public class ColorPoolSlice extends BaseAbilitySlice { mTimetableView.colorPool().setIgnoreUserlessColor(false).setColorMap(colorMap); mTimetableView.updateView(); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 ef853fe..3e37260 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,6 +46,7 @@ public class CustomWidthSlice extends BaseAbilitySlice { TimetableView mTimetableView; CustomOperater operater; List mySubjects; + Intent intents; @Override public void onStart(Intent intent) { @@ -51,7 +54,7 @@ public class CustomWidthSlice extends BaseAbilitySlice { super.setUIContent(ResourceTable.Layout_ability_custom_width); mySubjects = SubjectRepertory.loadDefaultSubjects2(); mySubjects.addAll(SubjectRepertory.loadDefaultSubjects()); - + intents=intent; initViews(); } @@ -129,4 +132,22 @@ public class CustomWidthSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 ad7046e..b81be92 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,22 @@ public class DateDelaySlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 f171f5f..b11cb26 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,22 @@ public class DateSlice extends BaseAbilitySlice { mTimetableView.callback((ISchedule.OnDateBuildListener) null) .updateDateView(); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 34bd714..44a088c 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() { @@ -74,5 +77,22 @@ public class ElasticSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + private 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 0400a2d..d7dbfa2 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,6 +40,7 @@ import java.util.List; public class ExtrasSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; + Intent intents; @Override public void onStart(Intent intent) { @@ -47,6 +50,7 @@ public class ExtrasSlice extends BaseAbilitySlice { mySubjects = SubjectRepertory.loadDefaultSubjects(); initViews(); + intents=intent; } private void initViews() { @@ -89,5 +93,22 @@ public class ExtrasSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + private 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 3c493d8..042a0dc 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; @@ -37,7 +39,7 @@ import java.util.List; * @since 2021-03-29 */ public class FlaglayoutSlice extends BaseAbilitySlice { - + Intent intents; TimetableView mTimetableView; @Override @@ -46,6 +48,7 @@ public class FlaglayoutSlice extends BaseAbilitySlice { super.setUIContent(ResourceTable.Layout_ability_flaglayout); initViews(); showPopmenu(); + intents=intent; } private static final String[] SPIN_MUNE = {"点击空白格子试试~","修改旗标布局背景","重置旗标布局背景","取消旗标布局","恢复旗标布局"}; @@ -160,4 +163,23 @@ public class FlaglayoutSlice extends BaseAbilitySlice { private void resetFlaglayout() { mTimetableView.isShowFlaglayout(true).updateFlaglayout(); } + + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 cc6f5bc..80180f1 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; @@ -43,7 +45,7 @@ import java.util.List; */ public class ItemStyleSlice extends BaseAbilitySlice { TimetableView mTimetableView; - + Intent intents; MaterialSpinner moreButton; @Override @@ -51,6 +53,7 @@ public class ItemStyleSlice extends BaseAbilitySlice { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_custom_item_style); initViews(); + intents=intent; } private void initViews() { @@ -276,5 +279,22 @@ public class ItemStyleSlice extends BaseAbilitySlice { .callback((ISchedule.OnItemBuildListener) null) .updateView(); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + private 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 41febdf..b5e4b12 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,22 @@ public class LocalConfigSlice extends BaseAbilitySlice { } timetableView.updateView(); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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/NonViewSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/NonViewSlice.java index 5a8eaad..7c1ff50 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,14 @@ 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 +182,22 @@ public class NonViewSlice extends BaseAbilitySlice { } }).start(); } + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 b36a658..e7d183c 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; @@ -57,6 +59,7 @@ import java.util.List; * @since 2021-03-29 */ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedListener { + private Intent intents; /** * 广告链接 */ @@ -89,6 +92,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 +397,23 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi } return pixelMap; } + + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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 81ef0a7..3b85f9e 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; @@ -37,7 +39,7 @@ import java.util.List; * @since 2021-03-29 */ public class SlideSlice extends BaseAbilitySlice { - + private Intent intents; TimetableView mTimetableView; @Override @@ -46,6 +48,7 @@ public class SlideSlice extends BaseAbilitySlice { super.setUIContent(ResourceTable.Layout_ability_slide); initViews(); showPopmenu(); + intents=intent; } private static final String[] SPIN_MUNE = {"显示节次时间", "隐藏节次时间", "修改侧边栏背景", @@ -206,4 +209,23 @@ public class SlideSlice extends BaseAbilitySlice { mTimetableView.callback((ISchedule.OnSlideBuildListener) null) .updateSlideView(); } + + @Override + protected void onBackPressed() { + super.onBackPressed(); + nextPage(MainAbility.class); + stopAbility(intents); + } + + + private 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); + } } -- Gitee From 9ad4d193621158ddcc8a9e69a414735571b119cd Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Mon, 26 Apr 2021 20:19:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/$PROJECT_FILE$ | 11 + .idea/.gitignore | 3 + .idea/checkstyle-idea.xml | 16 + .idea/compiler.xml | 6 + .idea/gradle.xml | 23 + .idea/jarRepositories.xml | 35 ++ .idea/misc.xml | 13 + .idea/qaplug_profiles.xml | 465 ++++++++++++++++++ .idea/vcs.xml | 6 + entry/src/main/config.json | 6 +- .../base/BaseAbilitySlice.java | 7 + .../slice/AttrSlice.java | 13 +- .../slice/BaseFuncSlice.java | 10 +- .../slice/ColorPoolSlice.java | 14 +- .../slice/CustomWidthSlice.java | 11 +- .../slice/DateDelaySlice.java | 10 +- .../slice/DateSlice.java | 9 +- .../slice/ElasticSlice.java | 9 +- .../slice/ExtrasSlice.java | 10 +- .../slice/FlaglayoutSlice.java | 12 +- .../slice/ItemStyleSlice.java | 11 +- .../slice/LocalConfigSlice.java | 9 +- .../slice/MainAbilitySlice.java | 9 +- .../slice/NonViewSlice.java | 9 +- .../slice/SimpleSlice.java | 16 +- .../slice/SlideSlice.java | 13 +- 26 files changed, 708 insertions(+), 48 deletions(-) create mode 100644 .idea/$PROJECT_FILE$ create mode 100644 .idea/.gitignore create mode 100644 .idea/checkstyle-idea.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/qaplug_profiles.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ new file mode 100644 index 0000000..58b7e3e --- /dev/null +++ b/.idea/$PROJECT_FILE$ @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..6eefe0e --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..bfc71fd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..74bd301 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8a14290 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml new file mode 100644 index 0000000..3dfd21f --- /dev/null +++ b/.idea/qaplug_profiles.xml @@ -0,0 +1,465 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 0b54f8c..07cae1e 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -55,7 +55,7 @@ "description": "$string:mainability_description", "label": "timetableview", "type": "page", - "launchType": "singleton" + "launchType": "standard" }, { "metaData": { @@ -71,7 +71,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "standard" + "launchType": "singleton" }, { "metaData": { @@ -103,7 +103,7 @@ "icon": "$media:icon", "label": "timetableview", "type": "page", - "launchType": "standard" + "launchType": "singleton" }, { "metaData": { 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 a05be86..6fcc84d 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 6710de9..ab73520 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 @@ -45,8 +45,9 @@ public class AttrSlice extends BaseAbilitySlice { super.onStart(intent); super.setUIContent(ResourceTable.Layout_ability_attr); mySubjects = SubjectRepertory.loadDefaultSubjects(); - intents=intent; + initTimetableView(); + intents=intent; } /** @@ -86,6 +87,8 @@ public class AttrSlice extends BaseAbilitySlice { ToastViewDialog.toast(AttrSlice.this, str); } + + @Override protected void onBackPressed() { super.onBackPressed(); @@ -93,8 +96,12 @@ public class AttrSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/BaseFuncSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/BaseFuncSlice.java index 2e40a99..7466a3c 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 @@ -57,7 +57,6 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked Text titleTextView; List mySubjects; Intent intents; - /** * 记录切换的周次，不一定是当前周 */ @@ -449,6 +448,7 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked mTimetableView.isShowWeekends(true).updateView(); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -456,8 +456,12 @@ public class BaseFuncSlice extends BaseAbilitySlice implements Component.Clicked stopAbility(intents); } - - 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/ColorPoolSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ColorPoolSlice.java index 4e9c258..2f3e8e4 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 @@ -37,9 +37,9 @@ import java.util.Map; */ public class ColorPoolSlice extends BaseAbilitySlice { TimetableView mTimetableView; - Intent intents; - MaterialSpinner moreButton; + MaterialSpinner moreButton; + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -154,6 +154,8 @@ public class ColorPoolSlice extends BaseAbilitySlice { mTimetableView.colorPool().setIgnoreUserlessColor(false).setColorMap(colorMap); mTimetableView.updateView(); } + + @Override protected void onBackPressed() { super.onBackPressed(); @@ -161,8 +163,12 @@ public class ColorPoolSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/CustomWidthSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/CustomWidthSlice.java index 3e37260..bf84a00 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 @@ -47,7 +47,6 @@ public class CustomWidthSlice extends BaseAbilitySlice { CustomOperater operater; List mySubjects; Intent intents; - @Override public void onStart(Intent intent) { super.onStart(intent); @@ -132,6 +131,8 @@ public class CustomWidthSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + + @Override protected void onBackPressed() { super.onBackPressed(); @@ -139,8 +140,12 @@ public class CustomWidthSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/DateDelaySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateDelaySlice.java index b81be92..c664749 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 @@ -134,6 +134,8 @@ public class DateDelaySlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + + @Override protected void onBackPressed() { super.onBackPressed(); @@ -141,8 +143,12 @@ public class DateDelaySlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/DateSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/DateSlice.java index b11cb26..0b7aee3 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 @@ -166,6 +166,7 @@ public class DateSlice extends BaseAbilitySlice { mTimetableView.callback((ISchedule.OnDateBuildListener) null) .updateDateView(); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -173,8 +174,12 @@ public class DateSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/ElasticSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ElasticSlice.java index 44a088c..1bac1e1 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 @@ -77,6 +77,7 @@ public class ElasticSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -84,8 +85,12 @@ public class ElasticSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/ExtrasSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ExtrasSlice.java index d7dbfa2..5f615ce 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 @@ -41,7 +41,6 @@ public class ExtrasSlice extends BaseAbilitySlice { TimetableView mTimetableView; List mySubjects; Intent intents; - @Override public void onStart(Intent intent) { super.onStart(intent); @@ -93,6 +92,7 @@ public class ExtrasSlice extends BaseAbilitySlice { public void onForeground(Intent intent) { super.onForeground(intent); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -100,8 +100,12 @@ public class ExtrasSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/FlaglayoutSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/FlaglayoutSlice.java index 042a0dc..b735fe0 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 @@ -39,9 +39,9 @@ import java.util.List; * @since 2021-03-29 */ public class FlaglayoutSlice extends BaseAbilitySlice { - Intent intents; - TimetableView mTimetableView; + TimetableView mTimetableView; + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -171,8 +171,12 @@ public class FlaglayoutSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/ItemStyleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/ItemStyleSlice.java index 80180f1..1cf6da0 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 @@ -45,9 +45,10 @@ import java.util.List; */ public class ItemStyleSlice extends BaseAbilitySlice { TimetableView mTimetableView; - Intent intents; + MaterialSpinner moreButton; + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -286,8 +287,12 @@ public class ItemStyleSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/LocalConfigSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/LocalConfigSlice.java index b5e4b12..f42c40e 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 @@ -187,6 +187,7 @@ public class LocalConfigSlice extends BaseAbilitySlice { } timetableView.updateView(); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -194,8 +195,12 @@ public class LocalConfigSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/MainAbilitySlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/MainAbilitySlice.java index 3e4c5f5..6c0bdf2 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 7c1ff50..649452b 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 @@ -44,7 +44,6 @@ public class NonViewSlice extends BaseAbilitySlice { ListContainer listView; NonViewAdapter adapter; Intent intents; - @Override public void onStart(Intent intent) { super.onStart(intent); @@ -189,8 +188,12 @@ public class NonViewSlice extends BaseAbilitySlice { stopAbility(intents); } - - 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/SimpleSlice.java b/entry/src/main/java/com/zhuangfei/android_timetableview/slice/SimpleSlice.java index e7d183c..69a51fe 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 @@ -59,7 +59,6 @@ import java.util.List; * @since 2021-03-29 */ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedListener { - private Intent intents; /** * 广告链接 */ @@ -73,7 +72,7 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi */ TimetableView mTimetableView; WeekView mWeekView; - + Intent intents; DirectionalLayout layout; Text titleTextView; List mySubjects; @@ -401,12 +400,16 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi @Override protected void onBackPressed() { super.onBackPressed(); - nextPage(MainAbility.class); - stopAbility(intents); + nextPage(MainAbility.class); + stopAbility(intents); } - - private void nextPage(Class pageName) { + /** + * nextPage + * + * @param pageName + */ + public void nextPage(Class pageName) { Intent secondIntent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") @@ -416,4 +419,5 @@ public class SimpleSlice extends BaseAbilitySlice implements Component.ClickedLi 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 3b85f9e..4fc0741 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 @@ -39,9 +39,9 @@ import java.util.List; * @since 2021-03-29 */ public class SlideSlice extends BaseAbilitySlice { - private Intent intents; - TimetableView mTimetableView; + TimetableView mTimetableView; + Intent intents; @Override public void onStart(Intent intent) { super.onStart(intent); @@ -210,6 +210,7 @@ public class SlideSlice extends BaseAbilitySlice { .updateSlideView(); } + @Override protected void onBackPressed() { super.onBackPressed(); @@ -217,8 +218,12 @@ public class SlideSlice extends BaseAbilitySlice { stopAbility(intents); } - - private void nextPage(Class pageName) { + /** + * nextPage + * + * @param pageName + */ + public void nextPage(Class pageName) { Intent secondIntent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") -- Gitee From 67eae77b89d108cf2f9822d45655335fc381b871 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Mon, 26 Apr 2021 20:19:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/$PROJECT_FILE$ | 11 - .idea/.gitignore | 3 - .idea/checkstyle-idea.xml | 16 -- .idea/compiler.xml | 6 - .idea/gradle.xml | 23 -- .idea/jarRepositories.xml | 35 --- .idea/misc.xml | 13 -- .idea/qaplug_profiles.xml | 465 -------------------------------------- .idea/vcs.xml | 6 - 9 files changed, 578 deletions(-) delete mode 100644 .idea/$PROJECT_FILE$ delete mode 100644 .idea/.gitignore delete mode 100644 .idea/checkstyle-idea.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/qaplug_profiles.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ deleted file mode 100644 index 58b7e3e..0000000 --- a/.idea/$PROJECT_FILE$ +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index 6eefe0e..0000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index bfc71fd..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 74bd301..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8a14290..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml deleted file mode 100644 index 3dfd21f..0000000 --- a/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee