Skip to content

G
gmalpha_flutter
Commit 5531b9ea authored by 林生雨's avatar 林生雨
Browse files
Options

commit

parent 4af04766
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 130 deletions
android/app/build.gradle
View file @ 5531b9ea
......@@ -26,8 +26,8 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
def isLib = false
//def isLib = true
//def isLib = false
def isLib = true
if (isLib) {
apply plugin: 'com.android.library'
......
android/app/src/main/AndroidManifest.xml
View file @ 5531b9ea
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.gmalpha_flutter">
<application
android:name="io.flutter.app.FlutterApplication"
android:icon="@mipmap/ic_launcher"
android:label="gmalpha_flutter"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<meta-data
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
android:value="true" />
</activity>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.example.gengmei_flutter_plugin_example"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
<!-- <application-->
<!-- android:name="io.flutter.app.FlutterApplication"-->
<!-- android:icon="@mipmap/ic_launcher"-->
<!-- android:label="gmalpha_flutter"-->
<!-- android:theme="@style/AppTheme">-->
<!-- <activity-->
<!-- android:name=".MainActivity"-->
<!-- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"-->
<!-- android:hardwareAccelerated="true"-->
<!-- android:launchMode="singleTop"-->
<!-- android:windowSoftInputMode="adjustResize">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- <meta-data-->
<!-- android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"-->
<!-- android:value="true" />-->
<!-- </activity>-->
<!-- <provider-->
<!-- android:name="android.support.v4.content.FileProvider"-->
<!-- android:authorities="com.example.gengmei_flutter_plugin_example"-->
<!-- android:exported="false"-->
<!-- android:grantUriPermissions="true">-->
<!-- <meta-data-->
<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
<!-- android:resource="@xml/file_paths" />-->
<!-- </provider>-->
<!-- </application>-->
</manifest>
android/packflutter/flutter/assets/release/kernel_compile.d
View file @ 5531b9ea
This source diff could not be displayed because it is too large. You can view the blob instead.
android/packflutter/flutter/assets/release/kernel_compile.d.fingerprint
View file @ 5531b9ea
This source diff could not be displayed because it is too large. You can view the blob instead.
android/packflutter/flutter/assets/release/snapshot.d.fingerprint
View file @ 5531b9ea
{"version":"20e59316b8b8474554b38493b8ca888794b0234a","properties":{"buildMode":"BuildMode.release","targetPlatform":"TargetPlatform.android_arm","entryPoint":"build/flutteroutput/aot/app.dill","sharedLib":"false","extraGenSnapshotOptions":"","engineHash":"fee001c93f25a1e7258e762781a7361f122d29f5","buildersUsed":"false"},"files":{"/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/lib/ui/ui.dart":"eb7755654f7eeb3b79fe0e7292ba8b7b","/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/sdk_ext/vmservice_io.dart":"6137595b8118b04910c4f137a94bad5f","build/flutteroutput/aot/app.dill":"074b99da2a45a038a6acc6e4cd6fd4fb","build/flutteroutput/aot/isolate_snapshot_data":"1f2ea3d0a682b4b684c36e58a7bcb80e","build/flutteroutput/aot/isolate_snapshot_instr":"9bb3badc3952ffd436b837f14f8227c4","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file
{"version":"20e59316b8b8474554b38493b8ca888794b0234a","properties":{"buildMode":"BuildMode.release","targetPlatform":"TargetPlatform.android_arm","entryPoint":"build/flutteroutput/aot/app.dill","sharedLib":"false","extraGenSnapshotOptions":"","engineHash":"fee001c93f25a1e7258e762781a7361f122d29f5","buildersUsed":"false"},"files":{"/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/lib/ui/ui.dart":"eb7755654f7eeb3b79fe0e7292ba8b7b","/Users/apple/Downloads/flutter/bin/cache/pkg/sky_engine/sdk_ext/vmservice_io.dart":"6137595b8118b04910c4f137a94bad5f","build/flutteroutput/aot/app.dill":"d1fc90937151d321097b8d6480f6dd1f","build/flutteroutput/aot/isolate_snapshot_data":"69213d2c044fbf7a43df17535b7589ad","build/flutteroutput/aot/isolate_snapshot_instr":"ba98dffff235ed3b3d0aa287ac98e46f","build/flutteroutput/aot/vm_snapshot_data":"9df51beb7ff50608e0e854f7232fd2f4","build/flutteroutput/aot/vm_snapshot_instr":"4f207dc4df14e95febb3bb4e4c611765"}}
\ No newline at end of file
flutter.sh
View file @ 5531b9ea
......@@ -132,47 +132,47 @@ git push
#====upload
cd /Users/apple/lsy/MergeTest
./gradlew clean
./gradlew assembleRelease
./gradlew uploadArchives
cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/Test/app/libs/
cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/gmalpha_flutter/build/
cd /Users/apple/lsy/flutter_aar
git add .
git commit -m "commit "
git push
#cd /Users/apple/lsy/MergeTest
#./gradlew clean
#./gradlew assembleRelease
#./gradlew uploadArchives
#cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/Test/app/libs/
#cp -r /Users/apple/lsy/MergeTest/app/build/outputs/aar/app.aar /Users/apple/lsy/gmalpha_flutter/build/
#
#cd /Users/apple/lsy/flutter_aar
#git add .
#git commit -m "commit "
#git push
# ios!!!
#cd ${projectDir}
#flutter build ios --release --no-codesign
#cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/aar_update/ios${message}/
#
#cd /Users/apple/lsy/GMAlpha
#git checkout test
#git stash
#git pull
#cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
#git status
#git add .
#git commit " change App.framwork"
#git push
#
cd ${projectDir}
flutter build ios --release --no-codesign
cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/aar_update/ios${message}/
#
#git checkout dev
#git stash
#git pull
#cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
#git status
#git add .
#git commit " change App.framwork"
#git push
cd /Users/apple/lsy/GMAlpha
git checkout test
git stash
git pull
cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
git status
git add .
git commit -m " change App.framwork"
git push
#
#python /Users/apple/lsy/update.py
git checkout dev
git stash
git pull
cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/App.framework /Users/apple/lsy/GMAlpha/GMAlpha/Classes/APP/flutter_project/App.framework
git status
git add .
git commit -m " change App.framwork"
git push
python /Users/apple/lsy/update.py
#
#cp -r /Users/apple/lsy/gmalpha_flutter/ios/Flutter/Flutter.framework /Users/apple/lsy/aar_update/ios${message}/
#cd /Users/apple/lsy/aar_update/
#open .
......
lib/ActivityReportModel/page/ActivityReportModel.dart
View file @ 5531b9ea
......@@ -34,7 +34,7 @@ class ActivityReportModel extends BaseModel {
}
start() {
pageStart("brand_report", fromPage, DateTime.now().second).listen((value) {
pageStart("brand_report", fromPage).listen((value) {
print("埋点 pageStart 成功？:$value");
}).onError((error) {
print(error);
......@@ -42,11 +42,12 @@ class ActivityReportModel extends BaseModel {
}
end() {
pageEnd("brand_report", fromPage, DateTime.now().second).listen((value) {
print("埋点 pageEnd 成功？:$value");
}).onError((error) {
print(error);
});
pageEnd("brand_report", fromPage);
// .listen((value) {
// print("埋点 pageEnd 成功？:$value");
// }).onError((error) {
// print(error);
// });
}
@override
......
lib/ActivityReportModel/page/ActivityReportPage.dart
View file @ 5531b9ea
......@@ -47,10 +47,8 @@ class ActivityReportState extends State<ActivityReportPage> {
centerTitle: true,
leading: IMAGE.GestureDetector(
onTap: () {
click("brand_report", "return");
_model.end();
Navigator.pop(context, "");
jumpToSearch();
jumpToSearch("brand_report", _model.fromPage, "return");
},
child: IMAGE.Image.asset("images/nav_back.png"),
),
......@@ -60,17 +58,16 @@ class ActivityReportState extends State<ActivityReportPage> {
margin: EdgeInsets.only(right: 30),
child: Center(
child: Text(
'再测一次',
style: TextStyle(
color: ALColors.Color323232,
fontSize: 14,
fontWeight: FontWeight.bold),
))),
'再测一次',
style: TextStyle(
color: ALColors.Color323232,
fontSize: 14,
fontWeight: FontWeight.bold),
))),
onTap: () {
click("brand_report", "test_again");
_model.end();
// click("", "");
Navigator.pop(context, "");
jumpToH5();
jumpToH5("brand_report", _model.fromPage, "test_again");
},
)
],
......@@ -95,9 +92,11 @@ class ActivityReportState extends State<ActivityReportPage> {
children: <Widget>[
TopCard(share: data.data.data.report?.share),
SizedBox(height: ScreenUtil().setHeight(8)),
PictorialCard(_model,
PictorialCard(
_model,
pictorialList: data.data.data.report?.cards,
id: _model.id,),
id: _model.id,
),
SizedBox(height: ScreenUtil().setHeight(38))
],
),
......@@ -105,7 +104,7 @@ class ActivityReportState extends State<ActivityReportPage> {
);
},
)),
onWillPop: (){
onWillPop: () {
_model.end();
Navigator.pop(context, "");
},
......@@ -363,7 +362,8 @@ class PictorialCard extends StatelessWidget {
final id;
final ActivityReportModel _model;
PictorialCard(this._model,{Key key, this.pictorialList, this.id}) : super(key: key);
PictorialCard(this._model, {Key key, this.pictorialList, this.id})
: super(key: key);
Widget _gridViewItemUI(BuildContext context, item) {
return Container(
......@@ -386,9 +386,8 @@ class PictorialCard extends StatelessWidget {
margin: EdgeInsets.only(top: ScreenUtil().setHeight(32)),
child: GestureDetector(
onTap: () {
click("brand_report", "recommand_${indexOf + 1}");
_model.end();
jumpToPictorial('${item.protocol}&survey_record_id=$id');
jumpToPictorial('${item.protocol}&survey_record_id=$id',
"brand_report", _model.fromPage, "recommand_${indexOf + 1}");
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -576,12 +575,12 @@ class _AnimationCharacterState extends State<AnimationCharacter>
Widget _peopleViewUI(BuildContext context, item) {
var index = peopleList.indexOf(item);
return Container(
margin: index != 0 ? EdgeInsets.only(left: ScreenUtil().setWidth(12)) : EdgeInsets.all(0),
child: IMAGE.Image.asset(item['url'],
width: ScreenUtil().setWidth(item['width']),
height: ScreenUtil().setHeight(item['height'])
)
);
margin: index != 0
? EdgeInsets.only(left: ScreenUtil().setWidth(12))
: EdgeInsets.all(0),
child: IMAGE.Image.asset(item['url'],
width: ScreenUtil().setWidth(item['width']),
height: ScreenUtil().setHeight(item['height'])));
}
@override
......
lib/PrestigeModel/page/reputation/ReputationsModel.dart
View file @ 5531b9ea
......@@ -22,7 +22,7 @@ class ReputationsModel extends BaseModel {
ReputationsModel(this.userId, this.userName, this.fromPage);
start() {
pageStart("my_expert_reputation", fromPage, DateTime.now().second)
pageStart("my_expert_reputation", fromPage)
.listen((value) {
print("埋点 pageStart 成功？:$value");
}).onError((error) {
......@@ -31,7 +31,7 @@ class ReputationsModel extends BaseModel {
}
end() {
pageEnd("my_expert_reputation", fromPage, DateTime.now().second)
pageEnd("my_expert_reputation", fromPage)
.listen((value) {
print("埋点 pageEnd 成功？:$value");
}).onError((error) {
......
lib/commonModel/base/Temp.dart
View file @ 5531b9ea
......@@ -7,14 +7,14 @@ import 'package:rxdart/rxdart.dart';
const platform = const MethodChannel('flutter_bury_channel');
Observable<bool> pageStart(String nowPage, String beforPage, int time) {
Observable<bool> pageStart(String nowPage, String beforPage) {
return Observable.fromFuture(platform.invokeMethod(
"PAGE_START", {"page_name": nowPage, "referrer": beforPage, "in": time}));
"PAGE_START", {"page_name": nowPage, "referrer": beforPage, "in": getNowTimeSecond()}));
}
Observable<bool> pageEnd(String nowPage, String beforPage, int time) {
Observable<bool> pageEnd(String nowPage, String beforPage) {
return Observable.fromFuture(platform.invokeMethod(
"PAGE_END", {"page_name": nowPage, "referrer": beforPage, "out": time}));
"PAGE_END", {"page_name": nowPage, "referrer": beforPage, "out": getNowTimeSecond()}));
}
Observable<bool> click(String page_name, String button_name) {
......@@ -22,15 +22,58 @@ Observable<bool> click(String page_name, String button_name) {
"CLICK_EVENT", {"page_name": page_name, "button_name": button_name}));
}
Observable<bool> jumpToH5() {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_H5"));
Observable<bool> jumpToH5(
String nowPage, String beforPage, String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_H5", {
"page_name": nowPage,
"referrer": beforPage,
"out": getNowTimeSecond(),
"button_name": button_name
}));
}
Observable<bool> jumpToPictorial(String url) {
return Observable.fromFuture(
platform.invokeMethod("FLUTTER_TO_PICTORIAL", {"url": url}));
Observable<bool> jumpToPictorial(String url, String nowPage, String beforPage,
String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_PICTORIAL", {
"url": url,
"page_name": nowPage,
"referrer": beforPage,
"out": getNowTimeSecond(),
"button_name": button_name
}));
}
Observable<bool> jumpToSearch() {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_SEARCH"));
Observable<bool> jumpToSearch(
String nowPage, String beforPage, String button_name) {
return Observable.fromFuture(platform.invokeMethod("FLUTTER_TO_SEARCH", {
"page_name": nowPage,
"referrer": beforPage,
"out": getNowTimeSecond(),
"button_name": button_name
}));
}
String getNowTimeSecond() {
return "${DateTime.now().millisecondsSinceEpoch}";
// String year = "${DateTime.now().year}".length == 4
// ? "${DateTime.now().year}"
// : "0${DateTime.now().year}";
// String month = "${DateTime.now().month}".length == 2
// ? "${DateTime.now().month}"
// : "0${DateTime.now().month}";
// String day = "${DateTime.now().day}".length == 2
// ? "${DateTime.now().day}"
// : "0${DateTime.now().day}";
// String hour = "${DateTime.now().hour}".length == 2
// ? "${DateTime.now().hour}"
// : "0${DateTime.now().hour}";
// String minute = "${DateTime.now().minute}".length == 2
// ? "${DateTime.now().minute}"
// : "0${DateTime.now().minute}";
// String second = "${DateTime.now().second}".length == 2
// ? "${DateTime.now().second}"
// : "0${DateTime.now().second}";
//
// return "${year}${month}${day}"
// "${hour}${minute}${second}";
}
lib/main.dart
View file @ 5531b9ea
......@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart';
import 'package:gmalpha_flutter/Annotations/RouterCenterRestore.mark.dart';
import 'package:gmalpha_flutter/Error_Page.dart';
import 'package:gmalpha_flutter/commonModel/base/Temp.dart';
import 'package:gmalpha_flutter/commonModel/net/Api.dart';
import 'package:gmalpha_flutter/messageModel/home/message_home.dart';
......@@ -11,7 +12,9 @@ import 'comment_suggest.dart';
void main() async {
// await applicationInit();
print("RESIGN!!!");
// String temp="${DateTime.now().year}${DateTime.now().month}${DateTime.now().day}${DateTime.now().hour}"
// "${DateTime.now().minute}${DateTime.now().second}";
// print("RESIGN!!!"+getNowTimeSecond());
runApp(MyApp());
}
......@@ -28,13 +31,19 @@ class _MyAppState extends State<MyApp> {
'comment_suggest': (pageName, params, _) => CommentSuggest(params),
'message_home': (pageName, params, _) => MessageHomePage(params),
'album': (pageName, params, _) {
var provider=params["provider"] as String;
var param = params["needCamera"] as bool;
var param1 = params["maxCount"] as int;
var param2 = params["selectedPath"] as List<String>;
return RouterCenterImpl()
.findAlbumRouter()
.getAlbumPage(provider,param, param1, param2);
if (params == null) {
return ErrorPage("出错：需要传递的参数为空");
}
var provider = params["provider"] as String;
return RouterCenterImpl().findAlbumRouter().getAlbumPage(
provider,
params["needCamera"] == null
? true
: params["needCamera"] == 0 ? true : false,
params["maxCount"] == null ? 1 : int.parse(params["maxCount"]),
params["selectedPath"] == null
? null
: params["selectedPath"] as List<String>);
},
"prestige": (pageName, params, _) {
String fromPage = params["fromPage"];
......@@ -78,18 +87,22 @@ class _MyAppState extends State<MyApp> {
// initialRoute: '/test',
//// 调试的时候可以打开
routes: {
// '/': (context) => CommentSuggest({"Cookie":" _gm_token=7e48641558699683; sessionid=nb3ze4ur7ucosln8sd8pzwojddenv9ym; _gtid=a1bc0a387e1911e996b9525400fa516d4094"}),
'/': (context) {
Api.getInstance().initBuildConfig({'Cookie':
'_gm_token=72ee1c1569466411; _gtid=58d3cc14df8711e99736525400e82fab81; sessionid=vhksn66854pejzjwi8ljhrmcew3domh2'
,"buildConfig":"debug"});
return RouterCenterImpl().findActivityReportRouter()?.getActivityReportPage(279, 1, '');
// routes: {
// // '/': (context) => CommentSuggest({"Cookie":" _gm_token=7e48641558699683; sessionid=nb3ze4ur7ucosln8sd8pzwojddenv9ym; _gtid=a1bc0a387e1911e996b9525400fa516d4094"}),
// '/': (context) {
// Api.getInstance().initBuildConfig({
// 'Cookie':
// '_gm_token=72ee1c1569466411; _gtid=58d3cc14df8711e99736525400e82fab81; sessionid=vhksn66854pejzjwi8ljhrmcew3domh2',
// "buildConfig": "debug"
// });
// return RouterCenterImpl()
// .findAlbumRouter()
// .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
},
},
// .findActivityReportRouter()
// ?.getActivityReportPage(279, 1, '');
//// return RouterCenterImpl()
//// .findAlbumRouter()
//// .getAlbumPage("com.example.gengmei_flutter_plugin_example",true, 2, null);
// },
// },
//调试的时候可以打开
builder: FlutterBoost.init(postPush: _onRoutePushed),
......
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