xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6f3f8eec79993d2a713414e6cf39564d0ecccf06

Authored by 蓋亞光
2 parents 24d952cc 415b296c
build: skipped

测试v1.6.2

Inline Side-by-side
Showing 4 changed files with 57 additions and 50 deletions
... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "161"
def flutterVersionCode = "162"
if (flutterVersionCode == null) {
flutterVersionCode = '161'
flutterVersionCode = '162'
}
def flutterVersionName = "1.6.1"
def flutterVersionName = "1.6.2"
if (flutterVersionName == null) {
flutterVersionName = '1.6.1'
flutterVersionName = '1.6.2'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -596,7 +596,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
if (value.isEmpty || value.length >= 11) {
//内容为空，或 超过11位
setState(() {
showPhoneHistory = false;
_notebookDetailChangeModel.userHistorys.clear();
});
return;
... ... @@ -700,10 +699,10 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
InkWell(
onTap: () {
DialogUtil.showRemarkDialog(
context, remarkManagerModel.remarks, (item) {
context, remarkManagerModel.ofenRemarks, (item) {
int index =
remarkManagerModel.remarks.indexOf(item);
_refreshRemark(remarkManagerModel.remarks, index);
remarkManagerModel.ofenRemarks.indexOf(item);
_refreshRemark(remarkManagerModel.ofenRemarks, index);
});
},
child: Container(
... ... @@ -821,10 +820,10 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_remarkListWidget() {
List<Remark> remark = [];
if (remarkManagerModel.remarks.length > 4) {
remark = remarkManagerModel.remarks.sublist(0, 5);
if (remarkManagerModel.ofenRemarks.length > 4) {
remark = remarkManagerModel.ofenRemarks.sublist(0, 5);
} else {
remark = remarkManagerModel.remarks;
remark = remarkManagerModel.ofenRemarks;
}
return Container(
height: ScreenUtil().setWidth(50),
... ...
... ... @@ -10,22 +10,22 @@ import 'package:one_key/net/http_url.dart';
/**
* 常用备注管理
*/
class RemarkManagerModel extends ChangeNotifier{
List<Remark> remarks=[];//所有备注
class RemarkManagerModel extends ChangeNotifier {
List<Remark> remarks = []; //所有备注
List<Remark> ofenRemarks = []; //常用备注
PageState pageState = PageState.Loading;
//获取备注
getRemarks(BuildContext context, Map<String, String> params,{bool showPageLoading=false}) async {
if(showPageLoading){
getRemarks(BuildContext context, Map<String, String> params,
{bool showPageLoading = false}) async {
if (showPageLoading) {
pageState = PageState.Loading;
notifyListeners();
}
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_custom_remark,
data: params, showLoading: showPageLoading?false:true)
data: params, showLoading: showPageLoading ? false : true)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -47,6 +47,12 @@ class RemarkManagerModel extends ChangeNotifier{
remarks = baseResp.data.map<Remark>((value) {
return Remark.fromJson(value);
}).toList();
ofenRemarks = [];
for (Remark item in remarks) {
if (item.oftenUse != '') {
ofenRemarks.add(item);
}
}
if (remarks.isEmpty) {
pageState = PageState.Empty;
} else {
... ... @@ -60,22 +66,21 @@ class RemarkManagerModel extends ChangeNotifier{
Future addRemark(BuildContext context, Map<String, String> params) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.add_custom_remark,
data: params, showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
});
return ;
return;
}
//删除备注
delRemark(BuildContext context, Map<String, String> params) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.del_custom_remark,
data: params, showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
});
if (baseResp != null && baseResp.code == Constant.status_success) {
}
if (baseResp != null && baseResp.code == Constant.status_success) {}
}
}
\ No newline at end of file
}
... ...
... ... @@ -47,34 +47,37 @@ class DialogUtil {
children: <Widget>[
VEmptyView(40),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: Stack(
children: [
Center(
child: Text(
'更多标签',
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_353535,
onTap: () {
Navigator.pop(context);
},
child: Container(
height: ScreenUtil().setWidth(44),
// color: Colors.red,
child: Stack(
children: [
Center(
child: Text(
'更多标签',
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_353535,
),
softWrap: true,
textAlign: TextAlign.center,
),
),
softWrap: true,
textAlign: TextAlign.center,
),
Positioned(
top: ScreenUtil().setWidth(10),
right: ScreenUtil().setWidth(40),
child: Image.asset(
Utils.getImgPath('close1'),
width: ScreenUtil().setWidth(28),
height: ScreenUtil().setWidth(28),
),
)
],
),
Positioned(
top: ScreenUtil().setWidth(10),
right: ScreenUtil().setWidth(40),
child: Image.asset(
Utils.getImgPath('close1'),
width: ScreenUtil().setWidth(28),
height: ScreenUtil().setWidth(28),
),
)
],
),
),
)),
VEmptyView(60),
Container(
padding: EdgeInsets.symmetric(
... ...