Commit e7c84792 authored by 朱翠翠's avatar 朱翠翠

Merge branch 'test' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter

parents e2b41f5d bb8430c3
/*
* @author lsy
* @date 2020/6/29
**/
import 'package:flutter/cupertino.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart';
class LevelOnePage extends StatefulWidget {
@override
State<StatefulWidget> createState() => LevelOneState();
}
class LevelOneState extends BaseState<LevelOnePage> {
@override
Widget buildItem(BuildContext context) {
}
}
/*
* @author lsy
* @date 2020/6/29
**/
class LevelPreview {
Banner banner;
String name;
String positiveRate;
String salesCount;
String planDescription;
List<OverviewAttrs> overviewAttrs;
List<ExplanationAttrs> explanationAttrs;
List<Tabs> tabs;
LevelPreview(
{this.banner,
this.name,
this.positiveRate,
this.salesCount,
this.planDescription,
this.overviewAttrs,
this.explanationAttrs,
this.tabs});
LevelPreview.fromJson(Map<String, dynamic> json) {
banner =
json['banner'] != null ? new Banner.fromJson(json['banner']) : null;
name = json['name'];
positiveRate = json['positive_rate'];
salesCount = json['sales_count'];
planDescription = json['plan_description'];
if (json['overview_attrs'] != null) {
overviewAttrs = new List<OverviewAttrs>();
json['overview_attrs'].forEach((v) {
overviewAttrs.add(new OverviewAttrs.fromJson(v));
});
}
if (json['explanation_attrs'] != null) {
explanationAttrs = new List<ExplanationAttrs>();
json['explanation_attrs'].forEach((v) {
explanationAttrs.add(new ExplanationAttrs.fromJson(v));
});
}
if (json['tabs'] != null) {
tabs = new List<Tabs>();
json['tabs'].forEach((v) {
tabs.add(new Tabs.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.banner != null) {
data['banner'] = this.banner.toJson();
}
data['name'] = this.name;
data['positive_rate'] = this.positiveRate;
data['sales_count'] = this.salesCount;
data['plan_description'] = this.planDescription;
if (this.overviewAttrs != null) {
data['overview_attrs'] =
this.overviewAttrs.map((v) => v.toJson()).toList();
}
if (this.explanationAttrs != null) {
data['explanation_attrs'] =
this.explanationAttrs.map((v) => v.toJson()).toList();
}
if (this.tabs != null) {
data['tabs'] = this.tabs.map((v) => v.toJson()).toList();
}
return data;
}
}
class Banner {
String type;
String url;
Banner({this.type, this.url});
Banner.fromJson(Map<String, dynamic> json) {
type = json['type'];
url = json['url'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['type'] = this.type;
data['url'] = this.url;
return data;
}
}
class OverviewAttrs {
int attrId;
String attrName;
String attrValue;
OverviewAttrs({this.attrId, this.attrName, this.attrValue});
OverviewAttrs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id'];
attrName = json['attr_name'];
attrValue = json['attr_value'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['attr_id'] = this.attrId;
data['attr_name'] = this.attrName;
data['attr_value'] = this.attrValue;
return data;
}
}
class Tabs {
String tabType;
String name;
Tabs({this.tabType, this.name});
Tabs.fromJson(Map<String, dynamic> json) {
tabType = json['tab_type'];
name = json['name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['tab_type'] = this.tabType;
data['name'] = this.name;
return data;
}
}
class ExplanationAttrs {
int attrId;
String attrName;
String attrValue;
ExplanationAttrs({this.attrId, this.attrName, this.attrValue});
ExplanationAttrs.fromJson(Map<String, dynamic> json) {
attrId = json['attr_id'];
attrName = json['attr_name'];
attrValue = json['attr_value'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['attr_id'] = this.attrId;
data['attr_name'] = this.attrName;
data['attr_value'] = this.attrValue;
return data;
}
}
...@@ -6,6 +6,8 @@ import 'package:flutter/cupertino.dart'; ...@@ -6,6 +6,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'commonModel/base/BaseUtil.dart';
class DemoPage extends StatefulWidget { class DemoPage extends StatefulWidget {
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
...@@ -14,6 +16,12 @@ class DemoPage extends StatefulWidget { ...@@ -14,6 +16,12 @@ class DemoPage extends StatefulWidget {
} }
class DemoState extends State<DemoPage> { class DemoState extends State<DemoPage> {
@override
void initState() {
super.initState();
flutterChannel.invokeMethod("method!!!", "wwww");
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
......
...@@ -9,4 +9,5 @@ import 'MainRouterImpl.dart'; ...@@ -9,4 +9,5 @@ import 'MainRouterImpl.dart';
@Router("MainRouter", MainRouterImpl, true) @Router("MainRouter", MainRouterImpl, true)
abstract class MainRouter extends RouterBaser { abstract class MainRouter extends RouterBaser {
void init();
} }
...@@ -3,9 +3,13 @@ ...@@ -3,9 +3,13 @@
* @date 2019-12-31 * @date 2019-12-31
**/ **/
import 'package:flutter/src/widgets/framework.dart'; import 'package:flutter/src/widgets/framework.dart';
import 'package:gm_flutter/MainRouter/manager/MainManager.dart';
import 'MainRouter.dart'; import 'MainRouter.dart';
class MainRouterImpl implements MainRouter { class MainRouterImpl implements MainRouter {
@override
void init() {
MainManager.getInstance().startInit();
}
} }
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
class MainManager{ class MainManager {
static const EventChannel _channel = EventChannel("flutter_plugin_event");
MainManager._(){ MainManager._() {}
FlutterBoost.singleton.channel.addMethodHandler((call){
});
}
static MainManager _mainManager; static MainManager _mainManager;
static MainManager getInstance(){
if(_mainManager==null){ static MainManager getInstance() {
_mainManager=MainManager._(); if (_mainManager == null) {
_mainManager = MainManager._();
} }
return _mainManager; return _mainManager;
} }
startInit() {
_channel.receiveBroadcastStream().listen((data) {
print("LSY FLUTTER EVENT ${data}");
} });
\ No newline at end of file }
}
...@@ -8,15 +8,5 @@ import 'dart:ui'; ...@@ -8,15 +8,5 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
const _miniChannle = const MethodChannel('gengmei_mini'); const flutterChannel = const MethodChannel('gm_method_channel');
const bool isDebug = ! const bool.fromEnvironment("dart.vm.product"); const bool isDebug = ! const bool.fromEnvironment("dart.vm.product");
Future backApp() async {
return await _miniChannle.invokeMethod("backApp");
}
void jumpToPage(Widget page, BuildContext context) {
Navigator.push(context, MaterialPageRoute(builder: ((context) {
return page;
})));
}
...@@ -5,6 +5,7 @@ import 'package:flutter_boost/flutter_boost.dart'; ...@@ -5,6 +5,7 @@ import 'package:flutter_boost/flutter_boost.dart';
import 'package:flutter_common/Annotations/anno/RouterCenter.dart'; import 'package:flutter_common/Annotations/anno/RouterCenter.dart';
import 'package:flutter_common/commonModel/util/WindowUtil.dart'; import 'package:flutter_common/commonModel/util/WindowUtil.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/main.mark.dart';
import 'DemoPage.dart'; import 'DemoPage.dart';
import 'DemoPage1.dart'; import 'DemoPage1.dart';
...@@ -27,10 +28,10 @@ void main() { ...@@ -27,10 +28,10 @@ void main() {
}; };
runZonedGuarded(() { runZonedGuarded(() {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
runApp( runApp(
MyAppWidget(), MyAppWidget(),
); );
RouterCenterImpl().findMainRouter().init();
}, (Object error, StackTrace stack) { }, (Object error, StackTrace stack) {
//TODO //TODO
print("lsy EEEEEE ${error.toString()} ${stack.toString()}"); print("lsy EEEEEE ${error.toString()} ${stack.toString()}");
...@@ -57,8 +58,9 @@ class MyApp extends State<MyAppWidget> { ...@@ -57,8 +58,9 @@ class MyApp extends State<MyAppWidget> {
return DemoPage1(); return DemoPage1();
}, },
}); });
// FlutterBoost.singleton.addBoostContainerLifeCycleObserver((state, settings) { FlutterBoost.singleton.addBoostContainerLifeCycleObserver((state, settings) {
// }); print("LSY ${state}");
});
// FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver()); // FlutterBoost.singleton.addBoostNavigatorObserver(TestBoostNavigatorObserver());
} }
...@@ -66,18 +68,18 @@ class MyApp extends State<MyAppWidget> { ...@@ -66,18 +68,18 @@ class MyApp extends State<MyAppWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
WindowUtil.setBarStatus(true); WindowUtil.setBarStatus(true);
return MaterialApp( return MaterialApp(
theme: ThemeData(), theme: ThemeData(),
builder: FlutterBoost.init(postPush: _onRoutePushed), builder: FlutterBoost.init(postPush: _onRoutePushed),
// home: isDebug home: isDebug
// ? Container( ? Container(
// color: Colors.red, color: Colors.red,
// ) )
// : Container( : Container(
// color: Colors.white, color: Colors.white,
// child: Center( child: Center(
// child: loadingItem(), child: loadingItem(),
// ), ),
// ) )
); );
} }
......
...@@ -35,8 +35,11 @@ cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/app-release.apk ...@@ -35,8 +35,11 @@ cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/app-release.apk
unzip ${projectDir}/build/host/outputs/apk/release/app-release.zip -d ${projectDir}/build/host/outputs/apk/release unzip ${projectDir}/build/host/outputs/apk/release/app-release.zip -d ${projectDir}/build/host/outputs/apk/release
#cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/app-release/lib/armeabi-v7a/* /Users/apple/lsy/update/androd${message}${dif}/ #cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/app-release/lib/armeabi-v7a/* /Users/apple/lsy/update/androd${message}${dif}/
rm -rf /Users/apple/Downloads/PLLL/app/libs/armeabi-v7a/* rm -rf /Users/apple/Downloads/PLLL/app/libs/armeabi-v7a/*
rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/armeabi-v7a/*
cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/lib/armeabi-v7a/* /Users/apple/Downloads/PLLL/app/libs/armeabi-v7a/ cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/lib/armeabi-v7a/* /Users/apple/Downloads/PLLL/app/libs/armeabi-v7a/
cp -r /Users/apple/lsy/gm_flutter/build/host/outputs/apk/release/lib/armeabi-v7a/* /Users/apple/lsy/gengmei_android/gm-flutter/libs/armeabi-v7a/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment