Skip to content

Commit 02b4435

Browse files
author
MOLPay Mobile
committed
Release 3.7.0
1 parent 47f6efb commit 02b4435

9 files changed

Lines changed: 13 additions & 11 deletions

File tree

‎MOLPayActivity.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ protected override void OnCreate(Bundle savedInstanceState)
115115
{
116116
base.OnCreate(savedInstanceState);
117117

118-
isMainUILoaded = false;
118+
isMainUILoaded = false;
119+
isClosingReceipt = false;
119120
molpayActivity = this;
120121

121122
Window.SetFlags(WindowManagerFlags.Secure, WindowManagerFlags.Secure);
@@ -124,7 +125,7 @@ protected override void OnCreate(Bundle savedInstanceState)
124125
string json = Intent.GetStringExtra(MOLPayPaymentDetails);
125126
paymentDetails = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
126127
paymentDetails.Add(module_id, "molpay-mobile-xdk-xamarin-android");
127-
paymentDetails.Add(wrapper_version, "1");
128+
paymentDetails.Add(wrapper_version, "0");
128129

129130
mpMainUI = FindViewById<WebView>(Resource.Id.MPMainUI);
130131
mpMOLPayUI = FindViewById<WebView>(Resource.Id.MPMOLPayUI);
@@ -138,7 +139,7 @@ protected override void OnCreate(Bundle savedInstanceState)
138139

139140
mpMainUI.Settings.AllowUniversalAccessFromFileURLs = true;
140141
mpMainUI.SetWebViewClient(new MPMainUIWebClient());
141-
mpMainUI.LoadUrl("file:///android_asset/molpay-mobile-xdk-www/index.html");
142+
mpMainUI.LoadUrl("file:///android_asset/molpay-mobile-xdk-www/index.html");
142143

143144
mpMOLPayUI.Settings.AllowUniversalAccessFromFileURLs = true;
144145
mpMOLPayUI.Settings.JavaScriptCanOpenWindowsAutomatically = true;

‎MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.51ee3c6e.js"></script> </body> </html>
1+
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.1aa69035.js"></script> </body> </html>

‎MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.1aa69035.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.51ee3c6e.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎MOLPayXDKExample/MOLPayXDKExample/MOLPayActivity.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ protected override void OnCreate(Bundle savedInstanceState)
115115
{
116116
base.OnCreate(savedInstanceState);
117117

118-
isMainUILoaded = false;
118+
isMainUILoaded = false;
119+
isClosingReceipt = false;
119120
molpayActivity = this;
120121

121122
Window.SetFlags(WindowManagerFlags.Secure, WindowManagerFlags.Secure);
@@ -124,7 +125,7 @@ protected override void OnCreate(Bundle savedInstanceState)
124125
string json = Intent.GetStringExtra(MOLPayPaymentDetails);
125126
paymentDetails = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
126127
paymentDetails.Add(module_id, "molpay-mobile-xdk-xamarin-android");
127-
paymentDetails.Add(wrapper_version, "1");
128+
paymentDetails.Add(wrapper_version, "0");
128129

129130
mpMainUI = FindViewById<WebView>(Resource.Id.MPMainUI);
130131
mpMOLPayUI = FindViewById<WebView>(Resource.Id.MPMOLPayUI);
@@ -138,7 +139,7 @@ protected override void OnCreate(Bundle savedInstanceState)
138139

139140
mpMainUI.Settings.AllowUniversalAccessFromFileURLs = true;
140141
mpMainUI.SetWebViewClient(new MPMainUIWebClient());
141-
mpMainUI.LoadUrl("file:///android_asset/molpay-mobile-xdk-www/index.html");
142+
mpMainUI.LoadUrl("file:///android_asset/molpay-mobile-xdk-www/index.html");
142143

143144
mpMOLPayUI.Settings.AllowUniversalAccessFromFileURLs = true;
144145
mpMOLPayUI.Settings.JavaScriptCanOpenWindowsAutomatically = true;

‎MOLPayXDKExample/MOLPayXDKExample/MOLPayXDKExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\fontawesome-webfont.woff2" />
9797
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\images\ImageUnavailable.png" />
9898
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\images\poweredByMOLPay.png" />
99-
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.51ee3c6e.js" />
99+
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.1aa69035.js" />
100100
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\vendor.80b0fea7.js" />
101101
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\styles\main.d7e0b867.css" />
102102
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\styles\vendor.34eb91d2.css" />

‎molpay-mobile-xdk-www/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.51ee3c6e.js"></script> </body> </html>
1+
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.1aa69035.js"></script> </body> </html>

‎molpay-mobile-xdk-www/scripts/scripts.1aa69035.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎molpay-mobile-xdk-www/scripts/scripts.51ee3c6e.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)