diff --git a/CHANGELOG.md b/CHANGELOG.md index bdcafbecd49e3738bab583ab42472e1d2784bc56..15c863e36fd1f9f2b11e3a0d43766de84e72a14e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,5 +2,8 @@ ohos 第一个版本 - 实现了原库的大部分功能 +- 菜单中的选项点击后切换菜单显示效果差异 因为Ohos本身Fraction不支持Stack -- 菜单中的选项点击后切换菜单显示效果差异 因为Ohos本身Fraction不支持Stack \ No newline at end of file +## 0.0.2-SNAPSHOT + +- findbugs修改 \ No newline at end of file diff --git a/README.OPENSOURCE b/README.OPENSOURCE index 332c988c5142bc59b3a9446d09d639af8775acac..2e4dd3dc742e25f67b0ea6a7858512fe014d0958 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -3,7 +3,7 @@ "Name": "Android-MultiBackStack", "License": "Apache License", "License File": "LICENSE", - "Version Number": "1.2.1 ", + "Version Number": "1.2.1", "Upstream URL": "https://github.com/JetradarMobile/android-multibackstack", "Description": "Persistent bottom navigation like in instagram" } diff --git a/README.md b/README.md index fdaaea39906bea8751460d3b5d99d7d47f45af43..e974a0ee7668e0cc4d0f4f73e6ae5fa4529300e4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Ohos-MultiBackStack - 功能:底部状态栏切换效果 - 项目移植状态:完成 - 调用差异:无 -- 开发版本:sdk6,DevEco Studio 2.2 Beta1 +- 开发版本:sdk6,DevEco Studio 2.2 Beta1 - 基线版本:release 1.2.1 @@ -31,7 +31,7 @@ allprojects { ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:Ohos_Multibackstack:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:Ohos_Multibackstack:0.0.2-SNAPSHOT') ...... } ``` @@ -121,7 +121,7 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 ## 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ## 版权和许可信息 ```` diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/MainAbility.java b/entry/src/main/java/com/jetradar/multibackstack/sample/MainAbility.java index 0899b0160d322ed007016bfddfb825de8850c39a..f0b808239cba5e98cadbf7b16c36cb903df3e79a 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/MainAbility.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/MainAbility.java @@ -9,6 +9,10 @@ import ohos.aafwk.content.Intent; * @since 2021-06-10 */ public class MainAbility extends FractionAbility { + /** + * onStart + * @param intent intent + */ @Override public void onStart(Intent intent) { super.onStart(intent); diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/MyApplication.java b/entry/src/main/java/com/jetradar/multibackstack/sample/MyApplication.java index 3de74e7636dfa26752926155da8c9b8dd0268f45..ba588553b46ea56718ad985804fef3965c9d68b8 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/MyApplication.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/MyApplication.java @@ -7,6 +7,9 @@ import ohos.aafwk.ability.AbilityPackage; * @since 2021-06-10 */ public class MyApplication extends AbilityPackage { + /** + * onInitialize + */ @Override public void onInitialize() { super.onInitialize(); diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/FavoritesFraction.java b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/FavoritesFraction.java index c4e5f7ee25357c645b7ae7da84007ee75ad63821..ce35354109dfab33324c8b26d77095aed4db1d97 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/FavoritesFraction.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/FavoritesFraction.java @@ -42,12 +42,20 @@ public class FavoritesFraction extends Fraction { /** * FavoritesFraction * - * @param context context + * @param abilitySlice context */ - public FavoritesFraction(MainAbilitySlice context) { - this.context = context; + public FavoritesFraction(MainAbilitySlice abilitySlice) { + this.context = abilitySlice; } + /** + * onComponentAttached + * + * @param scatter scatter + * @param container container + * @param intent intent + * @return Component + */ @Override protected Component onComponentAttached(LayoutScatter scatter, ComponentContainer container, Intent intent) { Component component = scatter.parse(ResourceTable.Layout_search_fraction, null, false); @@ -56,6 +64,11 @@ public class FavoritesFraction extends Fraction { return component; } + /** + * onStart + * + * @param intent intent + */ @Override protected void onStart(Intent intent) { super.onStart(intent); diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/ProFileFraction.java b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/ProFileFraction.java index 6da0dabd5a1b461c6d77006001b353ccdd388d61..5916909c0eb4b5a4e0216816fe4d9b130d091b1f 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/ProFileFraction.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/ProFileFraction.java @@ -42,12 +42,20 @@ public class ProFileFraction extends Fraction { /** * MainAbilitySlice * - * @param context context + * @param abilitySlice context */ - public ProFileFraction(MainAbilitySlice context) { - this.context = context; + public ProFileFraction(MainAbilitySlice abilitySlice) { + this.context = abilitySlice; } + /** + * onComponentAttached + * + * @param scatter scatter + * @param container container + * @param intent intent + * @return Component + */ @Override protected Component onComponentAttached(LayoutScatter scatter, ComponentContainer container, Intent intent) { Component component = scatter.parse(ResourceTable.Layout_search_fraction, null, false); @@ -56,6 +64,11 @@ public class ProFileFraction extends Fraction { return component; } + /** + * onStart + * + * @param intent intent + */ @Override protected void onStart(Intent intent) { super.onStart(intent); @@ -64,7 +77,7 @@ public class ProFileFraction extends Fraction { listContainer.setItemProvider(itemProvider); listContainer.setItemClickedListener(new ListContainer.ItemClickedListener() { @Override - public void onItemClicked(ListContainer listContainer, Component component, int i, long l) { + public void onItemClicked(ListContainer container, Component component, int i, long l) { context.addAction(ProFileFraction.this, i); click(i); } diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/SearchFraction.java b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/SearchFraction.java index 889985c1f2da87d79634754240d9cf6b5afe3b28..2eeeecc4592204b7aa4c1301fef2a8cf48174bcb 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/SearchFraction.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/fraction/SearchFraction.java @@ -34,6 +34,7 @@ import java.util.List; * @since 2021-06-10 */ public class SearchFraction extends Fraction { + private static final int NUM_10 = 10; private ListContainer listContainer; private ItemProvider itemProvider; private MainAbilitySlice context; @@ -43,12 +44,20 @@ public class SearchFraction extends Fraction { /** * SearchFraction * - * @param context context + * @param abilitySlice context */ - public SearchFraction(MainAbilitySlice context) { - this.context = context; + public SearchFraction(MainAbilitySlice abilitySlice) { + this.context = abilitySlice; } + /** + * onComponentAttached + * + * @param scatter scatter + * @param container container + * @param intent intent + * @return Component + */ @Override protected Component onComponentAttached(LayoutScatter scatter, ComponentContainer container, Intent intent) { Component component = scatter.parse(ResourceTable.Layout_search_fraction, null, false); @@ -57,6 +66,11 @@ public class SearchFraction extends Fraction { return component; } + /** + * onStart + * + * @param intent intent + */ @Override protected void onStart(Intent intent) { super.onStart(intent); @@ -86,11 +100,9 @@ public class SearchFraction extends Fraction { text.setVisibility(Component.VISIBLE); text.setText(data.get(i)); text.setTextColor(new Color(Color.getIntColor("#A2A2A2"))); - } private void unClick() { - context.initTitle(); listContainer.setVisibility(Component.VISIBLE); text.setVisibility(Component.HIDE); @@ -111,8 +123,8 @@ public class SearchFraction extends Fraction { private List getData() { List list = new ArrayList<>(); - for (int i = 1; i <= 10; i++) { - list.add("Search " + i); + for (int index = 1; index <= NUM_10; index++) { + list.add("Search " + index); } return list; } diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/provider/ItemProvider.java b/entry/src/main/java/com/jetradar/multibackstack/sample/provider/ItemProvider.java index 36eaa907518ddc96f181b83d407b69930a9c7cb7..38e69458740a7db74d97fce99252f8ed3118e3f5 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/provider/ItemProvider.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/provider/ItemProvider.java @@ -32,31 +32,56 @@ public class ItemProvider extends BaseItemProvider { /** * ItemProvider * - * @param list list - * @param context context + * @param stringList list + * @param cont context */ - public ItemProvider(List list, Context context) { - this.list = list; - this.context = context; + public ItemProvider(List stringList, Context cont) { + this.list = stringList; + this.context = cont; } + /** + * getCount + * + * @return int + */ @Override public int getCount() { return list.size(); } + /** + * getItem + * + * @param index i + * @return Object + */ @Override - public Object getItem(int i) { - return list.get(i); + public Object getItem(int index) { + return list.get(index); } + /** + * getItemId + * + * @param index index + * @return + */ @Override public long getItemId(int index) { return index; } + /** + * getComponent + * + * @param index index + * @param component component + * @param componentContainer componentContainer + * @return Component + */ @Override - public Component getComponent(int i, Component component, ComponentContainer componentContainer) { + public Component getComponent(int index, Component component, ComponentContainer componentContainer) { final Component cpt; ViewHolder holder; if (component == null) { @@ -67,7 +92,7 @@ public class ItemProvider extends BaseItemProvider { cpt = component; holder = (ViewHolder) cpt.getTag(); } - holder.text.setText(list.get(i)); + holder.text.setText(list.get(index)); return cpt; } @@ -76,8 +101,8 @@ public class ItemProvider extends BaseItemProvider { * * @since 2021-06-10 */ - private class ViewHolder { - Text text; + static class ViewHolder { + private Text text; /** * ViewHolder @@ -87,5 +112,13 @@ public class ItemProvider extends BaseItemProvider { ViewHolder(Component component) { text = (Text) component.findComponentById(ResourceTable.Id_item_text); } + + public Text getText() { + return text; + } + + public void setText(Text textname) { + this.text = textname; + } } } diff --git a/entry/src/main/java/com/jetradar/multibackstack/sample/slice/MainAbilitySlice.java b/entry/src/main/java/com/jetradar/multibackstack/sample/slice/MainAbilitySlice.java index cebc06116f55e59b1941610e4180b653209fa80d..71d92c6a808029b884fba63223f09e478cc91bd3 100644 --- a/entry/src/main/java/com/jetradar/multibackstack/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/jetradar/multibackstack/sample/slice/MainAbilitySlice.java @@ -57,6 +57,11 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic private Intent intents; private int selectInt = 0; + /** + * onStart + * + * @param intent intent + */ @Override protected void onStart(Intent intent) { super.onStart(intent); @@ -92,10 +97,20 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic profile.setClickedListener(this::onClick); } - public void setSelectInt(int selectInt) { - this.selectInt = selectInt; + /** + * setSelectInt + * + * @param seleIndex selectInt + */ + public void setSelectInt(int seleIndex) { + this.selectInt = seleIndex; } + /** + * onClick + * + * @param component component + */ @Override public void onClick(Component component) { switch (component.getId()) { @@ -199,6 +214,9 @@ public class MainAbilitySlice extends BaseAbilitySlice implements Component.Clic profile.setScale(1, 1); } + /** + * onBackPressed + */ @Override protected void onBackPressed() { if (list.size() == 1) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java b/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java index 4be1b188b72c0a7d59fbc337e49dbb42309d62c7..13f7ac6ec754fc261e52abbd25787249c1683f63 100644 --- a/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java +++ b/multibackstack/src/main/java/com/jetradar/multibackstack/BaseAbilitySlice.java @@ -18,6 +18,12 @@ public abstract class BaseAbilitySlice extends AbilitySlice implements CallBack private static final int NUM_2 = 2; protected List list = new ArrayList<>(); + /** + * addAction + * + * @param fraction fraction + * @param item item + */ @Override public void addAction(Fraction fraction, int item) { Action action1 = new Action(fraction, item); @@ -103,7 +109,7 @@ public abstract class BaseAbilitySlice extends AbilitySlice implements CallBack */ public boolean clear(int hostId) { list.clear(); - if (list == null) { + if (list.size() == 0) { return false; } return true; diff --git a/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java b/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java index a163fb4fe81999656b126ba4b4750314df9b5237..57ca05ed85f711e7d4d9804e56d4ca317c3fa71e 100644 --- a/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java +++ b/multibackstack/src/main/java/com/jetradar/multibackstack/bean/Action.java @@ -30,22 +30,38 @@ public class Action { /** * Action * - * @param fraction fraction - * @param item item + * @param fac fraction + * @param itemIndex item */ - public Action(Fraction fraction, int item) { - this.fraction = fraction; - this.item = item; + public Action(Fraction fac, int itemIndex) { + this.fraction = fac; + this.item = itemIndex; } + /** + * getFraction + * + * @return Fraction + */ public Fraction getFraction() { return fraction; } + /** + * getItem + * + * @return int + */ public int getItem() { return item; } + /** + * equals + * + * @param obj + * @return boolean + */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -59,6 +75,11 @@ public class Action { && Objects.equals(fraction, action.fraction); } + /** + * hashCode + * + * @return int + */ @Override public int hashCode() { return Objects.hash(fraction, item);