Commit 96319ce56fc144b565b82665881ba1e50b7f0e41

Authored by wdn127929
1 parent 522a2786

线上5.1.5版本

@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "516" 21 +def flutterVersionCode = "515"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '516' 23 + flutterVersionCode = '515'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.1.6" 30 +def flutterVersionName = "5.1.5"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.1.6' 33 + flutterVersionName = '5.1.5'
34 34
35 35
36 } 36 }
@@ -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 */
@@ -532,7 +532,7 @@ @@ -532,7 +532,7 @@
532 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 532 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
533 CODE_SIGN_IDENTITY = "Apple Development"; 533 CODE_SIGN_IDENTITY = "Apple Development";
534 CODE_SIGN_STYLE = Automatic; 534 CODE_SIGN_STYLE = Automatic;
535 - CURRENT_PROJECT_VERSION = 5155; 535 + CURRENT_PROJECT_VERSION = 515;
536 DEVELOPMENT_TEAM = 8J59HM8B82; 536 DEVELOPMENT_TEAM = 8J59HM8B82;
537 ENABLE_BITCODE = NO; 537 ENABLE_BITCODE = NO;
538 FLUTTER_BUILD_MODE = release; 538 FLUTTER_BUILD_MODE = release;
@@ -678,7 +678,7 @@ @@ -678,7 +678,7 @@
678 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 678 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
679 CODE_SIGN_IDENTITY = "Apple Development"; 679 CODE_SIGN_IDENTITY = "Apple Development";
680 CODE_SIGN_STYLE = Automatic; 680 CODE_SIGN_STYLE = Automatic;
681 - CURRENT_PROJECT_VERSION = 5155; 681 + CURRENT_PROJECT_VERSION = 515;
682 DEVELOPMENT_TEAM = 8J59HM8B82; 682 DEVELOPMENT_TEAM = 8J59HM8B82;
683 ENABLE_BITCODE = NO; 683 ENABLE_BITCODE = NO;
684 FLUTTER_BUILD_MODE = release; 684 FLUTTER_BUILD_MODE = release;
@@ -714,7 +714,7 @@ @@ -714,7 +714,7 @@
714 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 714 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
715 CODE_SIGN_IDENTITY = "Apple Development"; 715 CODE_SIGN_IDENTITY = "Apple Development";
716 CODE_SIGN_STYLE = Automatic; 716 CODE_SIGN_STYLE = Automatic;
717 - CURRENT_PROJECT_VERSION = 5155; 717 + CURRENT_PROJECT_VERSION = 515;
718 DEVELOPMENT_TEAM = 8J59HM8B82; 718 DEVELOPMENT_TEAM = 8J59HM8B82;
719 ENABLE_BITCODE = NO; 719 ENABLE_BITCODE = NO;
720 FLUTTER_BUILD_MODE = release; 720 FLUTTER_BUILD_MODE = release;
@@ -1517,8 +1517,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1517,8 +1517,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1517 1517
1518 // 消费 1518 // 消费
1519 1519
1520 - _consume(state),  
1521 - VEmptyView(40), 1520 + // _consume(state),
  1521 + // VEmptyView(40),
1522 _advancedFilterWidget(state) 1522 _advancedFilterWidget(state)
1523 ], 1523 ],
1524 ), 1524 ),
@@ -1667,8 +1667,8 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1667,8 +1667,8 @@ class _CustomerListPageState extends State<CustomerListPage>
1667 VEmptyView(40), 1667 VEmptyView(40),
1668 _labelWidget(state), 1668 _labelWidget(state),
1669 VEmptyView(40), 1669 VEmptyView(40),
1670 - _consume(state),  
1671 - VEmptyView(40), 1670 + // _consume(state),
  1671 + // VEmptyView(40),
1672 _advancedFilterWidget(state) 1672 _advancedFilterWidget(state)
1673 ], 1673 ],
1674 ), 1674 ),
@@ -436,12 +436,12 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -436,12 +436,12 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
436 noticeSms = !noticeSms; 436 noticeSms = !noticeSms;
437 }); 437 });
438 }), 438 }),
439 - _itemSmsWidget(marketingSms, '使用店铺手机发送营销短信',  
440 - onTap: () {  
441 - setState(() {  
442 - marketingSms = !marketingSms;  
443 - });  
444 - }), 439 + // _itemSmsWidget(marketingSms, '使用店铺手机发送营销短信',
  440 + // onTap: () {
  441 + // setState(() {
  442 + // marketingSms = !marketingSms;
  443 + // });
  444 + // }),
445 VEmptyView(24), 445 VEmptyView(24),
446 446
447 _title('微信通知'), 447 _title('微信通知'),
  1 +
  2 +
1 // 计算阳历的这个年份这个月份,天数有几天 3 // 计算阳历的这个年份这个月份,天数有几天
2 4
3 getYangliDay(year, month) { 5 getYangliDay(year, month) {
  1 +/**
  2 + * 农历的工具类
  3 + */
  4 +class LunarCalendarUtil {
  5 + /**
  6 + * 支持转换的最小农历年份
  7 + */
  8 + static final int MIN_YEAR = 1900;
  9 +
  10 + /**
  11 + * 支持转换的最大农历年份
  12 + */
  13 + static final int MAX_YEAR = 2099;
  14 + /**
  15 + * 公历每月前的天数
  16 + */
  17 + static final List<int> DAYS_BEFORE_MONTH = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
  18 +
  19 + /**
  20 + * 用来表示1900年到2099年间农历年份的相关信息,共24位bit的16进制表示,其中:
  21 + * 1. 前4位表示该年闰哪个月;
  22 + * 2. 5-17位表示农历年份13个月的大小月分布,0表示小,1表示大;
  23 + * 3. 最后7位表示农历年首(正月初一)对应的公历日期。
  24 + * 以2014年的数据0x955ABF为例说明:
  25 + * 1001 0101 0101 1010 1011 1111
  26 + * 闰九月 农历正月初一对应公历1月31号
  27 + */
  28 + static final List<int> LUNAR_INFO = [
  29 + /*1900*/
  30 + 0x84B6BF,
  31 + /*1901-1910*/
  32 + 0x04AE53, 0x0A5748, 0x5526BD, 0x0D2650, 0x0D9544, 0x46AAB9, 0x056A4D, 0x09AD42, 0x24AEB6, 0x04AE4A,
  33 + /*1911-1920*/
  34 + 0x6A4DBE, 0x0A4D52, 0x0D2546, 0x5D52BA, 0x0B544E, 0x0D6A43, 0x296D37, 0x095B4B, 0x749BC1, 0x049754,
  35 + /*1921-1930*/
  36 + 0x0A4B48, 0x5B25BC, 0x06A550, 0x06D445, 0x4ADAB8, 0x02B64D, 0x095742, 0x2497B7, 0x04974A, 0x664B3E,
  37 + /*1931-1940*/
  38 + 0x0D4A51, 0x0EA546, 0x56D4BA, 0x05AD4E, 0x02B644, 0x393738, 0x092E4B, 0x7C96BF, 0x0C9553, 0x0D4A48,
  39 + /*1941-1950*/
  40 + 0x6DA53B, 0x0B554F, 0x056A45, 0x4AADB9, 0x025D4D, 0x092D42, 0x2C95B6, 0x0A954A, 0x7B4ABD, 0x06CA51,
  41 + /*1951-1960*/
  42 + 0x0B5546, 0x555ABB, 0x04DA4E, 0x0A5B43, 0x352BB8, 0x052B4C, 0x8A953F, 0x0E9552, 0x06AA48, 0x6AD53C,
  43 + /*1961-1970*/
  44 + 0x0AB54F, 0x04B645, 0x4A5739, 0x0A574D, 0x052642, 0x3E9335, 0x0D9549, 0x75AABE, 0x056A51, 0x096D46,
  45 + /*1971-1980*/
  46 + 0x54AEBB, 0x04AD4F, 0x0A4D43, 0x4D26B7, 0x0D254B, 0x8D52BF, 0x0B5452, 0x0B6A47, 0x696D3C, 0x095B50,
  47 + /*1981-1990*/
  48 + 0x049B45, 0x4A4BB9, 0x0A4B4D, 0xAB25C2, 0x06A554, 0x06D449, 0x6ADA3D, 0x0AB651, 0x095746, 0x5497BB,
  49 + /*1991-2000*/
  50 + 0x04974F, 0x064B44, 0x36A537, 0x0EA54A, 0x86B2BF, 0x05AC53, 0x0AB647, 0x5936BC, 0x092E50, 0x0C9645,
  51 + /*2001-2010*/
  52 + 0x4D4AB8, 0x0D4A4C, 0x0DA541, 0x25AAB6, 0x056A49, 0x7AADBD, 0x025D52, 0x092D47, 0x5C95BA, 0x0A954E,
  53 + /*2011-2020*/
  54 + 0x0B4A43, 0x4B5537, 0x0AD54A, 0x955ABF, 0x04BA53, 0x0A5B48, 0x652BBC, 0x052B50, 0x0A9345, 0x474AB9,
  55 + /*2021-2030*/
  56 + 0x06AA4C, 0x0AD541, 0x24DAB6, 0x04B64A, 0x6a573D, 0x0A4E51, 0x0D2646, 0x5E933A, 0x0D534D, 0x05AA43,
  57 + /*2031-2040*/
  58 + 0x36B537, 0x096D4B, 0xB4AEBF, 0x04AD53, 0x0A4D48, 0x6D25BC, 0x0D254F, 0x0D5244, 0x5DAA38, 0x0B5A4C,
  59 + /*2041-2050*/
  60 + 0x056D41, 0x24ADB6, 0x049B4A, 0x7A4BBE, 0x0A4B51, 0x0AA546, 0x5B52BA, 0x06D24E, 0x0ADA42, 0x355B37,
  61 + /*2051-2060*/
  62 + 0x09374B, 0x8497C1, 0x049753, 0x064B48, 0x66A53C, 0x0EA54F, 0x06AA44, 0x4AB638, 0x0AAE4C, 0x092E42,
  63 + /*2061-2070*/
  64 + 0x3C9735, 0x0C9649, 0x7D4ABD, 0x0D4A51, 0x0DA545, 0x55AABA, 0x056A4E, 0x0A6D43, 0x452EB7, 0x052D4B,
  65 + /*2071-2080*/
  66 + 0x8A95BF, 0x0A9553, 0x0B4A47, 0x6B553B, 0x0AD54F, 0x055A45, 0x4A5D38, 0x0A5B4C, 0x052B42, 0x3A93B6,
  67 + /*2081-2090*/
  68 + 0x069349, 0x7729BD, 0x06AA51, 0x0AD546, 0x54DABA, 0x04B64E, 0x0A5743, 0x452738, 0x0D264A, 0x8E933E,
  69 + /*2091-2099*/
  70 + 0x0D5252, 0x0DAA47, 0x66B53B, 0x056D4F, 0x04AE45, 0x4A4EB9, 0x0A4D4C, 0x0D1541, 0x2D92B5
  71 + ];
  72 +
  73 + /**
  74 + * 将农历日期转换为公历日期
  75 + * @param year 农历年份
  76 + * @param month 农历月
  77 + * @param monthDay 农历日
  78 + * @param isLeapMonth 该月是否是闰月(该参数可以根据本类中leapMonth()方法,先判断一下要查询的年份是否有闰月,并且闰的几月)
  79 + * @return 返回农历日期对应的公历日期,year0, month1, day2.
  80 + */
  81 + static List<int> lunarToSolar(int year, int month, int monthDay, bool isLeapMonth) {
  82 + int dayOffset;
  83 + int leapMonth;
  84 + int i;
  85 + if (year < MIN_YEAR || year > MAX_YEAR || month < 1 || month > 12
  86 + || monthDay < 1 || monthDay > 30) {
  87 + throw new Exception(
  88 + "Illegal lunar date, must be like that:\n\t" +
  89 + "year : 1900~2099\n\t" +
  90 + "month : 1~12\n\t" +
  91 + "day : 1~30");
  92 + }
  93 + dayOffset = (LUNAR_INFO[year - MIN_YEAR] & 0x001F) - 1;
  94 + if (((LUNAR_INFO[year - MIN_YEAR] & 0x0060) >> 5) == 2) {
  95 + dayOffset += 31;
  96 + }
  97 + for (i = 1; i < month; i++) {
  98 + if ((LUNAR_INFO[year - MIN_YEAR] & (0x80000 >> (i - 1))) == 0) {
  99 + dayOffset += 29;
  100 + } else {
  101 + dayOffset += 30;
  102 + }
  103 + }
  104 + dayOffset += monthDay;
  105 + leapMonth = (LUNAR_INFO[year - MIN_YEAR] & 0xf00000) >> 20;
  106 + // 这一年有闰月
  107 + if (leapMonth != 0) {
  108 + if (month > leapMonth || (month == leapMonth && isLeapMonth)) {
  109 + if ((LUNAR_INFO[year - MIN_YEAR] & (0x80000 >> (month - 1))) == 0) {
  110 + dayOffset += 29;
  111 + } else {
  112 + dayOffset += 30;
  113 + }
  114 + }
  115 + }
  116 + if (dayOffset > 366 || (year % 4 != 0 && dayOffset > 365)) {
  117 + year += 1;
  118 + if (year % 4 == 1) {
  119 + dayOffset -= 366;
  120 + } else {
  121 + dayOffset -= 365;
  122 + }
  123 + }
  124 + List<int> solarInfo = new List(3);
  125 + for (i = 1; i < 13; i++) {
  126 + int iPos = DAYS_BEFORE_MONTH[i];
  127 + if (year % 4 == 0 && i > 2) {
  128 + iPos += 1;
  129 + }
  130 + if (year % 4 == 0 && i == 2 && iPos + 1 == dayOffset) {
  131 + solarInfo[1] = i;
  132 + solarInfo[2] = dayOffset - 31;
  133 + break;
  134 + }
  135 + if (iPos >= dayOffset) {
  136 + solarInfo[1] = i;
  137 + iPos = DAYS_BEFORE_MONTH[i - 1];
  138 + if (year % 4 == 0 && i > 2) {
  139 + iPos += 1;
  140 + }
  141 + if (dayOffset > iPos) {
  142 + solarInfo[2] = dayOffset - iPos;
  143 + } else if (dayOffset == iPos) {
  144 + if (year % 4 == 0 && i == 2) {
  145 + solarInfo[2] = DAYS_BEFORE_MONTH[i] - DAYS_BEFORE_MONTH[i - 1] + 1;
  146 + } else {
  147 + solarInfo[2] = DAYS_BEFORE_MONTH[i] - DAYS_BEFORE_MONTH[i - 1];
  148 + }
  149 + } else {
  150 + solarInfo[2] = dayOffset;
  151 + }
  152 + break;
  153 + }
  154 + }
  155 + solarInfo[0] = year;
  156 + return solarInfo;
  157 + }
  158 +
  159 + /**
  160 + * 传回农历year年month月的总天数
  161 + *
  162 + * @param year 要计算的年份
  163 + * @param month 要计算的月
  164 + * @return 传回天数
  165 + */
  166 + static int daysInMonth(int year, int month) {
  167 + return daysInMontaThree(year, month, false);
  168 + }
  169 +
  170 + /**
  171 + * 传回农历year年month月的总天数
  172 + *
  173 + * @param year 要计算的年份
  174 + * @param month 要计算的月
  175 + * @param leap 当月是否是闰月
  176 + * @return 传回天数,如果闰月是错误的,返回0.
  177 + */
  178 + static int daysInMontaThree(int year, int month, bool leap) {
  179 + int mLeapMonth = leapMonth(year);
  180 + int offset = 0;
  181 + // 如果本年有闰月且month大于闰月时,需要校正
  182 + if (leapMonth != 0 && month > mLeapMonth) {
  183 + offset = 1;
  184 + }
  185 + // 不考虑闰月
  186 + if (!leap) {
  187 + return daysInLunarMonth(year, month + offset);
  188 + } else {
  189 + // 传入的闰月是正确的月份
  190 + if (leapMonth != 0 && leapMonth == month) {
  191 + return daysInLunarMonth(year, month + 1);
  192 + }
  193 + }
  194 + return 0;
  195 + }
  196 +
  197 + /**
  198 + * 传回农历 year年的总天数
  199 + *
  200 + * @param year 将要计算的年份
  201 + * @return 返回传入年份的总天数
  202 + */
  203 + static int daysInLunarYear(int year) {
  204 + int i, sum = 348;
  205 + if (leapMonth(year) != 0) {
  206 + sum = 377;
  207 + }
  208 + int monthInfo = LUNAR_INFO[year - MIN_YEAR] & 0x0FFF80;
  209 + for (i = 0x80000; i > 0x7; i >>= 1) {
  210 + if ((monthInfo & i) != 0) {
  211 + sum += 1;
  212 + }
  213 + }
  214 + return sum;
  215 + }
  216 +
  217 + /**
  218 + * 传回农历 year年month月的总天数,总共有13个月包括闰月
  219 + *
  220 + * @param year 将要计算的年份
  221 + * @param month 将要计算的月份
  222 + * @return 传回农历 year年month月的总天数
  223 + */
  224 + static int daysInLunarMonth(int year, int month) {
  225 + if ((LUNAR_INFO[year - MIN_YEAR] & (0x100000 >> month)) == 0) {
  226 + return 29;
  227 + } else {
  228 + return 30;
  229 + }
  230 + }
  231 +
  232 + /**
  233 + * 传回农历 year年闰哪个月 1-12 , 没闰传回 0
  234 + * @param year 将要计算的年份
  235 + * @return 传回农历 year年闰哪个月1-12, 没闰传回 0
  236 + */
  237 + static int leapMonth(int year) {
  238 + return ((LUNAR_INFO[year - MIN_YEAR] & 0xF00000)) >> 20;
  239 + }
  240 +}