Skip to content

Commit

Permalink
DEV UPDATE:#8
Browse files Browse the repository at this point in the history
  • Loading branch information
misakajimmy committed Mar 12, 2023
1 parent b201c5a commit ca72d09
Show file tree
Hide file tree
Showing 21 changed files with 265 additions and 153 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Jsons/videoPage.json → Jsons/videoPageTab.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"key": "ugc",
"name": "二创",
"banners": "$[]banner",
"banners": "$[]videoBanner",
"videos": "$[]videoPageVideo"
}
3 changes: 3 additions & 0 deletions Jsons/videoPageTabs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"data": "$[]videoPageTab"
}
Binary file removed assets/banner1.png
Binary file not shown.
Binary file removed assets/banner2.png
Binary file not shown.
Binary file removed assets/banner3.png
Binary file not shown.
11 changes: 4 additions & 7 deletions lib/common/Api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,22 @@ class Api {
}

// Future<Video>
Future<VideoPage> getVideoPage() async {
var tmpVideoPage = VideoPage();

Future<List<VideoPageTab>> getVideoPage() async {
try {
var paramsData = ({'subscription-key': key});
paramsData.removeWhere((key, value) => value == null);
var r = await dio.get('/video-page', queryParameters: paramsData);

if (r.statusCode == 200) {
var videoPageRes =
IResponse<VideoPage>.fromJson(r.data, (json) => VideoPage.fromJson(json));
var videoPageRes = VideoPageTabs.fromJson(r.data);
if (videoPageRes.data != null) {
tmpVideoPage = videoPageRes.data!;
return videoPageRes.data;
}
}
} catch (e) {
print(e);
}
return tmpVideoPage;
return [];
}

Future<Pictures> picturesRecommend(PicturesRequest params) async {
Expand Down
3 changes: 3 additions & 0 deletions lib/common/Global.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:convert';

import 'package:EOEFANS/models/eoeTheme.dart';
import 'package:EOEFANS/models/member.dart';
import 'package:EOEFANS/models/videoPageTab.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:shared_preferences/shared_preferences.dart';
Expand Down Expand Up @@ -92,6 +93,8 @@ class Global {

static late PackageInfo packageInfo;

static List<VideoPageTab> videoTabs = [];

//初始化全局信息,会在App启动时启动
static Future init() async {
WidgetsFlutterBinding.ensureInitialized();
Expand Down
5 changes: 4 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:io';

import 'package:EOEFANS/models/videoPageTab.dart';
import 'package:EOEFANS/routes/mainPage.dart';
import 'package:EOEFANS/routes/setting/aboutUs.dart';
import 'package:EOEFANS/routes/setting/settingPage.dart';
Expand All @@ -10,8 +11,10 @@ import 'package:EOEFANS/states/ProfileChangeNotifier.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:EOEFANS/common/Api.dart';
import 'package:EOEFANS/models/videoPageTab.dart';
import 'package:EOEFANS/common/Global.dart';

import 'common/Global.dart';

Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
Expand Down
5 changes: 3 additions & 2 deletions lib/models/index.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
export 'banner.dart' ;
export 'cacheConfig.dart' ;
export 'dynamic.dart' ;
export 'picture.dart' ;
export 'pictures.dart' ;
export 'version.dart' ;
export 'video.dart' ;
export 'videoPage.dart' ;
export 'videoBanner.dart' ;
export 'videoPageTab.dart' ;
export 'videoPageTabs.dart' ;
export 'videoPageVideo.dart' ;
export 'videos.dart' ;
15 changes: 15 additions & 0 deletions lib/models/videoBanner.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import 'package:json_annotation/json_annotation.dart';

part 'videoBanner.g.dart';

@JsonSerializable()
class VideoBanner {
VideoBanner();

late String image;
late String url;
late num rank;

factory VideoBanner.fromJson(Map<String,dynamic> json) => _$VideoBannerFromJson(json);
Map<String, dynamic> toJson() => _$VideoBannerToJson(this);
}
19 changes: 19 additions & 0 deletions lib/models/videoBanner.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions lib/models/videoPage.dart

This file was deleted.

17 changes: 17 additions & 0 deletions lib/models/videoPageTab.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import 'package:json_annotation/json_annotation.dart';
import "videoBanner.dart";
import "videoPageVideo.dart";
part 'videoPageTab.g.dart';

@JsonSerializable()
class VideoPageTab {
VideoPageTab();

late String key;
late String name;
late List<VideoBanner> banners;
late List<VideoPageVideo> videos;

factory VideoPageTab.fromJson(Map<String,dynamic> json) => _$VideoPageTabFromJson(json);
Map<String, dynamic> toJson() => _$VideoPageTabToJson(this);
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions lib/models/videoPageTabs.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import 'package:json_annotation/json_annotation.dart';
import "videoPageTab.dart";
part 'videoPageTabs.g.dart';

@JsonSerializable()
class VideoPageTabs {
VideoPageTabs();

late List<VideoPageTab> data;

factory VideoPageTabs.fromJson(Map<String,dynamic> json) => _$VideoPageTabsFromJson(json);
Map<String, dynamic> toJson() => _$VideoPageTabsToJson(this);
}
18 changes: 18 additions & 0 deletions lib/models/videoPageTabs.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion lib/routes/splashPage.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import 'dart:async';

import 'package:EOEFANS/common/Api.dart';
import 'package:EOEFANS/models/videoPageTab.dart';
import 'package:flutter/material.dart';
import 'package:EOEFANS/common/Global.dart';


class SplashScreen extends StatefulWidget {
const SplashScreen({Key? key}) : super(key: key);
Expand All @@ -14,10 +18,17 @@ class _SplashScreenState extends State<SplashScreen> {

@override
void initState() {
startTime();
// startTime();
getVideoPage();
super.initState();
}

getVideoPage() async {
List<VideoPageTab> tabs = await Api(context).getVideoPage();
Global.videoTabs = tabs;
Navigator.of(context).pushReplacementNamed('/main');
}

startTime() {
_timer = Timer(Duration(milliseconds: 2000), () {
_timer.cancel();
Expand Down
Loading

0 comments on commit ca72d09

Please sign in to comment.