|
|
@@ -3,24 +3,17 @@ import 'dart:io';
|
|
|
import 'package:douyin_demo/pages/RecommendPage/BottomSheet.dart';
|
|
|
import 'package:douyin_demo/providers/RecommendProvider.dart';
|
|
|
import 'package:douyin_demo/widgets/BottomBar.dart';
|
|
|
-// import 'package:douyin_demo/widgets/FavAnimation.dart' as prefix0;
|
|
|
import 'package:flutter/material.dart';
|
|
|
import 'package:flutter_swiper/flutter_swiper.dart';
|
|
|
-// import 'package:marquee/marquee.dart';
|
|
|
import 'package:marquee_flutter/marquee_flutter.dart';
|
|
|
import 'package:provider/provider.dart';
|
|
|
import 'package:shared_preferences/shared_preferences.dart';
|
|
|
import 'package:video_player/video_player.dart';
|
|
|
-
|
|
|
import 'widgets/FavAnimation.dart';
|
|
|
|
|
|
Future main() async {
|
|
|
WidgetsFlutterBinding.ensureInitialized();
|
|
|
final prefs = await SharedPreferences.getInstance();
|
|
|
- // prefs.clear();
|
|
|
- // String hosts = prefs.get('urlPath');
|
|
|
- // String scheme = prefs.get('scheme');
|
|
|
- // int ports = prefs.get('ports');
|
|
|
prefs.setBool("ifIOS", Platform.isIOS);
|
|
|
prefs.setBool("ifPrd", false);
|
|
|
prefs.setBool("ifReal_d", false);
|
|
|
@@ -44,7 +37,6 @@ Future main() async {
|
|
|
prefs.setString("picServer", "http://www.guojio.com");
|
|
|
|
|
|
runApp(MyApp());
|
|
|
- // runApp(MyApp());
|
|
|
}
|
|
|
|
|
|
class MyApp extends StatelessWidget {
|
|
|
@@ -65,11 +57,10 @@ class MyApp extends StatelessWidget {
|
|
|
class RecommendPage extends StatelessWidget {
|
|
|
const RecommendPage({Key key, @required this.selIndex}) : super(key: key);
|
|
|
final int selIndex;
|
|
|
+
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
double rpx = MediaQuery.of(context).size.width / 750;
|
|
|
- // MediaQuery.of(context).padding.top
|
|
|
- // MediaQuery.of(context).padding.bottom
|
|
|
|
|
|
return MultiProvider(
|
|
|
providers: [
|
|
|
@@ -104,34 +95,39 @@ class MainTabView extends StatelessWidget {
|
|
|
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
+
|
|
|
RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
return TabBarView(
|
|
|
-
|
|
|
controller: provider.controller,
|
|
|
children: <Widget>[
|
|
|
- SwiperMain(type: "followed",),
|
|
|
- SwiperMain(type: "recommend",),
|
|
|
+ SwiperMain(
|
|
|
+ type: "followed",
|
|
|
+ ),
|
|
|
+ SwiperMain(
|
|
|
+ type: "recommend",
|
|
|
+ ),
|
|
|
],
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
class SwiperMain extends StatefulWidget {
|
|
|
- SwiperMain({Key key,this.type}) : super(key: key);
|
|
|
+ SwiperMain({Key key, this.type}) : super(key: key);
|
|
|
final String type;
|
|
|
+
|
|
|
_SwiperMainState createState() => _SwiperMainState();
|
|
|
}
|
|
|
|
|
|
-class _SwiperMainState extends State<SwiperMain> with AutomaticKeepAliveClientMixin {
|
|
|
+class _SwiperMainState extends State<SwiperMain>
|
|
|
+ with AutomaticKeepAliveClientMixin {
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
- List<MainInfo> infos=List<MainInfo>();
|
|
|
- if(widget.type=="followed"){
|
|
|
- infos=provider.followed;
|
|
|
- }
|
|
|
- else{
|
|
|
- infos=provider.infos;
|
|
|
+ List<MainInfo> infos = List<MainInfo>();
|
|
|
+ if (widget.type == "followed") {
|
|
|
+ infos = provider.followed;
|
|
|
+ } else {
|
|
|
+ infos = provider.infos;
|
|
|
}
|
|
|
return Swiper(
|
|
|
loop: false,
|
|
|
@@ -157,42 +153,10 @@ class _SwiperMainState extends State<SwiperMain> with AutomaticKeepAliveClientMi
|
|
|
bool get wantKeepAlive => true;
|
|
|
}
|
|
|
|
|
|
-// class SwiperMain extends StatelessWidget {
|
|
|
-// const SwiperMain({Key key,@required this.type}) : super(key: key);
|
|
|
-// final String type;
|
|
|
-// @override
|
|
|
-// Widget build(BuildContext context) {
|
|
|
-// RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
-// List<MainInfo> infos=List<MainInfo>();
|
|
|
-// if(type=="followed"){
|
|
|
-// infos=provider.followed;
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// infos=provider.infos;
|
|
|
-// }
|
|
|
-// return Swiper(
|
|
|
-// loop: false,
|
|
|
-// scrollDirection: Axis.vertical,
|
|
|
-// itemCount: infos.length,
|
|
|
-// itemBuilder: (context, index) {
|
|
|
-// MainInfo curData = infos[index];
|
|
|
-// return Container(
|
|
|
-// decoration: BoxDecoration(color: Colors.black),
|
|
|
-// child: Stack(children: [
|
|
|
-// CenterImage(
|
|
|
-// videoPath: curData.videoPath,
|
|
|
-// ),
|
|
|
-// Home(),
|
|
|
-// ]),
|
|
|
-// );
|
|
|
-// },
|
|
|
-// );
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
class BottomSafeBar extends StatelessWidget {
|
|
|
const BottomSafeBar({Key key, @required this.selIndex}) : super(key: key);
|
|
|
final int selIndex;
|
|
|
+
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
@@ -218,6 +182,7 @@ class BottomSafeBar extends StatelessWidget {
|
|
|
class CenterImage extends StatelessWidget {
|
|
|
const CenterImage({Key key, @required this.videoPath}) : super(key: key);
|
|
|
final String videoPath;
|
|
|
+
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
// double bottom = MediaQuery.of(context).viewInsets.bottom;
|
|
|
@@ -267,11 +232,11 @@ class _VideoBackState extends State<VideoBack> {
|
|
|
return Container(
|
|
|
child: _controller.value.initialized
|
|
|
// 加载成功
|
|
|
- ? new AspectRatio(
|
|
|
+ ? AspectRatio(
|
|
|
aspectRatio: _controller.value.aspectRatio,
|
|
|
child: VideoPlayer(_controller),
|
|
|
)
|
|
|
- : new Container(),
|
|
|
+ : Container(),
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
@@ -334,12 +299,11 @@ class _TopTabState extends State<TopTab> with SingleTickerProviderStateMixin {
|
|
|
// TODO: implement initState
|
|
|
super.initState();
|
|
|
// _controller = TabController(vsync: this, length: 2, initialIndex: 1);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
- RecommendProvider provider=Provider.of<RecommendProvider>(context);
|
|
|
+ RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
double rpx = MediaQuery.of(context).size.width / 750;
|
|
|
return Row(
|
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
|
@@ -451,6 +415,7 @@ class _RotateAlbumState extends State<RotateAlbum>
|
|
|
with SingleTickerProviderStateMixin {
|
|
|
AnimationController _controller;
|
|
|
var animation;
|
|
|
+
|
|
|
@override
|
|
|
void initState() {
|
|
|
super.initState();
|
|
|
@@ -625,22 +590,11 @@ class _ButtonListState extends State<ButtonList> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// class ButtonList extends StatelessWidget {
|
|
|
-// const ButtonList({Key key}) : super(key: key);
|
|
|
-
|
|
|
-// @override
|
|
|
-
|
|
|
-// }
|
|
|
-
|
|
|
-// getButtonList(double rpx, RecommendProvider provider, BuildContext context) {
|
|
|
-
|
|
|
-// return
|
|
|
-// }
|
|
|
-
|
|
|
class IconText extends StatelessWidget {
|
|
|
const IconText({Key key, this.icon, this.text}) : super(key: key);
|
|
|
final AnimatedIconWidget icon;
|
|
|
final String text;
|
|
|
+
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
double rpx = MediaQuery.of(context).size.width / 750;
|
|
|
@@ -664,7 +618,6 @@ class IconText extends StatelessWidget {
|
|
|
}
|
|
|
|
|
|
showBottom(context, provider) {
|
|
|
- // RecommendProvider provider = Provider.of<RecommendProvider>(context);
|
|
|
double height = MediaQuery.of(context).size.height;
|
|
|
provider.setScreenHeight(height);
|
|
|
provider.hideBottomBar();
|
|
|
@@ -682,221 +635,3 @@ showBottom(context, provider) {
|
|
|
child: ReplyFullList(pCtx: context)));
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-// import 'package:camera/camera.dart';
|
|
|
-// import 'package:firebase_ml_vision/firebase_ml_vision.dart';
|
|
|
-// import 'package:flutter/foundation.dart';
|
|
|
-// import 'package:flutter/material.dart';
|
|
|
-
|
|
|
-// import 'detector_painters.dart';
|
|
|
-// import 'utils.dart';
|
|
|
-
|
|
|
-// void main() => runApp(MaterialApp(home: MyHomePage()));
|
|
|
-
|
|
|
-// class MyHomePage extends StatefulWidget {
|
|
|
-// @override
|
|
|
-// MyHomePageState createState() => MyHomePageState();
|
|
|
-// }
|
|
|
-
|
|
|
-// class MyHomePageState extends State<MyHomePage> {
|
|
|
-// dynamic _scanResults;
|
|
|
-// CameraController _camera;
|
|
|
-
|
|
|
-// Detector _currentDetector = Detector.text;
|
|
|
-// bool _isDetecting = false;
|
|
|
-// CameraLensDirection _direction = CameraLensDirection.back;
|
|
|
-
|
|
|
-// @override
|
|
|
-// void initState() {
|
|
|
-// super.initState();
|
|
|
-// _initializeCamera();
|
|
|
-// }
|
|
|
-
|
|
|
-// void _initializeCamera() async {
|
|
|
-// CameraDescription description = await getCamera(_direction);
|
|
|
-// ImageRotation rotation = rotationIntToImageRotation(
|
|
|
-// description.sensorOrientation,
|
|
|
-// );
|
|
|
-
|
|
|
-// _camera = CameraController(
|
|
|
-// description,
|
|
|
-// defaultTargetPlatform == TargetPlatform.iOS
|
|
|
-// ? ResolutionPreset.low
|
|
|
-// : ResolutionPreset.high,
|
|
|
-// );
|
|
|
-// await _camera.initialize();
|
|
|
-
|
|
|
-// _camera.startImageStream((CameraImage image) {
|
|
|
-// if (_isDetecting) return;
|
|
|
-
|
|
|
-// _isDetecting = true;
|
|
|
-
|
|
|
-// detect(image, _getDetectionMethod(), rotation).then(
|
|
|
-// (dynamic result) {
|
|
|
-// setState(() {
|
|
|
-// _scanResults = result;
|
|
|
-// });
|
|
|
-
|
|
|
-// _isDetecting = false;
|
|
|
-// },
|
|
|
-// ).catchError(
|
|
|
-// (_) {
|
|
|
-// _isDetecting = false;
|
|
|
-// },
|
|
|
-// );
|
|
|
-// });
|
|
|
-// }
|
|
|
-
|
|
|
-// HandleDetection _getDetectionMethod() {
|
|
|
-// final FirebaseVision mlVision = FirebaseVision.instance;
|
|
|
-
|
|
|
-// switch (_currentDetector) {
|
|
|
-// case Detector.text:
|
|
|
-// return mlVision.textRecognizer().processImage;
|
|
|
-// case Detector.barcode:
|
|
|
-// return mlVision.barcodeDetector().detectInImage;
|
|
|
-// // case Detector.label:
|
|
|
-// // return mlVision.labelDetector().detectInImage;
|
|
|
-// // case Detector.cloudLabel:
|
|
|
-// // return mlVision.cloudLabelDetector().detectInImage;
|
|
|
-// default:
|
|
|
-// assert(_currentDetector == Detector.face);
|
|
|
-// return mlVision.faceDetector().processImage;
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
-// Widget _buildResults() {
|
|
|
-// const Text noResultsText = const Text('No results!');
|
|
|
-
|
|
|
-// if (_scanResults == null ||
|
|
|
-// _camera == null ||
|
|
|
-// !_camera.value.isInitialized) {
|
|
|
-// return noResultsText;
|
|
|
-// }
|
|
|
-
|
|
|
-// CustomPainter painter;
|
|
|
-
|
|
|
-// final Size imageSize = Size(
|
|
|
-// _camera.value.previewSize.height,
|
|
|
-// _camera.value.previewSize.width,
|
|
|
-// );
|
|
|
-
|
|
|
-// switch (_currentDetector) {
|
|
|
-// case Detector.barcode:
|
|
|
-// if (_scanResults is! List<Barcode>) return noResultsText;
|
|
|
-// painter = BarcodeDetectorPainter(imageSize, _scanResults);
|
|
|
-// break;
|
|
|
-// case Detector.face:
|
|
|
-// if (_scanResults is! List<Face>) return noResultsText;
|
|
|
-// painter = FaceDetectorPainter(imageSize, _scanResults);
|
|
|
-// break;
|
|
|
-// // case Detector.label:
|
|
|
-// // if (_scanResults is! List<Label>) return noResultsText;
|
|
|
-// // painter = LabelDetectorPainter(imageSize, _scanResults);
|
|
|
-// // break;
|
|
|
-// // case Detector.cloudLabel:
|
|
|
-// // if (_scanResults is! List<Label>) return noResultsText;
|
|
|
-// // painter = LabelDetectorPainter(imageSize, _scanResults);
|
|
|
-// // break;
|
|
|
-// default:
|
|
|
-// assert(_currentDetector == Detector.text);
|
|
|
-// if (_scanResults is! VisionText) return noResultsText;
|
|
|
-// painter = TextDetectorPainter(imageSize, _scanResults);
|
|
|
-// }
|
|
|
-
|
|
|
-// return CustomPaint(
|
|
|
-// painter: painter,
|
|
|
-// );
|
|
|
-// }
|
|
|
-
|
|
|
-// Widget _buildImage() {
|
|
|
-// return Container(
|
|
|
-// constraints: const BoxConstraints.expand(),
|
|
|
-// child: _camera == null
|
|
|
-// ? const Center(
|
|
|
-// child: Text(
|
|
|
-// 'Initializing Camera...',
|
|
|
-// style: TextStyle(
|
|
|
-// color: Colors.green,
|
|
|
-// fontSize: 30.0,
|
|
|
-// ),
|
|
|
-// ),
|
|
|
-// )
|
|
|
-// : Stack(
|
|
|
-// // fit: StackFit.expand,
|
|
|
-// children: <Widget>[
|
|
|
-// AspectRatio(
|
|
|
-// aspectRatio: _camera.value.aspectRatio,
|
|
|
-// child: CameraPreview(_camera)
|
|
|
-// ),
|
|
|
-// _buildResults(),
|
|
|
-// ],
|
|
|
-// ),
|
|
|
-// );
|
|
|
-// }
|
|
|
-
|
|
|
-// void _toggleCameraDirection() async {
|
|
|
-// if (_direction == CameraLensDirection.back) {
|
|
|
-// _direction = CameraLensDirection.front;
|
|
|
-// } else {
|
|
|
-// _direction = CameraLensDirection.back;
|
|
|
-// }
|
|
|
-
|
|
|
-// await _camera.stopImageStream();
|
|
|
-// await _camera.dispose();
|
|
|
-
|
|
|
-// setState(() {
|
|
|
-// _camera = null;
|
|
|
-// });
|
|
|
-
|
|
|
-// _initializeCamera();
|
|
|
-// }
|
|
|
-
|
|
|
-// @override
|
|
|
-// Widget build(BuildContext context) {
|
|
|
-// return Scaffold(
|
|
|
-// appBar: AppBar(
|
|
|
-// title: const Text('ML Vision Example'),
|
|
|
-// actions: <Widget>[
|
|
|
-// PopupMenuButton<Detector>(
|
|
|
-// onSelected: (Detector result) {
|
|
|
-// _currentDetector = result;
|
|
|
-// },
|
|
|
-// itemBuilder: (BuildContext context) => <PopupMenuEntry<Detector>>[
|
|
|
-// const PopupMenuItem<Detector>(
|
|
|
-// child: Text('Detect Barcode'),
|
|
|
-// value: Detector.barcode,
|
|
|
-// ),
|
|
|
-// const PopupMenuItem<Detector>(
|
|
|
-// child: Text('Detect Face'),
|
|
|
-// value: Detector.face,
|
|
|
-// ),
|
|
|
-// // const PopupMenuItem<Detector>(
|
|
|
-// // child: Text('Detect Label'),
|
|
|
-// // value: Detector.label,
|
|
|
-// // ),
|
|
|
-// // const PopupMenuItem<Detector>(
|
|
|
-// // child: Text('Detect Cloud Label'),
|
|
|
-// // value: Detector.cloudLabel,
|
|
|
-// // ),
|
|
|
-// const PopupMenuItem<Detector>(
|
|
|
-// child: Text('Detect Text'),
|
|
|
-// value: Detector.text,
|
|
|
-// ),
|
|
|
-// ],
|
|
|
-// ),
|
|
|
-// ],
|
|
|
-// ),
|
|
|
-// body: _buildImage(),
|
|
|
-// floatingActionButton: FloatingActionButton(
|
|
|
-// onPressed: _toggleCameraDirection,
|
|
|
-// child: _direction == CameraLensDirection.back
|
|
|
-// ? const Icon(Icons.camera_front)
|
|
|
-// : const Icon(Icons.camera_rear),
|
|
|
-// ),
|
|
|
-// );
|
|
|
-// }
|
|
|
-// }
|
