xt / Flutter-ReserveApp · Commits

Go to a project

Commit cc48c5d65c6b9e83c0712818f9d9608c70b39576

Authored by wdn127929
1 parent a9c6fbff
build: skipped

备注取消限制

Inline Side-by-side
Showing 4 changed files with 51 additions and 50 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 50; 6 + objectVersion = 46;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -550,15 +550,12 @@ @@ -550,15 +550,12 @@
550 ); 550 );
551 INFOPLIST_FILE = Runner/Info.plist; 551 INFOPLIST_FILE = Runner/Info.plist;
552 IPHONEOS_DEPLOYMENT_TARGET = 12.0; 552 IPHONEOS_DEPLOYMENT_TARGET = 12.0;
553 - LD_RUNPATH_SEARCH_PATHS = (  
554 - "$(inherited)",  
555 - "@executable_path/Frameworks",  
556 - ); 553 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
557 LIBRARY_SEARCH_PATHS = ( 554 LIBRARY_SEARCH_PATHS = (
558 "$(inherited)", 555 "$(inherited)",
559 "$(PROJECT_DIR)/Flutter", 556 "$(PROJECT_DIR)/Flutter",
560 ); 557 );
561 - MARKETING_VERSION = 5.1.9; 558 + MARKETING_VERSION = 6.0.0;
562 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 559 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
563 PRODUCT_NAME = Runner; 560 PRODUCT_NAME = Runner;
564 PROVISIONING_PROFILE_SPECIFIER = ""; 561 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -699,15 +696,12 @@ @@ -699,15 +696,12 @@
699 ); 696 );
700 INFOPLIST_FILE = Runner/Info.plist; 697 INFOPLIST_FILE = Runner/Info.plist;
701 IPHONEOS_DEPLOYMENT_TARGET = 12.0; 698 IPHONEOS_DEPLOYMENT_TARGET = 12.0;
702 - LD_RUNPATH_SEARCH_PATHS = (  
703 - "$(inherited)",  
704 - "@executable_path/Frameworks",  
705 - ); 699 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
706 LIBRARY_SEARCH_PATHS = ( 700 LIBRARY_SEARCH_PATHS = (
707 "$(inherited)", 701 "$(inherited)",
708 "$(PROJECT_DIR)/Flutter", 702 "$(PROJECT_DIR)/Flutter",
709 ); 703 );
710 - MARKETING_VERSION = 5.1.9; 704 + MARKETING_VERSION = 6.0.0;
711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 705 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
712 PRODUCT_NAME = Runner; 706 PRODUCT_NAME = Runner;
713 PROVISIONING_PROFILE_SPECIFIER = ""; 707 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -738,15 +732,12 @@ @@ -738,15 +732,12 @@
738 ); 732 );
739 INFOPLIST_FILE = Runner/Info.plist; 733 INFOPLIST_FILE = Runner/Info.plist;
740 IPHONEOS_DEPLOYMENT_TARGET = 12.0; 734 IPHONEOS_DEPLOYMENT_TARGET = 12.0;
741 - LD_RUNPATH_SEARCH_PATHS = (  
742 - "$(inherited)",  
743 - "@executable_path/Frameworks",  
744 - ); 735 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
745 LIBRARY_SEARCH_PATHS = ( 736 LIBRARY_SEARCH_PATHS = (
746 "$(inherited)", 737 "$(inherited)",
747 "$(PROJECT_DIR)/Flutter", 738 "$(PROJECT_DIR)/Flutter",
748 ); 739 );
749 - MARKETING_VERSION = 5.1.9; 740 + MARKETING_VERSION = 6.0.0;
750 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 741 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
751 PRODUCT_NAME = Runner; 742 PRODUCT_NAME = Runner;
752 PROVISIONING_PROFILE_SPECIFIER = ""; 743 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2,6 +2,10 @@ @@ -2,6 +2,10 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
  5 + <key>LSSupportsOpeningDocumentsInPlace</key>
  6 + <true/>
  7 + <key>UIFileSharingEnabled</key>
  8 + <true/>
5 <key>CADisableMinimumFrameDurationOnPhone</key> 9 <key>CADisableMinimumFrameDurationOnPhone</key>
6 <true/> 10 <true/>
7 <key>CFBundleAllowMixedLocalizations</key> 11 <key>CFBundleAllowMixedLocalizations</key>
@@ -103,8 +103,13 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> { @@ -103,8 +103,13 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> {
103 final directory = await getExternalStorageDirectory(); 103 final directory = await getExternalStorageDirectory();
104 externalStorageDirPath = directory?.path; 104 externalStorageDirPath = directory?.path;
105 } else if (Platform.isIOS) { 105 } else if (Platform.isIOS) {
  106 + // externalStorageDirPath =
  107 + // (await getApplicationDocumentsDirectory()).absolute.path;
  108 +
  109 + externalStorageDirPath = (await getTemporaryDirectory()).path;
  110 +
106 externalStorageDirPath = 111 externalStorageDirPath =
107 - (await getApplicationDocumentsDirectory()).absolute.path; 112 + externalStorageDirPath.replaceFirst("Library/Caches", "Documents");
108 } 113 }
109 return externalStorageDirPath; 114 return externalStorageDirPath;
110 } 115 }
@@ -33,7 +33,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -33,7 +33,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
33 TextEditingController _controller = TextEditingController(); 33 TextEditingController _controller = TextEditingController();
34 FocusNode focusNode = FocusNode(); 34 FocusNode focusNode = FocusNode();
35 35
36 - int alwaysCount = 0; //常用备注数 36 + // int alwaysCount = 0; //常用备注数
37 37
38 @override 38 @override
39 void initState() { 39 void initState() {
@@ -66,10 +66,10 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -66,10 +66,10 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
66 66
67 //添加常用备注 67 //添加常用备注
68 _addCustomRemark(Remark remark) { 68 _addCustomRemark(Remark remark) {
69 - if (alwaysCount >= 10) {  
70 - Utils.showToast("最多添加10个常用备注");  
71 - return;  
72 - } 69 + // if (alwaysCount >= 10) {
  70 + // Utils.showToast("最多添加10个常用备注");
  71 + // return;
  72 + // }
73 Map<String, String> params = { 73 Map<String, String> params = {
74 "uid": Provider.of<UserModel>(context, listen: false).user.openid, 74 "uid": Provider.of<UserModel>(context, listen: false).user.openid,
75 "kid": remark.id, 75 "kid": remark.id,
@@ -95,7 +95,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -95,7 +95,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
95 for (Remark remark in remarkManagerModel.remarks) { 95 for (Remark remark in remarkManagerModel.remarks) {
96 if (remark.oftenUse != null && remark.oftenUse.isNotEmpty) 96 if (remark.oftenUse != null && remark.oftenUse.isNotEmpty)
97 always.add(Container( 97 always.add(Container(
98 - height: ScreenUtil().setWidth(50), 98 + // height: ScreenUtil().setWidth(50),
99 decoration: BoxDecoration( 99 decoration: BoxDecoration(
100 color: MyColours.color_199095, 100 color: MyColours.color_199095,
101 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))), 101 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
@@ -110,7 +110,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -110,7 +110,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
110 fontSize: ScreenUtil().setSp(30), 110 fontSize: ScreenUtil().setSp(30),
111 color: MyColours.color_ffffff, 111 color: MyColours.color_ffffff,
112 ), 112 ),
113 - overflow: TextOverflow.ellipsis, 113 + // overflow: TextOverflow.ellipsis,
114 ), 114 ),
115 ), 115 ),
116 ), 116 ),
@@ -138,7 +138,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -138,7 +138,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
138 ]), 138 ]),
139 )); 139 ));
140 } 140 }
141 - alwaysCount = always.length; 141 + // alwaysCount = always.length;
142 return always; 142 return always;
143 } 143 }
144 144
@@ -149,17 +149,17 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -149,17 +149,17 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
149 alls.add( 149 alls.add(
150 GestureDetector( 150 GestureDetector(
151 onTap: () { 151 onTap: () {
152 - if (alwaysCount >= 10) {  
153 - Utils.showToast("最多添加10个常用备注");  
154 - return;  
155 - } 152 + // if (alwaysCount >= 10) {
  153 + // Utils.showToast("最多添加10个常用备注");
  154 + // return;
  155 + // }
156 setState(() { 156 setState(() {
157 remark.oftenUse = remark.custom; 157 remark.oftenUse = remark.custom;
158 _addCustomRemark(remark); 158 _addCustomRemark(remark);
159 }); 159 });
160 }, 160 },
161 child: Container( 161 child: Container(
162 - height: ScreenUtil().setWidth(50), 162 + // height: ScreenUtil().setWidth(50),
163 padding: 163 padding:
164 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)), 164 EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
165 decoration: 165 decoration:
@@ -186,7 +186,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -186,7 +186,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
186 ? MyColours.color_ffffff 186 ? MyColours.color_ffffff
187 : MyColours.color_199095, 187 : MyColours.color_199095,
188 ), 188 ),
189 - overflow: TextOverflow.ellipsis, 189 + // overflow: TextOverflow.ellipsis,
190 )), 190 )),
191 ]), 191 ]),
192 )), 192 )),
@@ -215,7 +215,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -215,7 +215,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
215 textAlignVertical: TextAlignVertical.center, 215 textAlignVertical: TextAlignVertical.center,
216 keyboardType: TextInputType.text, 216 keyboardType: TextInputType.text,
217 decoration: InputDecoration.collapsed(hintText: ""), 217 decoration: InputDecoration.collapsed(hintText: ""),
218 - inputFormatters: [LengthLimitingTextInputFormatter(10)], 218 + // inputFormatters: [LengthLimitingTextInputFormatter(10)],
219 style: TextStyle( 219 style: TextStyle(
220 color: MyColours.color_353535, 220 color: MyColours.color_353535,
221 fontSize: ScreenUtil().setSp(30), 221 fontSize: ScreenUtil().setSp(30),
@@ -236,10 +236,10 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -236,10 +236,10 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
236 )) 236 ))
237 : GestureDetector( 237 : GestureDetector(
238 onTap: () { 238 onTap: () {
239 - if (remarkManagerModel.remarks.length >= 30) {  
240 - Utils.showToast("最多添加30个备注");  
241 - return;  
242 - } 239 + // if (remarkManagerModel.remarks.length >= 30) {
  240 + // Utils.showToast("最多添加30个备注");
  241 + // return;
  242 + // }
243 243
244 setState(() { 244 setState(() {
245 isAdding = true; 245 isAdding = true;
@@ -313,7 +313,8 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -313,7 +313,8 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
313 showMsg: "加载中，请稍后...", 313 showMsg: "加载中，请稍后...",
314 ); 314 );
315 } else { 315 } else {
316 - return Container( 316 + return SingleChildScrollView(
  317 + child: Container(
317 padding: EdgeInsets.symmetric( 318 padding: EdgeInsets.symmetric(
318 horizontal: ScreenUtil().setWidth(40)), 319 horizontal: ScreenUtil().setWidth(40)),
319 child: Column( 320 child: Column(
@@ -330,12 +331,12 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -330,12 +331,12 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
330 fontSize: ScreenUtil().setSp(30), 331 fontSize: ScreenUtil().setSp(30),
331 fontWeight: FontWeight.bold), 332 fontWeight: FontWeight.bold),
332 ), 333 ),
333 - Text(  
334 - "（最多添加10个）",  
335 - style: TextStyle(  
336 - color: MyColours.color_666666,  
337 - fontSize: ScreenUtil().setSp(26)),  
338 - ), 334 + // Text(
  335 + // "（最多添加10个）",
  336 + // style: TextStyle(
  337 + // color: MyColours.color_666666,
  338 + // fontSize: ScreenUtil().setSp(26)),
  339 + // ),
339 ], 340 ],
340 ), 341 ),
341 Padding( 342 Padding(
@@ -362,12 +363,12 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -362,12 +363,12 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
362 fontSize: ScreenUtil().setSp(30), 363 fontSize: ScreenUtil().setSp(30),
363 fontWeight: FontWeight.bold), 364 fontWeight: FontWeight.bold),
364 ), 365 ),
365 - Text(  
366 - "（最多添加30个）",  
367 - style: TextStyle(  
368 - color: MyColours.color_666666,  
369 - fontSize: ScreenUtil().setSp(26)),  
370 - ), 366 + // Text(
  367 + // "（最多添加30个）",
  368 + // style: TextStyle(
  369 + // color: MyColours.color_666666,
  370 + // fontSize: ScreenUtil().setSp(26)),
  371 + // ),
371 ], 372 ],
372 ), 373 ),
373 Padding( 374 Padding(
@@ -380,7 +381,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> { @@ -380,7 +381,7 @@ class RemarkManagerPageState extends State<RemarkManagerPage> {
380 ) 381 )
381 ], 382 ],
382 ), 383 ),
383 - ); 384 + ));
384 } 385 }
385 }, 386 },
386 ), 387 ),