From ce09adb0df65fcf88604aa239e06b3a09f45357a Mon Sep 17 00:00:00 2001 From: wang zhen Date: Fri, 30 Jul 2021 11:37:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2560c4b..6279d1b 100644 --- a/README.md +++ b/README.md @@ -85,4 +85,25 @@ CloudTest代码测试无异常 #### 版权和许可信息 -* MIT License +* The MIT License (MIT) + + +Copyright (c) 2016 android-cjj + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- Gitee From 6a841b32fcfb133f4f746a358c9e368246e9ccef Mon Sep 17 00:00:00 2001 From: wang zhen Date: Fri, 30 Jul 2021 17:44:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.OPENSOURCE | 2 +- README.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.OPENSOURCE b/README.OPENSOURCE index 486ffd3..b05c567 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -8,7 +8,7 @@ "License File": "LICENSE", - "Version Number": "master", + "Version Number": "master分支", "Upstream URL": "https://github.com/android-cjj/JJSearchViewAnim", diff --git a/README.md b/README.md index 6279d1b..38a2953 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,15 @@ - 项目名称：JJSearchViewAnim - 所属系列：openharmony第三方组件适配移植 -- 功能：一个炫酷的SearchView搜索动画库。 +- 功能：一个炫酷的SearchView搜索动画库,支持8中不同的动画。 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk6，DevEco Studio2.2 Beta1 -- 基线版本：master +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 +- 基线版本：master分支 -#### 演示效果 +#### 效果演示

@@ -41,7 +41,7 @@ implementation('com.gitee.chinasoft_ohos:JJSearchViewAnim:0.0.1-SNAPSHOT') } ``` -在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 +在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 -- Gitee From ea62e048eecdc90f0c0d6e589fb45bcac7793c91 Mon Sep 17 00:00:00 2001 From: wang zhen Date: Sat, 31 Jul 2021 09:34:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- .../com/cjj/jjsearchviewanim/MainAbility.java | 31 ++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 38a2953..a21fa54 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ CloudTest代码测试无异常 #### 版权和许可信息 * The MIT License (MIT) - +``` Copyright (c) 2016 android-cjj @@ -107,3 +107,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` \ No newline at end of file diff --git a/entry/src/main/java/com/cjj/jjsearchviewanim/MainAbility.java b/entry/src/main/java/com/cjj/jjsearchviewanim/MainAbility.java index a9515c8..c71a847 100644 --- a/entry/src/main/java/com/cjj/jjsearchviewanim/MainAbility.java +++ b/entry/src/main/java/com/cjj/jjsearchviewanim/MainAbility.java @@ -1,4 +1,5 @@ package com.cjj.jjsearchviewanim; + import com.cjj.sva.JJSearchView; import com.cjj.sva.anim.controller.*; import ohos.aafwk.ability.Ability; @@ -13,11 +14,12 @@ import ohos.app.Context; import java.util.ArrayList; import java.util.List; -public class MainAbility extends Ability implements Component.ClickedListener { - JJSearchView mJJSearchView; +public class MainAbility extends Ability implements Component.ClickedListener { + private JJSearchView mJJSearchView; private static String action = ""; -MenuDialog inputDialog; - Component textSetting; + private MenuDialog inputDialog; + private Component textSetting; + @Override public void onStart(Intent intent) { super.onStart(intent); @@ -33,6 +35,7 @@ MenuDialog inputDialog; textSetting.setClickedListener(this); } + private void start() { mJJSearchView.startAnim(); @@ -97,7 +100,7 @@ MenuDialog inputDialog; } - static class MenuDialog extends PopupDialog { + private static class MenuDialog extends PopupDialog { private final ArrayList list = new ArrayList<>(); private MenuDialog.onClickListener onClickListener; @@ -109,8 +112,8 @@ MenuDialog inputDialog; int dialogHeight = AttrHelper.vp2px(300f, context); setSize(dialogWidth, dialogHeight); setCornerRadius(10f); - int offWidth=width-dialogWidth; - setOffset(offWidth -AttrHelper.vp2px(5f, context), AttrHelper.vp2px(56f, context)); + int offWidth = width - dialogWidth; + setOffset(offWidth - AttrHelper.vp2px(5f, context), AttrHelper.vp2px(56f, context)); } @@ -128,7 +131,7 @@ MenuDialog inputDialog; list.add("JJCircleToBarController"); list.add("JJCircleToSimpleLineController"); this.setTransparent(false); - MenuDialog.Menu inputView = new MenuDialog.Menu(context); + MenuDialog.Menu inputView = new MenuDialog.Menu(context); setCustomComponent(inputView); ListContainer listContainer1 = (ListContainer) inputView.findComponentById(ResourceTable.Id_list); MenuDialog.MenuProvider menuProvider = new MenuDialog.MenuProvider(list, context); @@ -137,21 +140,21 @@ MenuDialog inputDialog; listContainer1.setItemClickedListener((listContainer, component, i, l) -> { switch (i) { case 0: - action = "action7"; + action = "action7"; break; case 1: - action = "action1"; + action = "action1"; break; case 2: - action = "action2"; + action = "action2"; break; case 3: - action = "action8"; + action = "action8"; break; case 4: - action = "action3"; + action = "action3"; break; case 5: action = "action5"; @@ -178,7 +181,7 @@ MenuDialog inputDialog; * @author wz * @since 2021-06-28 */ - static class Menu extends DirectionalLayout { + private static class Menu extends DirectionalLayout { Menu(Context context) { super(context); setupComponent(context); -- Gitee From 1b566ea8ad2ec7813b674b2e991f901894da2f7f Mon Sep 17 00:00:00 2001 From: wang zhen Date: Sat, 31 Jul 2021 09:38:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a21fa54..ace1b73 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ CloudTest代码测试无异常 #### 版权和许可信息 -* The MIT License (MIT) +The MIT License (MIT) ``` Copyright (c) 2016 android-cjj -- Gitee From f8923e6d1b923717c629e220585100b2b60fb925 Mon Sep 17 00:00:00 2001 From: wang zhen Date: Sat, 31 Jul 2021 09:39:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ace1b73..cae7d23 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,8 @@ CloudTest代码测试无异常 0.0.1-SNAPSHOT #### 版权和许可信息 - -The MIT License (MIT) ``` +The MIT License (MIT) Copyright (c) 2016 android-cjj -- Gitee