From 6c4d425a79ea0d0285cafdca1acd233c5f77a578 Mon Sep 17 00:00:00 2001 From: REAndroid Date: Mon, 21 Nov 2022 07:13:16 -0500 Subject: [PATCH] Fix issue on counting key strings --- .../com/reandroid/lib/arsc/array/OffsetBlockArray.java | 9 +++++++++ .../java/com/reandroid/lib/arsc/base/BlockCounter.java | 7 +++++++ .../com/reandroid/lib/arsc/value/plurals/PluralsBag.java | 1 + 3 files changed, 17 insertions(+) diff --git a/src/main/java/com/reandroid/lib/arsc/array/OffsetBlockArray.java b/src/main/java/com/reandroid/lib/arsc/array/OffsetBlockArray.java index bab0c4c..1492f9f 100755 --- a/src/main/java/com/reandroid/lib/arsc/array/OffsetBlockArray.java +++ b/src/main/java/com/reandroid/lib/arsc/array/OffsetBlockArray.java @@ -3,6 +3,7 @@ package com.reandroid.lib.arsc.array; import com.reandroid.lib.arsc.base.Block; import com.reandroid.lib.arsc.base.BlockArray; +import com.reandroid.lib.arsc.base.BlockCounter; import com.reandroid.lib.arsc.io.BlockLoad; import com.reandroid.lib.arsc.io.BlockReader; import com.reandroid.lib.arsc.item.ByteArray; @@ -46,6 +47,14 @@ public abstract class OffsetBlockArray extends BlockArray im return result+endCount; } @Override + public void onCountUpTo(BlockCounter counter){ + super.onCountUpTo(counter); + if(counter.FOUND){ + return; + } + mEnd4Block.onCountUpTo(counter); + } + @Override public byte[] getBytes(){ byte[] results=super.getBytes(); if(results==null){ diff --git a/src/main/java/com/reandroid/lib/arsc/base/BlockCounter.java b/src/main/java/com/reandroid/lib/arsc/base/BlockCounter.java index 45b4161..fbf767d 100755 --- a/src/main/java/com/reandroid/lib/arsc/base/BlockCounter.java +++ b/src/main/java/com/reandroid/lib/arsc/base/BlockCounter.java @@ -13,4 +13,11 @@ public class BlockCounter { } COUNT+=val; } + @Override + public String toString(){ + if(FOUND){ + return "FOUND="+COUNT; + } + return String.valueOf(COUNT); + } } diff --git a/src/main/java/com/reandroid/lib/arsc/value/plurals/PluralsBag.java b/src/main/java/com/reandroid/lib/arsc/value/plurals/PluralsBag.java index 6950810..3c1ef2a 100644 --- a/src/main/java/com/reandroid/lib/arsc/value/plurals/PluralsBag.java +++ b/src/main/java/com/reandroid/lib/arsc/value/plurals/PluralsBag.java @@ -36,6 +36,7 @@ public class PluralsBag { } return typeString.get(); } + @Override public String toString() { StringBuilder builder=new StringBuilder();