diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4da84c53..2b500e72 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -32,6 +32,16 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + FA240D7922F2857D003025F3 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0115F22F1B9DF0016E673 /* Flutter.framework */; }; + FA240D7A22F2857D003025F3 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0115F22F1B9DF0016E673 /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + FA240D7B22F28581003025F3 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0116122F1B9DF0016E673 /* App.framework */; }; + FA240D7C22F28581003025F3 /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0116122F1B9DF0016E673 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + FAD0116422F1B9DF0016E673 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FAD0115E22F1B9DF0016E673 /* Debug.xcconfig */; }; + FAD0116522F1B9DF0016E673 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0115F22F1B9DF0016E673 /* Flutter.framework */; }; + FAD0116622F1B9DF0016E673 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FAD0116022F1B9DF0016E673 /* Release.xcconfig */; }; + FAD0116722F1B9DF0016E673 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD0116122F1B9DF0016E673 /* App.framework */; }; + FAD0116822F1B9DF0016E673 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = FAD0116222F1B9DF0016E673 /* AppFrameworkInfo.plist */; }; + FAD0116922F1B9DF0016E673 /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FAD0116322F1B9DF0016E673 /* Generated.xcconfig */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -41,6 +51,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + FA240D7C22F28581003025F3 /* App.framework in Embed Frameworks */, + FA240D7A22F2857D003025F3 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -80,6 +92,12 @@ 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A4868A865F318D337B7500AF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; B7B77D3AD1E975E5BE03D770 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + FAD0115E22F1B9DF0016E673 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + FAD0115F22F1B9DF0016E673 /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Flutter.framework; sourceTree = ""; }; + FAD0116022F1B9DF0016E673 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + FAD0116122F1B9DF0016E673 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = App.framework; sourceTree = ""; }; + FAD0116222F1B9DF0016E673 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AppFrameworkInfo.plist; sourceTree = ""; }; + FAD0116322F1B9DF0016E673 /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Generated.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -88,6 +106,10 @@ buildActionMask = 2147483647; files = ( 17DB4C25EDB98B3648015B9E /* libPods-Runner.a in Frameworks */, + FAD0116722F1B9DF0016E673 /* App.framework in Frameworks */, + FAD0116522F1B9DF0016E673 /* Flutter.framework in Frameworks */, + FA240D7922F2857D003025F3 /* Flutter.framework in Frameworks */, + FA240D7B22F28581003025F3 /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -127,6 +149,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + FAD0115D22F1B9DF0016E673 /* Flutter */, 0828E485220692A700A59437 /* launch */, 084A20872202E4FD00428FF5 /* flutter go.png */, 97C146F01CF9000F007C117D /* Runner */, @@ -180,6 +203,19 @@ path = Pods; sourceTree = ""; }; + FAD0115D22F1B9DF0016E673 /* Flutter */ = { + isa = PBXGroup; + children = ( + FAD0115E22F1B9DF0016E673 /* Debug.xcconfig */, + FAD0115F22F1B9DF0016E673 /* Flutter.framework */, + FAD0116022F1B9DF0016E673 /* Release.xcconfig */, + FAD0116122F1B9DF0016E673 /* App.framework */, + FAD0116222F1B9DF0016E673 /* AppFrameworkInfo.plist */, + FAD0116322F1B9DF0016E673 /* Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -250,6 +286,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + FAD0116622F1B9DF0016E673 /* Release.xcconfig in Resources */, 0828E4A0220692B500A59437 /* iPad Landscape.png in Resources */, 0828E4A1220692B500A59437 /* iPhone XR Portrait.png in Resources */, 0828E49F220692B500A59437 /* iPhone XS Max Landscape.png in Resources */, @@ -260,14 +297,17 @@ 0828E49E220692B500A59437 /* iPad Portrait@2x.png in Resources */, 0828E49D220692B500A59437 /* iPhone Portrait@2x.png in Resources */, 0828E499220692B500A59437 /* iPhone Portrait-Retina HD 4.7.png in Resources */, + FAD0116822F1B9DF0016E673 /* AppFrameworkInfo.plist in Resources */, 084A20882202E4FD00428FF5 /* flutter go.png in Resources */, 0828E497220692B500A59437 /* iPhone X_XS Landscape.png in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 0828E4A52206936100A59437 /* Images.xcassets in Resources */, + FAD0116922F1B9DF0016E673 /* Generated.xcconfig in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, 0828E49B220692B500A59437 /* iPad Landscape@2x.png in Resources */, 0828E495220692B500A59437 /* iPhone Portrait-Retina 4.png in Resources */, 0828E498220692B500A59437 /* iPhone XS Max Portrait.png in Resources */, + FAD0116422F1B9DF0016E673 /* Debug.xcconfig in Resources */, 94722E5C22511D3600F63900 /* GoogleService-Info.plist in Resources */, 0828E496220692B500A59437 /* iPad Portrait.png in Resources */, 0828E49C220692B500A59437 /* iPhone Landscape-Retina HD 5.5.png in Resources */, @@ -289,11 +329,11 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 12; files = ( ); inputPaths = ( @@ -303,7 +343,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; B34D03FFEA3831330E64E5C7 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; @@ -506,7 +546,7 @@ }; 97C147061CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A4868A865F318D337B7500AF /* Pods-Runner.debug.xcconfig */; + baseConfigurationReference = FAD0115E22F1B9DF0016E673 /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; @@ -537,7 +577,7 @@ }; 97C147071CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B7B77D3AD1E975E5BE03D770 /* Pods-Runner.release.xcconfig */; + baseConfigurationReference = FAD0116022F1B9DF0016E673 /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; diff --git a/lib/api/api.dart b/lib/api/api.dart index bfac51fc..748e3422 100644 --- a/lib/api/api.dart +++ b/lib/api/api.dart @@ -29,7 +29,7 @@ class Api{ static const String GET_THEMECOLOR = BASE_URL +'/getThemeColor';//获取主题颜色 - static const String GET_WIDGET_TREE = 'http://flutter-go.alibaba.net/' + 'getCateList';//获取widget列表树 + static const String GET_WIDGET_TREE = BASE_URL + 'getCateList';//获取widget列表树 static const String SEARCH_WIDGET = BASE_URL+'searchWidget';//搜索组件 } diff --git a/lib/model/widget.dart b/lib/model/widget.dart index 8d8c243e..3cc757be 100644 --- a/lib/model/widget.dart +++ b/lib/model/widget.dart @@ -193,10 +193,11 @@ class CategoryComponent extends CommonItem { this.parent }); CategoryComponent.fromJson(Map json) { - this.id = int.parse(json['id']); + print(json['id'].runtimeType); + this.id = json['id']; this.name = json['name']; this.parentId = json['parentId']; - this.token = json['id'] + json['type']; + this.token = json['id'].toString() + json['type']; } void addChildren(Object item) { if (item is CategoryComponent) { @@ -266,13 +267,13 @@ class WidgetLeaf extends CommonItem { }); WidgetLeaf.fromJson(Map json) { - this.id = int.parse(json['id']); + this.id = json['id']; this.name = json['name']; this.display = json['display']; this.author = json['author'] ?? null; this.path = json['path'] ?? null; this.pageId = json['pageId'] ?? null; - this.token = json['id'] + json['type']; + this.token = json['id'].toString() + json['type']; } @override CommonItem getChild(String token) { @@ -341,7 +342,7 @@ class WidgetTree { children.insert(0, { "id": "99999999999", "name": "本地代码", - "parentId": int.parse(item['id']), + "parentId": item['id'], "type": "category", "children": devChildren }); diff --git a/lib/utils/data_utils.dart b/lib/utils/data_utils.dart index dc0d9036..6d67b865 100644 --- a/lib/utils/data_utils.dart +++ b/lib/utils/data_utils.dart @@ -109,7 +109,7 @@ class DataUtils { static Future getWidgetTreeList() async { try { var response = await NetUtils.get(Api.GET_WIDGET_TREE); - print('组件树：$response'); + print('组件树dddd：$response'); if (response != null && response['success']) { return response['data']; } else {