浏览代码

修改文件名

tags/0.0.2
Weller 4 年前
父节点
当前提交
d3b58b2102
共有 8 个文件被更改,包括 34 次插入25 次删除
  1. +1
    -1
      .dart_tool/package_config.json
  2. +8
    -5
      example/ios/Runner/Base.lproj/Main.storyboard
  3. +7
    -7
      lib/pages/wallet_page/wallet_page_bloc.dart
  4. +14
    -9
      lib/widgets/home/home_banner/bloc/home_banner_repository.dart
  5. +1
    -1
      lib/widgets/home/home_banner/bloc/home_banner_state.dart
  6. +3
    -2
      lib/widgets/home/home_banner/home_banner_widget.dart
  7. +0
    -0
      lib/widgets/home/home_banner/model/home_banner_model.dart
  8. +0
    -0
      lib/widgets/wallet/wallet_appbar/model/wallet_appbar_model.dart

+ 1
- 1
.dart_tool/package_config.json 查看文件

@@ -620,7 +620,7 @@
"languageVersion": "2.8" "languageVersion": "2.8"
} }
], ],
"generated": "2020-10-27T02:24:43.007495Z",
"generated": "2020-11-02T09:37:11.598457Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "2.8.2" "generatorVersion": "2.8.2"
} }

+ 8
- 5
example/ios/Runner/Base.lproj/Main.storyboard 查看文件

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Flutter View Controller--> <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/> <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC"> <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="25" y="29"/>
</scene> </scene>
</scenes> </scenes>
</document> </document>

+ 7
- 7
lib/pages/wallet_page/wallet_page_bloc.dart 查看文件

@@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:zhiying_base_widget/utils/contants.dart'; import 'package:zhiying_base_widget/utils/contants.dart';
import 'package:zhiying_base_widget/widgets/wallet/wallet_appbar/model/WalletAppbarModel.dart';
import 'package:zhiying_base_widget/widgets/wallet/wallet_appbar/model/wallet_appbar_model.dart';
import 'package:zhiying_base_widget/widgets/wallet/wallet_data/model/wallet_header_model.dart'; import 'package:zhiying_base_widget/widgets/wallet/wallet_data/model/wallet_header_model.dart';
import 'package:zhiying_comm/util/base_bloc.dart'; import 'package:zhiying_comm/util/base_bloc.dart';
import 'package:zhiying_comm/zhiying_comm.dart'; import 'package:zhiying_comm/zhiying_comm.dart';
@@ -11,7 +11,7 @@ import 'package:zhiying_comm/zhiying_comm.dart';
class WalletPageBloc extends BlocBase { class WalletPageBloc extends BlocBase {


StreamController<List<Map<String, dynamic>>> _tabController = StreamController<List<Map<String, dynamic>>> _tabController =
StreamController<List<Map<String, dynamic>>>();
StreamController<List<Map<String, dynamic>>>();


Stream<List<Map<String, dynamic>>> get outData => _tabController.stream; Stream<List<Map<String, dynamic>>> get outData => _tabController.stream;


@@ -26,10 +26,10 @@ class WalletPageBloc extends BlocBase {
loadData(String skipIdentifier) { loadData(String skipIdentifier) {
NetUtil.request('/api/v1/mod/${skipIdentifier}', method: NetMethod.GET, NetUtil.request('/api/v1/mod/${skipIdentifier}', method: NetMethod.GET,
onCache: (data) { onCache: (data) {
_loadData(data);
}, onSuccess: (data) {
_loadData(data);
});
_loadData(data);
}, onSuccess: (data) {
_loadData(data);
});
} }


void refresh() {} void refresh() {}
@@ -43,7 +43,7 @@ class WalletPageBloc extends BlocBase {
for (var item in list) { for (var item in list) {
if (item['mod_name'] == "my_wallet_appbar") { if (item['mod_name'] == "my_wallet_appbar") {
WalletAppbarModel walletAppbarModel = WalletAppbarModel walletAppbarModel =
WalletAppbarModel.fromJson(json.decode(item["data"]));
WalletAppbarModel.fromJson(json.decode(item["data"]));
backgroundColor = HexColor.fromHex(walletAppbarModel.appBarBgColor); backgroundColor = HexColor.fromHex(walletAppbarModel.appBarBgColor);
break; break;
} }


+ 14
- 9
lib/widgets/home/home_banner/bloc/home_banner_repository.dart 查看文件

@@ -1,41 +1,46 @@
import 'dart:convert'; import 'dart:convert';


import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/HomeBannerModel.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/home_banner_model.dart';
import 'package:zhiying_comm/zhiying_comm.dart'; import 'package:zhiying_comm/zhiying_comm.dart';
import 'package:zhiying_comm/util/net_util.dart'; import 'package:zhiying_comm/util/net_util.dart';


class HomeBannerRepository { class HomeBannerRepository {
/// 读取缓存数据 /// 读取缓存数据
Future<HomeBannerModel> fetchCacheData({@required Map<String, dynamic> model}) async {
Future<HomeBannerModel> fetchCacheData(
{@required Map<String, dynamic> model}) async {
var result = await NetUtil.getRequestCachedData('/api/v1/mod', params: { var result = await NetUtil.getRequestCachedData('/api/v1/mod', params: {
'ids': [model['mod_id']] 'ids': [model['mod_id']]
}); });
if(NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])){
return HomeBannerModel.fromJson(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
if (NetUtil.isSuccess(result) &&
!EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) {
return HomeBannerModel.fromJson(
result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
} }
return null; return null;
} }




/// 获取父类传进来的数据 /// 获取父类传进来的数据
Future<HomeBannerModel> fetchParentData({@required Map<String, dynamic> model}) async{
Future<HomeBannerModel> fetchParentData(
{@required Map<String, dynamic> model}) async {
try { try {
String jsonInfo = model['data']; String jsonInfo = model['data'];
if (!EmptyUtil.isEmpty(jsonInfo)) { if (!EmptyUtil.isEmpty(jsonInfo)) {
return HomeBannerModel.fromJson(jsonDecode(jsonInfo)); return HomeBannerModel.fromJson(jsonDecode(jsonInfo));
} }
}catch(e){
} catch (e) {
Logger.log(e); Logger.log(e);
} }
return null; return null;
} }


/// 获取网路数据 /// 获取网路数据
Future<HomeBannerModel> fetchNetData({@required Map<String, dynamic> model}) async {
Future<HomeBannerModel> fetchNetData(
{@required Map<String, dynamic> model}) async {
// print('请求 modId = $model['mod_id']'); // print('请求 modId = $model['mod_id']');
var result = await NetUtil.post('/api/v1/mod', params: {'ids': [model['mod_id']]}, cache: true);
var result = await NetUtil.post(
'/api/v1/mod', params: {'ids': [model['mod_id']]}, cache: true);
if (NetUtil.isSuccess(result)) { if (NetUtil.isSuccess(result)) {
return HomeBannerModel.fromJson(result); return HomeBannerModel.fromJson(result);
} }


+ 1
- 1
lib/widgets/home/home_banner/bloc/home_banner_state.dart 查看文件

@@ -1,5 +1,5 @@
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/HomeBannerModel.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/home_banner_model.dart';


abstract class HomeBannerState extends Equatable { abstract class HomeBannerState extends Equatable {
const HomeBannerState(); const HomeBannerState();


+ 3
- 2
lib/widgets/home/home_banner/home_banner_widget.dart 查看文件

@@ -4,7 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/bloc/bloc.dart'; import 'package:zhiying_base_widget/widgets/home/home_banner/bloc/bloc.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/bloc/home_banner_repository.dart'; import 'package:zhiying_base_widget/widgets/home/home_banner/bloc/home_banner_repository.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_sk.dart'; import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_sk.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/HomeBannerModel.dart';
import 'package:zhiying_base_widget/widgets/home/home_banner/model/home_banner_model.dart';
import 'package:zhiying_comm/zhiying_comm.dart'; import 'package:zhiying_comm/zhiying_comm.dart';


/// ///
@@ -23,7 +23,8 @@ class _HomeBannerWidgetState extends State<HomeBannerWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocProvider<HomeBannerBloc>( return BlocProvider<HomeBannerBloc>(
create: (_) => HomeBannerBloc(repository: HomeBannerRepository())
create: (_) =>
HomeBannerBloc(repository: HomeBannerRepository())
..add(HomeBannerInitEvent(widget.model)), ..add(HomeBannerInitEvent(widget.model)),
child: HomeBannerContainer( child: HomeBannerContainer(
model: widget.model, model: widget.model,


lib/widgets/home/home_banner/model/HomeBannerModel.dart → lib/widgets/home/home_banner/model/home_banner_model.dart 查看文件


lib/widgets/wallet/wallet_appbar/model/WalletAppbarModel.dart → lib/widgets/wallet/wallet_appbar/model/wallet_appbar_model.dart 查看文件


正在加载...
取消
保存