From 094d7146afde1ba7e13b851260d9ec682185a38a Mon Sep 17 00:00:00 2001
From: xuechangfeng <963779172@qq.com>
Date: Tue, 29 Jun 2021 19:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                | 105 +++++++++++----------------------------
 app/src/main/config.json |   5 --
 build.gradle             |  11 ----
 3 files changed, 29 insertions(+), 92 deletions(-)

diff --git a/README.md b/README.md
index df97378..5bc186d 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 #### 项目介绍
 - 项目名称：chips-input-layout
 - 所属系列：openharmony的第三方组件适配移植
-- 功能：使用库（Glide、Picasso...）加载芯片头像,在用户输入文本时过滤筹码,允许用户创建自定义芯片,指定筹码是否显示详细信息、可删除或具有头像,指定如何在内存中管理/存储芯片
+- 功能：允许用户在输入的时候过滤chip,允许用户输入自定义chip,可以指定chip是否显示详情，是否可以删除，是否有头像,可以指定chip是如何在memory中管理或者存储的,ChipsInputView对选中的chip进行验证,大多数view都是高度可自定义的
 - 项目移植状态：主功能完成
 - 调用差异：无
-- 开发版本：sdk6，DevEco Studio 2.2 Beta2
+- 开发版本：sdk6，DevEco Studio 2.2 Beta1
 - 基线版本：Release 2.3
 
 #### 效果演示
@@ -27,12 +27,12 @@ allprojects {
 2.在entry模块的build.gradle文件中，
  ```gradle
  dependencies {
-    implementation('com.gitee.chinasoft_ohos:ExpandableTextView:0.0.1-SNAPSHOT')
+    implementation('com.gitee.chinasoft_ohos:chips-input-layout:0.0.1-SNAPSHOT')
     ......  
  }
 ```
 
-在sdk6，DevEco Studio 2.2 Beta2下项目可直接运行
+在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行
 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件，
 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
 
@@ -40,66 +40,36 @@ allprojects {
 
 使用该库非常简单，只需查看提供的示例的源代码。（查看ViewCreateHelper.java中在ScrollView和ListContainer中的使用）
 ```示例XML
-<com.ms.square.ohos.expandabletextview.ExpandableTextView
-
-        ohos:id="$+id:expandable"
-        ohos:height="match_content"
-        ohos:width="match_parent"
-        ohos:orientation="vertical"
-        app:animAlphaStart="0.7"
-        app:animDuration="300"
-        app:collapseIndicator="$media:ic_expand_less_black_12dp"
-        app:expandIndicator="$media:ic_expand_more_black_12dp"
-        app:expandToggleOnTextClick="true"
-        app:expandToggleType="$integer:ImageButton"
-        app:mExpandCollapseToggleId="$string:ExpandCollapseToggleId"
-        app:mExpandableTextId="$string:ExpandableTextId"
-        app:maxCollapsedLines="4">
-
-        <Text
-            ohos:id="$+id:expandable_text"
-            ohos:height="match_content"
+    <ScrollView
+            ohos:id="$+id:id_scrollview"
+            ohos:height="match_parent"
             ohos:width="match_parent"
-            ohos:component_description="$string:ExpandableTextId"
-            ohos:layout_alignment="horizontal_center"
-            ohos:left_margin="10vp"
-            ohos:multiple_lines="true"
-            ohos:right_margin="10vp"
-            ohos:text="$string:dummy_text2"
-            ohos:text_alignment="left"
-            ohos:text_color="#666666"
-            ohos:text_font="sans-serif-light"
-            ohos:text_size="16vp"
-            ohos:top_margin="8vp"/>
-
-        <Image
-            ohos:id="$+id:expand_collapse"
-            ohos:height="match_content"
-            ohos:width="match_content"
-            ohos:background_element="$ohos:graphic:button_bg_transparent"
-            ohos:component_description="$string:ExpandCollapseToggleId"
-            ohos:image_src="$media:ic_expand_more_black_12dp"
-            ohos:layout_alignment="right"
-            ohos:right_margin="20vp"
-            ohos:top_margin="20vp"/>
-    </com.ms.square.ohos.expandabletextview.ExpandableTextView>
+            ohos:left_padding="10vp"
+            ohos:right_padding="10vp">
+
+            <DirectionalLayout
+                ohos:height="match_parent"
+                ohos:width="match_parent"
+                ohos:orientation="vertical"
+                ohos:top_margin="20vp">
+
+                <com.tylersuehr.chips.FlowLayout
+                    ohos:id="$+id:id_first_flowlayout"
+                    ohos:height="match_parent"
+                    ohos:width="match_parent"
+                    ohos:right_margin="20vp"
+                    app:flChildSpacing="20"
+                    app:flChildSpacingForLastRow="align"
+                    app:flRowSpacing="32.0f"/>
+
+            </DirectionalLayout>
+        </ScrollView>
 ```
 
 ```java
-ExpandableTextView expandableTextView = (ExpandableTextView)
-                            component.findComponentById(ResourceTable.Id_expandable);
-expandableTextView.setText(slice.getString(ResourceTable.String_dummy_text2));
+        mFirstFlowLayout = (FlowLayout) findComponentById(ResourceTable.Id_id_first_flowlayout);
+        mFirstFlowLayout.setListener(this);
 ```
-另外，您可以选择在布局xml文件中设置以下属性，以自定义ExpandableTextView的行为。
-1. maxCollapsedLines （默认为8）当TextView折叠时允许显示的最大文本行数
-
-2. animDuration （默认为300毫秒）扩展/折叠动画的持续时间
-
-3. animAlphaStart （默认值为0.7f）动画开始时TextView的Alpha值（注意）如果要禁用Alpha动画，请将此值设置为1。
-
-4. expandDrawable 自定义一个可绘制的设置为ImageButton以展开TextView
-
-5. collapseDrawable 自定义一个可绘制的设置为ImageButton以折叠TextView
 
 #### 测试信息
 
@@ -114,20 +84,3 @@ CloudTest代码测试无异常
 #### 版本迭代
 
 - 0.0.1-SNAPSHOT
-
-#### 版权和许可信息
- ```
-Copyright 2017 wuhenzhizao
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- ```
\ No newline at end of file
diff --git a/app/src/main/config.json b/app/src/main/config.json
index 2baf3fc..30291e4 100644
--- a/app/src/main/config.json
+++ b/app/src/main/config.json
@@ -5,11 +5,6 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 5,
-      "target": 5,
-      "releaseType": "Release"
     }
   },
   "deviceConfig": {},
diff --git a/build.gradle b/build.gradle
index b65c473..d3c9f1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,17 +2,6 @@
 apply plugin: 'com.huawei.ohos.app'
 
 ohos {
-    signingConfigs {
-        debug {
-            storeFile file('D:\\svn\\hongmeng\\trunk\\keyStore\\ActivityRouter\\root_1.p12')
-            storePassword '00000020879452DAE791DF7810337911EE7122AA0B49D38A2E275CBBF4F1D13E0C5974281CB0E8A4673968BE2E58EECC'
-            keyAlias = 'hos_platform_os'
-            keyPassword '00000020FE8A6B86A90DC31747CA6E81C9777F878066C8B13311831C3A8A3290DED9B8D2F369FCC063E2A575AC863020'
-            signAlg = 'SHA256withECDSA'
-            profile file('D:\\svn\\hongmeng\\trunk\\签名文件\\六月份组件签名\\chips-input-layoutDebug.p7b')
-            certpath file('D:\\svn\\hongmeng\\trunk\\keyStore\\ActivityRouter\\root.cer')
-        }
-    }
     compileSdkVersion 5
     defaultConfig {
         compatibleSdkVersion 5
-- 
Gitee