diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1301f46b..a5857205 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -528,6 +528,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.alibaba.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "FlutterGO-alibaba-develop"; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -556,6 +557,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.alibaba.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = FlutterGO_alibaba_distribution_ad_hoc; + TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 949b6789..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - BuildSystemType - Original - - diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 1d41a4b7..9bb6ea54 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - Flutter Go + Flutter·Go CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.7 + 1.0.8 CFBundleSignature ???? CFBundleVersion - 107 + 108 LSRequiresIPhoneOS NSCameraUsageDescription diff --git a/lib/views/first_page/first_page.dart b/lib/views/first_page/first_page.dart deleted file mode 100644 index 714bed38..00000000 --- a/lib/views/first_page/first_page.dart +++ /dev/null @@ -1,138 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - -import 'package:flutter_go/components/list_view_item.dart'; -import 'package:flutter_go/components/list_refresh.dart' as listComp; -import 'package:flutter_go/components/pagination.dart'; -import 'package:flutter_go/views/first_page/first_page_item.dart'; -import 'package:flutter_go/components/disclaimer_msg.dart'; -import 'package:flutter_go/utils/net_utils.dart'; - -// ValueKey key; - -class FirstPage extends StatefulWidget { - @override - FirstPageState createState() => new FirstPageState(); -} - -class FirstPageState extends State with AutomaticKeepAliveClientMixin{ - Future _prefs = SharedPreferences.getInstance(); - Future _unKnow; - GlobalKey key; - - @override - bool get wantKeepAlive => true; - - - @override - void initState() { - super.initState(); - if (key == null) { - key = GlobalKey(); - // key = const Key('__RIKEY1__'); - //获取sharePre - _unKnow = _prefs.then((SharedPreferences prefs) { - return (prefs.getBool('disclaimer::Boolean') ?? false); - }); - - /// 判断是否需要弹出免责声明,已经勾选过不在显示,就不会主动弹 - _unKnow.then((bool value) { - new Future.delayed(const Duration(seconds: 1),(){ - if (!value && key.currentState is DisclaimerMsgState && key.currentState.showAlertDialog is Function) { - key.currentState.showAlertDialog(context); - } - }); - }); - } - } - - - Future getIndexListData([Map params]) async { - const juejin_flutter = 'https://timeline-merger-ms.juejin.im/v1/get_tag_entry?src=web&tagId=5a96291f6fb9a0535b535438'; - var pageIndex = (params is Map) ? params['pageIndex'] : 0; - final _param = {'page':pageIndex,'pageSize':20,'sort':'rankIndex'}; - var responseList = []; - var pageTotal = 0; - - try{ - var response = await NetUtils.get(juejin_flutter, params: _param); - responseList = response['d']['entrylist']; - pageTotal = response['d']['total']; - if (!(pageTotal is int) || pageTotal <= 0) { - pageTotal = 0; - } - }catch(e){ - - } - pageIndex += 1; - List resultList = new List(); - for (int i = 0; i < responseList.length; i++) { - try { - FirstPageItem cellData = new FirstPageItem.fromJson(responseList[i]); - resultList.add(cellData); - } catch (e) { - // No specified type, handles all - } - } - Map result = {"list":resultList, 'total':pageTotal, 'pageIndex':pageIndex}; - return result; - } - - Widget makeCard(index,item){ - - var myTitle = '${item.title}'; - var myUsername = '${'👲'}: ${item.username} '; - var codeUrl = '${item.detailUrl}'; - return new ListViewItem(itemUrl:codeUrl,itemTitle: myTitle,data: myUsername,); - } - - headerView(){ - return - Column( - children: [ - Stack( - //alignment: const FractionalOffset(0.9, 0.1),//方法一 - children: [ - Pagination(), - Positioned(//方法二 - top: 10.0, - left: 0.0, - child: DisclaimerMsg(key:key,pWidget:this) - ), - ]), - SizedBox(height: 1, child:Container(color: Theme.of(context).primaryColor)), - SizedBox(height: 10), - ], - ); - - } - - @override - Widget build(BuildContext context) { - super.build(context); - return new Column( - children: [ -// new Stack( -// //alignment: const FractionalOffset(0.9, 0.1),//方法一 -// children: [ -// Pagination(), -// Positioned(//方法二 -// top: 10.0, -// left: 0.0, -// child: DisclaimerMsg(key:key,pWidget:this) -// ), -// ]), -// SizedBox(height: 2, child:Container(color: Theme.of(context).primaryColor)), - new Expanded( - //child: new List(), - child: listComp.ListRefresh(getIndexListData,makeCard,headerView) - ) - ] - - ); - } -} - - diff --git a/lib/views/first_page/first_page_item.dart b/lib/views/first_page/first_page_item.dart deleted file mode 100644 index bef10315..00000000 --- a/lib/views/first_page/first_page_item.dart +++ /dev/null @@ -1,49 +0,0 @@ -/// Created with Android Studio. -/// User: 一晟 -/// Date: 2019/1/5 -/// Time: 下午10:20 -/// email: zhu.yan@alibaba-inc.com -/// target: FirstPageItem - -import 'package:flutter_go/utils/util.dart'; - -class FirstPageItem { - bool hot; - String isCollection; - String tag; - String username; - int collectionCount; - int commentCount; - String title; - String createdTime; - String detailUrl; - - FirstPageItem( - {this.hot, - this.tag, - this.username, - this.collectionCount, - this.createdTime, - this.commentCount, - this.title, - this.detailUrl, - this.isCollection}); - - factory FirstPageItem.fromJson(Map json) { - String _tag = ''; - if(json['tags'].length>0){ - _tag = '${json['tags'][0]['title']}/'; - } - return FirstPageItem( - hot: json['hot'], - collectionCount: json['collectionCount'], - commentCount: json['commentsCount'], - tag: '$_tag${json['category']['name']}', - username: json['user']['username'], - createdTime: Util.getTimeDuration(json['createdAt']), - title: json['title'], - detailUrl: json['originalUrl'], - isCollection: json['type'] , - ); - } -} \ No newline at end of file