Merge pull request #176 from mgz0227/dev_2008

新版订阅源页面
mgz0227 · Jul 11, 2024 · 499ab96 · 499ab96
2 parents 2a1ae65 + cd04f70
commit 499ab96
Show file tree

Hide file tree

Showing 24 changed files with 679 additions and 2 deletions.
diff --git a/commons/colorLibrary/src/main/resources/base/media/bilibili.jpg b/commons/colorLibrary/src/main/resources/base/media/bilibili.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_17k.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_17k.jpg
diff --git a/...s/colorLibrary/src/main/resources/base/media/icon_subscription_bosom_friend.jpg b/...s/colorLibrary/src/main/resources/base/media/icon_subscription_bosom_friend.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_college.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_college.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_dongman.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_dongman.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_feilu.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_feilu.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_index.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_index.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_inn.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_inn.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_jinjiang.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_jinjiang.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_lazy.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_lazy.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_motie.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_motie.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_podo.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_podo.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_qq.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_qq.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_quick_see.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_quick_see.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_red.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_red.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_shuqi.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_shuqi.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_start.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_start.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_tencent.svg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_tencent.svg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_xigua.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_xigua.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_yanyan.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_yanyan.jpg
diff --git a/commons/colorLibrary/src/main/resources/base/media/icon_subscription_zongheng.jpg b/commons/colorLibrary/src/main/resources/base/media/icon_subscription_zongheng.jpg
diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets
@@ -215,7 +215,9 @@ export default class CommonConstants {
   /**
    * space间距
    */
+  static readonly SPACE_6: number = 6;
   static readonly SPACE_10: number = 10;
+  static readonly SPACE_12: number = 12;
   static readonly SPACE_20: number = 20;
 
   /**
@@ -248,4 +250,12 @@ export default class CommonConstants {
    * 字体样式
    */
   static readonly FAMILY_PingFANG: string = 'PingFang SC'
+
+  /**
+   * 通用宽高
+   */
+  static readonly COMMON_WIDTH_45_36: number = 45.36;
+  static readonly COMMON_HEIGHT_21_6: number = 21.6;
+  static readonly COMMON_WIDTH_40: number = 40;
+  static readonly COMMON_HEIGHT_40: number = 40;
 }
diff --git a/entry/src/main/ets/pages/view/Subscription.ets b/entry/src/main/ets/pages/view/Subscription.ets
@@ -1,12 +1,12 @@
 import IndexSubscription from './Subscription/IndexSubscription'
+import SubscriptionIndex from './Subscription/SubscriptionIndex'
 
 @Component
 export default struct Subscription {
   @State subscription: string = '订阅源'
   build(){
     Column(){
-      Blank(20)
-      IndexSubscription()
+      SubscriptionIndex()
     }
     .backgroundColor('F3F4F8')
   }