Merge pull request #346 from wanbing/dev_wanbing

fair-online update
wuba · Sep 18, 2023 · cbf2393 · cbf2393
2 parents 083178b + edb6508
commit cbf2393
Show file tree

Hide file tree

Showing 79 changed files with 302 additions and 154 deletions.
diff --git a/fair_online/fair_online_service/fairDir/empty/project/empty_project/android/app/build.gradle b/fair_online/fair_online_service/fairDir/empty/project/empty_project/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
- compileSdkVersion 31
+ compileSdkVersion 33
 
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
  // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
  applicationId "com.example.empty_project"
  minSdkVersion 20
- targetSdkVersion 31
+ targetSdkVersion 33
  versionCode flutterVersionCode.toInteger()
  versionName flutterVersionName
  }

diff --git a/fair_online/fair_online_service/fairDir/empty/project/empty_project/android/build.gradle b/fair_online/fair_online_service/fairDir/empty/project/empty_project/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.8.10'
  repositories {
  google()
  mavenCentral()

diff --git a/...vice/fairDir/empty/project/empty_project/android/gradle/wrapper/gradle-wrapper.properties b/...vice/fairDir/empty/project/empty_project/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
diff --git a/...online/fair_online_service/fairDir/empty/project/empty_project/assets/fair/fair_patch.zip b/...online/fair_online_service/fairDir/empty/project/empty_project/assets/fair/fair_patch.zip
diff --git a/...project/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.js b/...project/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.js
diff --git a/...oject/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.json b/...oject/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.json
@@ -377,6 +377,11 @@
  }
  }
  }
+ },
+ "functionParameters": {
+ "pa": [
+ "item"
+ ]
  }
  }
  }
@@ -388,5 +393,6 @@
  }
  }
  },
- "methodMap": {}
+ "methodMap": {},
+ "digest": "3b90f4c1dbc6ea9c863a2774299d93f2"
 }
diff --git a/...t/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.metadata b/...t/empty_project/assets/fair/lib_page_hotel_listview_hotel_listview_template.fair.metadata
@@ -1,6 +1,6 @@
-# Generated by Fair on 2022-12-02 14:16:24.620246.
+# Generated by Fair on 2023-09-18 15:47:53.940271.
 
 source: empty_project|lib/page/hotel_listview/hotel_listview_template.dart
-md5: 5d4c50d5061d6964a481368fa30273d7
+md5: 4028170fdfe87caf31512bae868d8528
 json: empty_project|build/fair/lib_page_hotel_listview_hotel_listview_template.fair.json
-date: 2022-12-02 14:16:24.620472
+date: 2023-09-18 15:47:53.940525
diff --git a/.../fair_online_service/fairDir/empty/project/empty_project/assets/plugin/fair_net_plugin.js b/.../fair_online_service/fairDir/empty/project/empty_project/assets/plugin/fair_net_plugin.js
@@ -5,12 +5,12 @@ let callBackId = 0;
 
 let FairNet = function () {
  return {
- request: function (resp) {
+ requestData: function (resp) {
  let respMap = {};
  respMap = mapOrSetToObject(resp);
  let id = 'FairNet$' + (++callBackId);
  let requestParameter = {};
- requestParameter['className'] = "FairNet#request";
+ requestParameter['className'] = "FairNet#requestData";
  callBack[id] = [respMap['complete'], respMap['error'], respMap['success']];
  respMap['callId'] = id;
  requestParameter['funcName'] = 'invokePlugin';

diff --git a/.../fairDir/empty/project/empty_project/lib/page/hotel_listview/hotel_listview_template.dart b/.../fairDir/empty/project/empty_project/lib/page/hotel_listview/hotel_listview_template.dart
@@ -31,7 +31,7 @@ class _HotelListViewState extends State<HotelListView> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -74,17 +74,17 @@ class _HotelListViewState extends State<HotelListView> {
  Widget build(BuildContext context) {
  return Scaffold(
  appBar: AppBar(
- title: Text('ListView.builder模版'),
+ title: const Text('ListView.builder模版'),
  ),
- backgroundColor: Color(0xFFFEFEFE),
+ backgroundColor: const Color(0xFFFEFEFE),
  body: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => const Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: Container(
- color: Color(0xFFFFFFFF),
+ falseValue: () => Container(
+ color: const Color(0xFFFFFFFF),
  child: ListView(
  children: Sugar.map(_listData, builder: (HotelModel item) {
  return Padding(
@@ -104,7 +104,7 @@ class _HotelListViewState extends State<HotelListView> {
  fit: BoxFit.cover),
  ),
  Container(
- color: Color(0xFFFFFFFF),
+ color: const Color(0xFFFFFFFF),
  child: Row(
  mainAxisAlignment: MainAxisAlignment.center,
  crossAxisAlignment:

diff --git a/...r_online_service/fairDir/empty/project/empty_project/lib/plugins/net/fair_net_plugin.dart b/...r_online_service/fairDir/empty/project/empty_project/lib/plugins/net/fair_net_plugin.dart
@@ -13,7 +13,7 @@ class FairNet extends IFairPlugin {
  return _fairNet;
  }
 
- Future<dynamic> request(dynamic map) async {
+ Future<dynamic> requestData(dynamic map) async {
  if (map == null) {
  return;
  }
@@ -98,7 +98,7 @@ class FairNet extends IFairPlugin {
  @override
  Map<String, Function> getRegisterMethods() {
  var functions = <String, Function>{};
- functions.putIfAbsent('request', () => request);
+ functions.putIfAbsent('requestData', () => requestData);
  return functions;
  }
 

diff --git a/...nline/fair_online_service/fairDir/empty/project/empty_project/lib/src/generated.fair.dart b/...nline/fair_online_service/fairDir/empty/project/empty_project/lib/src/generated.fair.dart
diff --git a/fair_online/fair_online_service/fairDir/empty/project/empty_project/pubspec.yaml b/fair_online/fair_online_service/fairDir/empty/project/empty_project/pubspec.yaml
@@ -52,11 +52,16 @@ dev_dependencies:
  flutter_lints: ^1.0.0
  fair_compiler:
  path: ../../../fair/compiler
- build_runner: ^2.0.0
+ build_runner: ^2.1.2
 
 dependency_overrides:
  fair_version:
  path: ../../../fair/flutter_version/flutter_3_3_0
+ collection: 1.17.0
+ permission_handler: ^10.2.0
+ analyzer: 5.6.0
+ dart_style: 2.2.5
+ dio: 4.0.6
 
 
 # For information on the generic Dart part of this file, see the

diff --git a/fair_online/fair_online_service/fairDir/template/page/detail_page/detail_page.dart b/fair_online/fair_online_service/fairDir/template/page/detail_page/detail_page.dart
@@ -28,7 +28,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
  void onUnload() {}
 
  void requestData() {
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':

diff --git a/fair_online/fair_online_service/fairDir/template/page/gridview/gridview.dart b/fair_online/fair_online_service/fairDir/template/page/gridview/gridview.dart
@@ -29,7 +29,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -69,12 +69,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  child: Icon(Icons.add),
  ),
  body: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: GridView.count(
+ falseValue: () => GridView.count(
  crossAxisCount: 2,
  mainAxisSpacing: 10,
  crossAxisSpacing: 10,

diff --git a/fair_online/fair_online_service/fairDir/template/page/hotel_listview/hotel_listview.dart b/fair_online/fair_online_service/fairDir/template/page/hotel_listview/hotel_listview.dart
@@ -31,7 +31,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -78,12 +78,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  ),
  backgroundColor: Color(0xFFFEFEFE),
  body: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: Container(
+ falseValue: () => Container(
  color: Color(0xFFFFFFFF),
  child: ListView(
  children: Sugar.map(_listData, builder: (HotelModel item) {

diff --git a/fair_online/fair_online_service/fairDir/template/page/list_card/list_card.dart b/fair_online/fair_online_service/fairDir/template/page/list_card/list_card.dart
@@ -31,7 +31,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -150,12 +150,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  color: Colors.white,
  child: Sugar.ifEqualBool(
  isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: Sugar.listBuilder(
+ falseValue: () => Sugar.listBuilder(
  itemCount: dataLength(),
  itemBuilder: (context, index) {
  return Container(

diff --git a/fair_online/fair_online_service/fairDir/template/page/list_page/list_page.dart b/fair_online/fair_online_service/fairDir/template/page/list_page/list_page.dart
@@ -31,7 +31,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -127,12 +127,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  body: Container(
  color: Colors.white,
  child: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: Sugar.listBuilder(
+ falseValue: () => Sugar.listBuilder(
  itemCount: dataLength(),
  itemBuilder: (context, index) {
  return SizedBox(

diff --git a/fair_online/fair_online_service/fairDir/template/page/pageview/pageview.dart b/fair_online/fair_online_service/fairDir/template/page/pageview/pageview.dart
@@ -29,7 +29,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -75,12 +75,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  title: Text('PageView模版'),
  ),
  body: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: PageView.custom(
+ falseValue: () => PageView.custom(
  childrenDelegate: Sugar.sliverChildBuilderDelegate(
  builder: (context, index) {
  return Column(

diff --git a/fair_online/fair_online_service/fairDir/template/page/scrollview/scrollview.dart b/fair_online/fair_online_service/fairDir/template/page/scrollview/scrollview.dart
@@ -31,7 +31,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -69,12 +69,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  return Scaffold(
  body: Sugar.ifEqualBool(
  isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: CustomScrollView(
+ falseValue: () => CustomScrollView(
  slivers: <Widget>[
  SliverAppBar(
  title: Text('CustomScrollView模版'),

diff --git a/fair_online/fair_online_service/fairDir/template/page/staggered_view/staggered_view.dart b/fair_online/fair_online_service/fairDir/template/page/staggered_view/staggered_view.dart
@@ -30,7 +30,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -71,12 +71,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  ),
  body: Sugar.ifEqualBool(
  isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: StaggeredGrid.count(
+ falseValue: () => StaggeredGrid.count(
  crossAxisCount: 2,
  mainAxisSpacing: 10,
  crossAxisSpacing: 5,

diff --git a/fair_online/fair_online_service/fairDir/template/page/tabbar_page/tabbar_page.dart b/fair_online/fair_online_service/fairDir/template/page/tabbar_page/tabbar_page.dart
@@ -33,7 +33,7 @@ class _@@PageName@@State extends State<@@PageName@@> {
 
  void requestData() {
  _page++;
- FairNet().request({
+ FairNet().requestData({
  'pageName': '#FairKey#',
  'method': 'GET',
  'url':
@@ -100,12 +100,12 @@ class _@@PageName@@State extends State<@@PageName@@> {
  ),
  ),
  body: Sugar.ifEqualBool(isDataEmpty(),
- trueValue: Center(
+ trueValue: () => Center(
  child: Text(
  '加载中...',
  ),
  ),
- falseValue: TabBarView(
+ falseValue: () => TabBarView(
  children: <Widget>[
  _allTabList(),
  _getList(),