From bfa557e9947d56cbe3c85f4cd5c0dc42f54d48b0 Mon Sep 17 00:00:00 2001
From: zxd191990 <1713664308@qq.com>
Date: Fri, 23 Apr 2021 17:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                           |   2 +-
 entry/build.gradle                                  |   2 +-
 entry/src/main/config.json                          |  11 +++++++----
 .../expandabletextview/sample}/MainAbility.java     |   4 ++--
 .../expandabletextview/sample}/MyApplication.java   |   2 +-
 .../sample}/adapter/ListAdapter.java                |   2 +-
 .../sample}/adapter/MainPagerAdapter.java           |   2 +-
 .../sample}/adapter/ViewHolder.java                 |   5 ++++-
 .../sample}/slice/MainAbilitySlice.java             |   8 ++++----
 .../expandabletextview/sample}/utils/MyToast.java   |   2 +-
 .../sample}/utils/ViewCreateHelper.java             |   8 ++++----
 entry/src/ohosTest/config.json                      |   2 +-
 {library => lib}/.gitignore                         |   0
 {library => lib}/build.gradle                       |   0
 {library => lib}/src/main/config.json               |   2 +-
 .../expandabletextview/ExpandableTextView.java      |   9 ++++++++-
 .../android/expandabletextview/TypedAttrUtils.java  |   0
 .../src/main/resources/base/element/string.json     |   0
 .../base/media/ic_expand_less_black_12dp.png        | Bin
 .../base/media/ic_expand_less_black_16dp.png        | Bin
 .../base/media/ic_expand_more_black_12dp.png        | Bin
 .../base/media/ic_expand_more_black_16dp.png        | Bin
 settings.gradle                                     |   2 +-
 23 files changed, 38 insertions(+), 25 deletions(-)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/MainAbility.java (88%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/MyApplication.java (93%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/adapter/ListAdapter.java (96%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/adapter/MainPagerAdapter.java (96%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/adapter/ViewHolder.java (91%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/slice/MainAbilitySlice.java (94%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/utils/MyToast.java (98%)
 rename entry/src/main/java/com/{hos/expandabletextview => ms/square/android/expandabletextview/sample}/utils/ViewCreateHelper.java (96%)
 rename {library => lib}/.gitignore (100%)
 rename {library => lib}/build.gradle (100%)
 rename {library => lib}/src/main/config.json (95%)
 rename {library => lib}/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java (97%)
 rename {library => lib}/src/main/java/com/ms/square/android/expandabletextview/TypedAttrUtils.java (100%)
 rename {library => lib}/src/main/resources/base/element/string.json (100%)
 rename {library => lib}/src/main/resources/base/media/ic_expand_less_black_12dp.png (100%)
 rename {library => lib}/src/main/resources/base/media/ic_expand_less_black_16dp.png (100%)
 rename {library => lib}/src/main/resources/base/media/ic_expand_more_black_12dp.png (100%)
 rename {library => lib}/src/main/resources/base/media/ic_expand_more_black_16dp.png (100%)

diff --git a/README.md b/README.md
index 26b54ee..0e83d56 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ CloudTest代码测试无异常
 
 火绒安全病毒安全检测通过
 
-当前版本demo功能与安卓原组件基本无差异
+当前版本demo功能与原组件基本无差异
 
 测试员：石凯月
 
diff --git a/entry/build.gradle b/entry/build.gradle
index 4296418..d030f35 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -20,7 +20,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 project(path: ':library')
+    implementation project(path: ':lib')
 }
 decc {
     supportType = ['html', 'xml']
diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index f309cd4..b031026 100644
--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "com.hos.expandabletextview",
+    "bundleName": "com.ms.square.android.expandabletextview.sample",
     "vendor": "hos",
     "version": {
       "code": 1,
@@ -14,7 +14,7 @@
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.hos.expandabletextview",
+    "package": "com.ms.square.android.expandabletextview.sample",
     "name": ".MyApplication",
     "deviceType": [
       "phone"
@@ -46,12 +46,15 @@
           }
         ],
         "orientation": "unspecified",
-        "name": "com.hos.expandabletextview.MainAbility",
+        "name": "com.ms.square.android.expandabletextview.sample.MainAbility",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:app_name",
         "type": "page",
-        "launchType": "standard"
+        "launchType": "standard",
+        "configChanges": [
+          "orientation"
+        ]
       }
     ],
     "reqPermissions": [
diff --git a/entry/src/main/java/com/hos/expandabletextview/MainAbility.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/MainAbility.java
similarity index 88%
rename from entry/src/main/java/com/hos/expandabletextview/MainAbility.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/MainAbility.java
index add3804..81c0168 100644
--- a/entry/src/main/java/com/hos/expandabletextview/MainAbility.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/MainAbility.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hos.expandabletextview;
+package com.ms.square.android.expandabletextview.sample;
 
-import com.hos.expandabletextview.slice.MainAbilitySlice;
+import com.ms.square.android.expandabletextview.sample.slice.MainAbilitySlice;
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.content.Intent;
 import ohos.agp.components.ComponentContainer;
diff --git a/entry/src/main/java/com/hos/expandabletextview/MyApplication.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/MyApplication.java
similarity index 93%
rename from entry/src/main/java/com/hos/expandabletextview/MyApplication.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/MyApplication.java
index 0669feb..a275f5f 100644
--- a/entry/src/main/java/com/hos/expandabletextview/MyApplication.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/MyApplication.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hos.expandabletextview;
+package com.ms.square.android.expandabletextview.sample;
 
 import ohos.aafwk.ability.AbilityPackage;
 
diff --git a/entry/src/main/java/com/hos/expandabletextview/adapter/ListAdapter.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ListAdapter.java
similarity index 96%
rename from entry/src/main/java/com/hos/expandabletextview/adapter/ListAdapter.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ListAdapter.java
index 83c231e..6c3eec5 100644
--- a/entry/src/main/java/com/hos/expandabletextview/adapter/ListAdapter.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ListAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.hos.expandabletextview.adapter;
+package com.ms.square.android.expandabletextview.sample.adapter;
 
 import ohos.agp.components.BaseItemProvider;
 import ohos.agp.components.Component;
diff --git a/entry/src/main/java/com/hos/expandabletextview/adapter/MainPagerAdapter.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/MainPagerAdapter.java
similarity index 96%
rename from entry/src/main/java/com/hos/expandabletextview/adapter/MainPagerAdapter.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/MainPagerAdapter.java
index 653ba28..2b410da 100644
--- a/entry/src/main/java/com/hos/expandabletextview/adapter/MainPagerAdapter.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/MainPagerAdapter.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.hos.expandabletextview.adapter;
+package com.ms.square.android.expandabletextview.sample.adapter;
 
 import ohos.agp.components.Component;
 import ohos.agp.components.ComponentContainer;
diff --git a/entry/src/main/java/com/hos/expandabletextview/adapter/ViewHolder.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ViewHolder.java
similarity index 91%
rename from entry/src/main/java/com/hos/expandabletextview/adapter/ViewHolder.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ViewHolder.java
index c2c08f6..302337f 100644
--- a/entry/src/main/java/com/hos/expandabletextview/adapter/ViewHolder.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/adapter/ViewHolder.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hos.expandabletextview.adapter;
+package com.ms.square.android.expandabletextview.sample.adapter;
 
 import ohos.agp.components.Component;
 import ohos.agp.components.ComponentContainer;
@@ -29,10 +29,13 @@ import java.util.HashMap;
  */
 public class ViewHolder {
     int position;
+    int layoutId;
     private Component component;
+    private Context context;
     private HashMap<Integer, Component> views;
 
     ViewHolder(Context context, Component itemView, ComponentContainer parent, int position) {
+        this.context = context;
         this.component = itemView;
         this.position = position;
         views = new HashMap<>(0);
diff --git a/entry/src/main/java/com/hos/expandabletextview/slice/MainAbilitySlice.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/slice/MainAbilitySlice.java
similarity index 94%
rename from entry/src/main/java/com/hos/expandabletextview/slice/MainAbilitySlice.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/slice/MainAbilitySlice.java
index 86f6c89..ef787ba 100644
--- a/entry/src/main/java/com/hos/expandabletextview/slice/MainAbilitySlice.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/slice/MainAbilitySlice.java
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package com.hos.expandabletextview.slice;
+package com.ms.square.android.expandabletextview.sample.slice;
 
-import com.hos.expandabletextview.ResourceTable;
-import com.hos.expandabletextview.adapter.MainPagerAdapter;
-import com.hos.expandabletextview.utils.ViewCreateHelper;
+import com.ms.square.android.expandabletextview.sample.ResourceTable;
+import com.ms.square.android.expandabletextview.sample.adapter.MainPagerAdapter;
+import com.ms.square.android.expandabletextview.sample.utils.ViewCreateHelper;
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
 import ohos.agp.colors.RgbColor;
diff --git a/entry/src/main/java/com/hos/expandabletextview/utils/MyToast.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/MyToast.java
similarity index 98%
rename from entry/src/main/java/com/hos/expandabletextview/utils/MyToast.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/MyToast.java
index 7008bd7..62be263 100644
--- a/entry/src/main/java/com/hos/expandabletextview/utils/MyToast.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/MyToast.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hos.expandabletextview.utils;
+package com.ms.square.android.expandabletextview.sample.utils;
 
 import ohos.agp.colors.RgbColor;
 import ohos.agp.components.DirectionalLayout;
diff --git a/entry/src/main/java/com/hos/expandabletextview/utils/ViewCreateHelper.java b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/ViewCreateHelper.java
similarity index 96%
rename from entry/src/main/java/com/hos/expandabletextview/utils/ViewCreateHelper.java
rename to entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/ViewCreateHelper.java
index a421160..f6a6a00 100644
--- a/entry/src/main/java/com/hos/expandabletextview/utils/ViewCreateHelper.java
+++ b/entry/src/main/java/com/ms/square/android/expandabletextview/sample/utils/ViewCreateHelper.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hos.expandabletextview.utils;
+package com.ms.square.android.expandabletextview.sample.utils;
 
-import com.hos.expandabletextview.ResourceTable;
-import com.hos.expandabletextview.adapter.ListAdapter;
-import com.hos.expandabletextview.adapter.ViewHolder;
 import com.ms.square.android.expandabletextview.ExpandableTextView;
+import com.ms.square.android.expandabletextview.sample.ResourceTable;
+import com.ms.square.android.expandabletextview.sample.adapter.ListAdapter;
+import com.ms.square.android.expandabletextview.sample.adapter.ViewHolder;
 import ohos.agp.components.*;
 import ohos.agp.render.Paint;
 import ohos.app.Context;
diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json
index 2dbab6d..1641abf 100644
--- a/entry/src/ohosTest/config.json
+++ b/entry/src/ohosTest/config.json
@@ -7,7 +7,7 @@
       "name": "1.0"
     },
     "apiVersion": {
-      "compatible": 4,
+      "compatible": 5,
       "target": 5,
       "releaseType": "Beta1"
     }
diff --git a/library/.gitignore b/lib/.gitignore
similarity index 100%
rename from library/.gitignore
rename to lib/.gitignore
diff --git a/library/build.gradle b/lib/build.gradle
similarity index 100%
rename from library/build.gradle
rename to lib/build.gradle
diff --git a/library/src/main/config.json b/lib/src/main/config.json
similarity index 95%
rename from library/src/main/config.json
rename to lib/src/main/config.json
index 8e64906..882e1c9 100644
--- a/library/src/main/config.json
+++ b/lib/src/main/config.json
@@ -20,7 +20,7 @@
     ],
     "distro": {
       "deliveryWithInstall": true,
-      "moduleName": "library",
+      "moduleName": "lib",
       "moduleType": "har"
     }
   },
diff --git a/library/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java b/lib/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
similarity index 97%
rename from library/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
rename to lib/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
index 913e205..da40c86 100644
--- a/library/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
+++ b/lib/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
@@ -22,6 +22,7 @@ import ohos.agp.components.*;
 import ohos.agp.components.element.PixelMapElement;
 import ohos.agp.render.Canvas;
 import ohos.agp.render.Paint;
+import ohos.agp.text.SimpleTextLayout;
 import ohos.app.Context;
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
@@ -115,6 +116,7 @@ public class ExpandableTextView extends DirectionalLayout implements
     private int mPosition;
     private int mStartHeight;
     private int expendTextHeight;
+    private Context context;
 
     /**
      * 构造函数
@@ -133,6 +135,7 @@ public class ExpandableTextView extends DirectionalLayout implements
      */
     public ExpandableTextView(Context context, AttrSet attrSet) {
         super(context, attrSet);
+        this.context = context;
         init(attrSet);
     }
 
@@ -315,7 +318,7 @@ public class ExpandableTextView extends DirectionalLayout implements
 
     }
 
-    private static int getRealTextViewHeight(Text textView) {
+    private int getRealTextViewHeight(Text textView) {
         int textHeight = textView.getHeight();
         int padding = textView.getPaddingTop() + textView.getPaddingBottom();
         return textHeight + padding;
@@ -532,6 +535,10 @@ public class ExpandableTextView extends DirectionalLayout implements
      * @param text 文案内容
      */
     public void setText(String text) {
+        Paint paint = new Paint();
+        ohos.agp.utils.Rect rect = new ohos.agp.utils.Rect(00,0,50,50);
+        SimpleTextLayout simpleTextLayout = new SimpleTextLayout(text, paint, rect, 100);
+        HiLog.debug(logLabel, "test" + simpleTextLayout.getLineCount());
         mRelayout = true;
         findViews();
         expandText.setText(text);
diff --git a/library/src/main/java/com/ms/square/android/expandabletextview/TypedAttrUtils.java b/lib/src/main/java/com/ms/square/android/expandabletextview/TypedAttrUtils.java
similarity index 100%
rename from library/src/main/java/com/ms/square/android/expandabletextview/TypedAttrUtils.java
rename to lib/src/main/java/com/ms/square/android/expandabletextview/TypedAttrUtils.java
diff --git a/library/src/main/resources/base/element/string.json b/lib/src/main/resources/base/element/string.json
similarity index 100%
rename from library/src/main/resources/base/element/string.json
rename to lib/src/main/resources/base/element/string.json
diff --git a/library/src/main/resources/base/media/ic_expand_less_black_12dp.png b/lib/src/main/resources/base/media/ic_expand_less_black_12dp.png
similarity index 100%
rename from library/src/main/resources/base/media/ic_expand_less_black_12dp.png
rename to lib/src/main/resources/base/media/ic_expand_less_black_12dp.png
diff --git a/library/src/main/resources/base/media/ic_expand_less_black_16dp.png b/lib/src/main/resources/base/media/ic_expand_less_black_16dp.png
similarity index 100%
rename from library/src/main/resources/base/media/ic_expand_less_black_16dp.png
rename to lib/src/main/resources/base/media/ic_expand_less_black_16dp.png
diff --git a/library/src/main/resources/base/media/ic_expand_more_black_12dp.png b/lib/src/main/resources/base/media/ic_expand_more_black_12dp.png
similarity index 100%
rename from library/src/main/resources/base/media/ic_expand_more_black_12dp.png
rename to lib/src/main/resources/base/media/ic_expand_more_black_12dp.png
diff --git a/library/src/main/resources/base/media/ic_expand_more_black_16dp.png b/lib/src/main/resources/base/media/ic_expand_more_black_16dp.png
similarity index 100%
rename from library/src/main/resources/base/media/ic_expand_more_black_16dp.png
rename to lib/src/main/resources/base/media/ic_expand_more_black_16dp.png
diff --git a/settings.gradle b/settings.gradle
index 87cd12d..4f47b2b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':entry',':library'
+include ':entry',':lib'
-- 
Gitee