From 56e42a85942e237d7b9f0ee198f2565c03998179 Mon Sep 17 00:00:00 2001 From: vtretyakov Date: Thu, 14 Feb 2019 16:43:00 +0700 Subject: [PATCH] Racib and Crypto_int --- android/app/build.gradle | 55 +++++++++++------- .../com/dinect/checker/ScannerActivity.java | 2 +- build-all-apks.bat | 3 +- debug.keystore | Bin 0 -> 1259 bytes ios/Runner/AppDelegate.m | 17 +----- lib/resources.dart | 4 +- lib/screens/purchase.dart | 12 ++-- lib/screens/purchase_success.dart | 8 +-- pubspec.lock | 2 +- 9 files changed, 52 insertions(+), 51 deletions(-) create mode 100644 debug.keystore diff --git a/android/app/build.gradle b/android/app/build.gradle index cbaab32..80ef9ef 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -28,15 +28,28 @@ android { minSdkVersion 16 applicationId "com.dinect.checker" } - + signingConfigs { + debug { + storeFile file("../../debug.keystore") + keyAlias 'androiddebugkey' + keyPassword 'android' + storePassword 'android' + } + release { + storeFile file("../../dinect-release-key.keystore") + storePassword 'df3bsfb6ale' + keyAlias 'key0' + keyPassword 'vquyc4b8smdk2' + } + } buildTypes { debug { debuggable true signingConfig signingConfigs.debug } release { - signingConfig signingConfigs.debug minifyEnabled false + signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -123,21 +136,21 @@ android { buildConfigField "boolean", "showBonus", "false" } - pip { - applicationId 'com.dinect.checker.pip' - buildConfigField "String", "locale", "\"ua\"" - buildConfigField "String", "flavor", "\"pip\"" - buildConfigField "int", "currency", "980" - buildConfigField "String", "supportPhone", "\"+38 080 030 9997\\n+38 044 390 1697\"" - buildConfigField "String", "supportUrl", "\"http://discount.kiev.ua/\"" - buildConfigField "String", "endpoint", "\"https://pos-api.discount.kiev.ua/20130701/\"" + crypto { + applicationId 'digital.joys.checker.app' + buildConfigField "String", "locale", "\"ru\"" + buildConfigField "String", "flavor", "\"crypto\"" + buildConfigField "int", "currency", "643" + buildConfigField "String", "supportPhone", "\"support@joys.digital\"" + buildConfigField "String", "supportUrl", "\"https://joys.digital/\"" + buildConfigField "String", "endpoint", "\"https://pos.api.joys.digital/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"PIP\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"POSapp Joys\"" + buildConfigField "boolean", "showBonus", "false" } - crypto { - applicationId 'digital.joys.checker' + crypto_INT { + applicationId 'digital.joys.checker.int' buildConfigField "String", "locale", "\"ru\"" buildConfigField "String", "flavor", "\"crypto\"" buildConfigField "int", "currency", "643" @@ -145,8 +158,8 @@ android { buildConfigField "String", "supportUrl", "\"https://joys.digital/\"" buildConfigField "String", "endpoint", "\"https://pos-api-crypto-int.dinect.com/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"POSapp Joys\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"POSapp Joys (INT)\"" + buildConfigField "boolean", "showBonus", "false" } develop { @@ -162,17 +175,17 @@ android { buildConfigField "boolean", "showBonus", "true" } - biohacker { - applicationId 'ru.fivefit.biochecker' + racib { + applicationId 'digital.joys.checker.racib' buildConfigField "String", "locale", "\"ru\"" - buildConfigField "String", "flavor", "\"biohacker\"" + buildConfigField "String", "flavor", "\"racib\"" buildConfigField "int", "currency", "643" buildConfigField "String", "supportPhone", "\"support@dinect.com\"" buildConfigField "String", "supportUrl", "\"http://www.dinect.com\"" buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"BioChecker\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"Racib\"" + buildConfigField "boolean", "showBonus", "false" } } compileOptions { diff --git a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java index 30352e3..17cf6ea 100644 --- a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java +++ b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java @@ -170,7 +170,7 @@ public class ScannerActivity extends AppCompatActivity implements @Override public void onClick(View v) { - if (!"crypto".equals(BuildConfig.FLAVOR)) { + if (!"crypto".equals(BuildConfig.FLAVOR) || !"racib".equals(BuildConfig.FLAVOR)) { if (mSearchType == SearchType.CARD) { resetSearchType(SearchType.PHONE_NUMBER, R.drawable.ic_phone, "enter_phone"); } else { diff --git a/build-all-apks.bat b/build-all-apks.bat index 89b72f9..7423ea1 100644 --- a/build-all-apks.bat +++ b/build-all-apks.bat @@ -2,7 +2,8 @@ echo on call flutter clean call flutter build apk --flavor autobonus call flutter build apk --flavor crypto +call flutter build apk --flavor crypto_int call flutter build apk --flavor dinect call flutter build apk --flavor dinect_INT call flutter build apk --flavor dinect_OTE -call flutter build apk --flavor biohacker +call flutter build apk --flavor racib diff --git a/debug.keystore b/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..ad8b44202446cde5a8ea422863171e0fbcef9580 GIT binary patch literal 1259 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2c=~pxJ=1||b{RA=Z8P9wBUD{qp(dvpo|^O{L3&H8koXvCYFtZ%E`zj#;Rp-9eF zJKnxyEU$J>&%7cNAOAo9K|!R{zoQ5Cm>L#YO_7V}t`iskeBCTm`^}ki22E8>Z+LHQ zxYN3FAMgDo_itP-_|a93B7eJ2cnf``aVQSMT-P zZj>{Rn!@kerfKuQ$Uud&9lM-gZG1_qIQ&cZ=;6mb{s4 z6ykbT{PnX}a^=O>r~G5(I(PCw=BCDf!Lv-}-F>wC=)sIEX;01q&5$i~a*8|r9nY0+ z?w$YnRc-U%%rEgbo*2|BpWXPy@_M{`$!k^CPJK=03qQ4wya_RSD$@KjooQM7C+)JH zPWG+>QDg1h8~!}lw`;Qq-{q*^-HR{XIK7c`&arhSXE%qn%=6eeUvcSwMVtLsHtjp{ z`R3L2heZOT1Yb4l9r0Xe`R(Z>jr6tCmudVCe|~0>Y*Oz+->(*%?Q9i3*!X66oo8w4 zS^mslK{mVWTf@vKu}Se_H&QADuUmLOdd=iiU+%86CR01)XZ!{KFRNstn^)M~;y!Y1 zvysWI6s1{vzVkeEzyI@A?`k$^3b{UvL}lyJNSp))}0% zStImJ4J?5P`k_G+<6R(jV`5}9;AP{~YV&CO&I?SGpX6zAe$hl(3=8*qX|*o2uvgAL@wc?~TLjSS5Ujf_o^E zH@I;=vKxU}j=8ay!Jx5|sj-n^^4&n;Th0fXoTqQS^l9Q&En%Gn(Jf{Cdi}*~ZDWEe zn{|CAoC^K6dQ*U(?`D?AKTkgLkDBoCK*=X*Inf^?Qae5$o%euQ%YUZJS+=7O&di;o zGGlrZpHtI`eoccFK}_Ml>~|$KrDpp@F5A9f&ZWg&W;^+(F0b&Y`?WH0Y35z)yPb2H zm>C(+gOC~ME}dtA&GW9T5!mpc-LBHT;_Mt7kMJkYj;`CH=6ctdMaWqFR%K6eYTwnM zhaH@AduwcaQdX*a#jHKwXRo2Z^z<8hZG$Zr&s;4!;PFr{FjdS)Jblg-ws&`|ne#g> zl-}1Dnacg_JYBuQg3Tc)FRE_WnRj1W??jsPM+ilVS~YQoci+A8%l_nT@z|!y$< extends BaseState { void initState() { loading = true; requestAsyncData(user); + loading = false; buildFocusNode(); scrollController = new ScrollController(); super.initState(); @@ -74,11 +75,8 @@ class PurchaseScreenState extends BaseState { )); widgetList.add(getValueWithDescription(StringsLocalization.card(), card)); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { widgetList.add(getValueWithDescription(StringsLocalization.reward(), loyalty)); - } - - if (app != 'crypto') { if (bonus.length > 0) { widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus)); } @@ -87,7 +85,7 @@ class PurchaseScreenState extends BaseState { widgetList.add(getHintLabel()); widgetList.add(getInputField()); // Нельзя добавить еще одно поле таким же способом - if ((app != 'autobonus') || (app != 'crypto')) { + if ((app != 'autobonus') || (app != 'crypto') || (app != 'racib')) { if (this.loyalityType == 'bonus') { widgetList.add(getBonusInputField()); @@ -133,7 +131,7 @@ class PurchaseScreenState extends BaseState { var bonusTextField = new TextField( keyboardType: TextInputType.number, decoration: new InputDecoration.collapsed( - hintText: (app != 'crypto') ? StringsLocalization.bonusHint() : StringsLocalization.joysHint(), + hintText: StringsLocalization.bonusHint(), hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0) ), focusNode: bonusFocusNode, @@ -163,7 +161,7 @@ class PurchaseScreenState extends BaseState { top: 5.0 ), child: new Text( - (app == 'crypto') ? " " : StringsLocalization.bonusExplanation(), + StringsLocalization.bonusExplanation(), textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, style: new TextStyle(color: greyTextColor, fontSize: 11.0), diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart index d497d38..ea99793 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -91,7 +91,7 @@ class PurchaseSuccessScreenState extends BaseState { widgetList.add(getValueWithDescription(StringsLocalization.buyer(), username)); widgetList.add(getSuccessMessage()); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { if (bonusPlus > 0) { widgetList.add(getValueWithDescription(StringsLocalization.bonusPlus(), bonusPlus.toString())); } @@ -103,11 +103,11 @@ class PurchaseSuccessScreenState extends BaseState { if (app != 'autobonus') { widgetList.add(getValueWithDescription(StringsLocalization.discountRate(), '${details['discount']}%')); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { widgetList.add(getValueWithDescription(StringsLocalization.discountSum(), '${details['sum_discount']}')); } } - if (app != 'crypto' && this.coupons.length > 0) { + if ((app != 'crypto' || app != 'racib') && this.coupons.length > 0) { widgetList.add(getItemTitle(StringsLocalization.couponsUsed())); this.coupons.forEach((couponItem) { widgetList.add(getItemToggle( @@ -165,7 +165,7 @@ class PurchaseSuccessScreenState extends BaseState { getMessageTitle() { if (currency != null) { - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { return StringsLocalization.paymentCompleted(sum, currency); } else { return StringsLocalization.purchaseCompleted(sum, currency); diff --git a/pubspec.lock b/pubspec.lock index 23f48b0..9f407d6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,7 +129,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "1.5.3+2" + version: "1.5.3" typed_data: dependency: transitive description: