From 718748ef6cc5c21d183dcc2619915b84ef74fe8d Mon Sep 17 00:00:00 2001 From: 0000248716-lijiaxiao Date: Thu, 15 Jul 2021 16:53:01 +0800 Subject: [PATCH 1/4] 1.0.0 --- .../file/slice/MainAbilitySlice.java | 10 ++++--- .../resources/base/layout/ability_main.xml | 3 ++- .../filepicker/model/DialogProperties.java | 27 ++++++++++++++++--- .../filepicker/model/FileListItem.java | 10 +++++++ .../filepicker/view/FilePickerDialog.java | 2 +- .../filepicker/widget/MaterialCheckbox.java | 20 +++++++------- library/src/main/resources/rawfile/text.txt | 1 + 7 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 library/src/main/resources/rawfile/text.txt diff --git a/entry/src/main/java/com/developer/filepicker/file/slice/MainAbilitySlice.java b/entry/src/main/java/com/developer/filepicker/file/slice/MainAbilitySlice.java index a7ef21d..bdbfca7 100644 --- a/entry/src/main/java/com/developer/filepicker/file/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/developer/filepicker/file/slice/MainAbilitySlice.java @@ -96,7 +96,7 @@ public class MainAbilitySlice extends AbilitySlice { fileList = (ListContainer) findComponentById(ResourceTable.Id_listView); mFileListAdapter = new FileListAdapter(listItem, getContext()); fileList.setItemProvider(mFileListAdapter); - properties = new DialogProperties(); + properties = new DialogProperties(this); RadioContainer modeRadio = (RadioContainer) findComponentById(ResourceTable.Id_modeRadio); modeRadio.mark(0); modeRadio.setMarkChangedListener((radioContainer, index) -> { @@ -215,10 +215,12 @@ public class MainAbilitySlice extends AbilitySlice { @Override protected void onBackPressed() { - if (!dialog.isShowing()) { - super.onBackPressed(); + if (dialog != null){ + if (!dialog.isShowing()) { + super.onBackPressed(); + } + dialog.destroy(); } - dialog.destroy(); } @Override diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml index cb0fbd0..2353361 100644 --- a/entry/src/main/resources/base/layout/ability_main.xml +++ b/entry/src/main/resources/base/layout/ability_main.xml @@ -170,7 +170,8 @@ ohos:height="match_content" ohos:width="match_parent" ohos:orientation="horizontal" - ohos:padding="10vp"> + ohos:padding="10vp" + ohos:bottom_margin="20vp"> { this.marked = marked; } + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } + @Override public int compareTo(FileListItem fileListItem) { if (fileListItem.isDirectory() && isDirectory()) { diff --git a/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java b/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java index 7f20a8b..19e05e3 100644 --- a/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java +++ b/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java @@ -60,7 +60,7 @@ public class FilePickerDialog extends CommonDialog implements ListContainer.Item public FilePickerDialog(Context context) { super(context); this.context = context; - properties = new DialogProperties(); + properties = new DialogProperties(context); filter = new ExtensionFilter(properties); internalList = new ArrayList<>(); initView(); diff --git a/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java b/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java index 19f6bd1..2ccf9c0 100644 --- a/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java +++ b/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java @@ -52,12 +52,12 @@ public class MaterialCheckbox extends Component implements Component.DrawTask, C int height = 50; int width = 50; minDim = Math.min(width, height); - bounds = new RectFloat(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); - tick.moveTo(minDim / 4, minDim / 2); - tick.lineTo(minDim / 2.5f, minDim - (minDim / 3)); + bounds = new RectFloat(minDim / 10f, minDim / 10f, minDim - (minDim / 10f), minDim - (minDim / 10f)); + tick.moveTo(minDim / 4f, minDim / 2f); + tick.lineTo(minDim / 2.5f, minDim - (minDim / 3f)); tick.moveTo(minDim / 2.75f, minDim - (minDim / 3.25f)); - tick.lineTo(minDim - (minDim / 4), minDim / 3); + tick.lineTo(minDim - (minDim / 4f), minDim / 3f); addDrawTask(this::onDraw); } @@ -66,23 +66,23 @@ public class MaterialCheckbox extends Component implements Component.DrawTask, C if (isChecked()) { paint.reset(); paint.setAntiAlias(true); - bounds = new RectFloat(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); + bounds = new RectFloat(minDim / 10f, minDim / 10f, minDim - (minDim / 10f), minDim - (minDim / 10f)); paint.setColor(Color.RED); - canvas.drawRoundRect(bounds, minDim / 8, minDim / 8, paint); + canvas.drawRoundRect(bounds, minDim / 8f, minDim / 8f, paint); paint.setColor(Color.WHITE); - paint.setStrokeWidth(minDim / 10); + paint.setStrokeWidth(minDim / 10f); paint.setStyle(Paint.Style.STROKE_STYLE); paint.setStrokeJoin(Paint.Join.BEVEL_JOIN); canvas.drawPath(tick, paint); } else { paint.reset(); paint.setAntiAlias(true); - bounds = new RectFloat(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); + bounds = new RectFloat(minDim / 10f, minDim / 10f, minDim - (minDim / 10f), minDim - (minDim / 10f)); paint.setColor(Color.GRAY); - canvas.drawRoundRect(bounds, minDim / 8, minDim / 8, paint); + canvas.drawRoundRect(bounds, minDim / 8f, minDim / 8f, paint); - bounds = new RectFloat(minDim / 5, minDim / 5, minDim - (minDim / 5), minDim - (minDim / 5)); + bounds = new RectFloat(minDim / 5f, minDim / 5f, minDim - (minDim / 5f), minDim - (minDim / 5f)); paint.setColor(Color.WHITE); canvas.drawRect(bounds, paint); } diff --git a/library/src/main/resources/rawfile/text.txt b/library/src/main/resources/rawfile/text.txt new file mode 100644 index 0000000..2bbc926 --- /dev/null +++ b/library/src/main/resources/rawfile/text.txt @@ -0,0 +1 @@ +/storage/emulated/0/Android/data/com.developer.filepicker.file \ No newline at end of file -- Gitee From 6b68f7b7865972cace4d7bbc64f6b5d6c6788523 Mon Sep 17 00:00:00 2001 From: 0000248716-lijiaxiao Date: Mon, 19 Jul 2021 16:11:15 +0800 Subject: [PATCH 2/4] 1.0.0 --- entry/src/main/resources/base/layout/ability_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml index 2353361..0033965 100644 --- a/entry/src/main/resources/base/layout/ability_main.xml +++ b/entry/src/main/resources/base/layout/ability_main.xml @@ -171,7 +171,7 @@ ohos:width="match_parent" ohos:orientation="horizontal" ohos:padding="10vp" - ohos:bottom_margin="20vp"> + ohos:bottom_margin="10vp"> Date: Wed, 21 Jul 2021 14:58:46 +0800 Subject: [PATCH 3/4] 1.0.0 --- build.gradle | 3 +++ entry/build.gradle | 14 ++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index bf479ca..8e7d5ed 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,9 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } jcenter() } } diff --git a/entry/build.gradle b/entry/build.gradle index 048a265..86b516b 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -13,24 +13,14 @@ ohos { } } } - signingConfigs { - debug { - storeFile file('D:/key/hoskey.p12') - storePassword '000000195D03C79E1B60E7F181253A65DFA7EE01BEB622BF1444686D52E534039B588E0D7E52EC8E63' - keyAlias 'hoskey' - keyPassword '000000190BCF3F182089EAD1D5B77FCFEDF7B2E99D1243455E4EF28FC73BF8F0773ABCB122B6B5CD9F' - signAlg 'SHA256withECDSA' - profile file('D:/key/filepickerDebug.p7b') - certpath file('D:/key/hoskey.cer') - } - } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' - compile project(":library") + implementation('com.gitee.chinasoft_ohos:SimpleRatingBar:0.0.1-SNAPSHOT') + // compile project(":library") } decc { supportType = ['html', 'xml'] -- Gitee From 92ff809ad6788c998b12bf5a6030baf8b7d7c644 Mon Sep 17 00:00:00 2001 From: 0000248716-lijiaxiao Date: Wed, 21 Jul 2021 14:59:50 +0800 Subject: [PATCH 4/4] 1.0.0 --- entry/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/build.gradle b/entry/build.gradle index 86b516b..500aacd 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' - implementation('com.gitee.chinasoft_ohos:SimpleRatingBar:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:FilePicker:0.0.1-SNAPSHOT') // compile project(":library") } decc { -- Gitee