diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 58ec73b3..2e34181c 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -846,7 +846,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 25;
+ CURRENT_PROJECT_VERSION = 26;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -881,7 +881,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
- MARKETING_VERSION = 1.0.25;
+ MARKETING_VERSION = 1.0.26;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -1046,7 +1046,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 25;
+ CURRENT_PROJECT_VERSION = 26;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -1081,7 +1081,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
- MARKETING_VERSION = 1.0.25;
+ MARKETING_VERSION = 1.0.26;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -1139,7 +1139,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 25;
+ CURRENT_PROJECT_VERSION = 26;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -1174,7 +1174,7 @@
"$(PROJECT_DIR)/UniMPSDK/Libs",
"$(PROJECT_DIR)/wx/Libs",
);
- MARKETING_VERSION = 1.0.25;
+ MARKETING_VERSION = 1.0.26;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index fb2dffc4..39e20baf 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -81,7 +81,7 @@
buildConfiguration = "Debug">
diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index 6a4a4efb..bf84a2b6 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -110,7 +110,6 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin {
.map((e) => Brand.fromJson(e))
.toList());
founder = Founder.fromJson(brand.data["founder"]);
- setState(() {});
}
BaseData article = await apiService.queryArticle({
@@ -139,7 +138,6 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin {
PageInfo page = PageInfo.fromJson(goodsData.data);
gooods.clear();
gooods.addAll(page.list.map((e) => Goods.fromJson(e)));
- setState(() {});
}
SmartDialog.dismiss();
if (baseData != null && baseData.isSuccess) {
@@ -331,21 +329,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin {
child: HotArticleItem(article: articles[position]),
),
);
- }),
- // child: Swiper(
- // key: UniqueKey(),
- // itemCount: articles != null ? articles.length : 0,
- // viewportFraction: 0.8,
- // scale: 1,
- // loop: false,
- // physics: BouncingScrollPhysics(),
- // itemBuilder: (context, position) {
- // return Container(
- // margin: EdgeInsets.symmetric(vertical: 15.h, horizontal: 4.5.w),
- // child: HotArticleItem(article: articles[position]),
- // );
- // },
- // ),
+ },),
);
}
@@ -466,7 +450,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin {
//垂直子Widget之间间距
mainAxisSpacing: 16,
//子Widget宽高比例
- childAspectRatio: 1 - (AppUtils.textScale(context) - 1),
+ childAspectRatio: AppUtils.textScale(context) > 1 ? (1 - ((AppUtils.textScale(context) - 1))) : 0.85,
),
itemBuilder: (contetx, index) {
return GestureDetector(
diff --git a/lib/view_widget/hot_item.dart b/lib/view_widget/hot_item.dart
index 49729128..88352f52 100644
--- a/lib/view_widget/hot_item.dart
+++ b/lib/view_widget/hot_item.dart
@@ -119,13 +119,6 @@ class HotArticleItem extends StatelessWidget {
iconSize: 10,
iconColor: Color(0xFFB2B2B2),
),
- // SizedBox(width: 8,),
- // Image.asset(
- // "assets/image/icon_zan.png",
- // width: 14.w,
- // height: 14.h,
- // ),
- // Text("58",style: TextStyle(fontSize:10,color:Color(0xffB9B9B9)),)
],
),
flex: 1,
diff --git a/pubspec.lock b/pubspec.lock
index f02aa419..00e92515 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -56,7 +56,7 @@ packages:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.6.1"
+ version: "2.5.0"
barcode:
dependency: transitive
description:
@@ -879,7 +879,7 @@ packages:
name: test_api
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.3.0"
+ version: "0.2.19"
timing:
dependency: transitive
description:
@@ -1042,7 +1042,7 @@ packages:
name: win32
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.2.5"
+ version: "2.0.5"
xdg_directories:
dependency: transitive
description:
@@ -1065,5 +1065,5 @@ packages:
source: hosted
version: "3.1.0"
sdks:
- dart: ">=2.13.0 <3.0.0"
+ dart: ">=2.12.0 <3.0.0"
flutter: ">=2.0.0"