Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/build.gradle

@@ -180,7 +180,7 @@ dependencies {
 
     //    implementation 'com.liulishuo.filedownloader:library:1.6.9'
     implementation 'com.tencent.bugly:crashreport_upgrade:1.3.5'
-
+    implementation(name: 'alipaySdk-15.5.9', ext: 'aar')
     //其中latest.release指代最新版本号，也可以指定明确的版本号，例如1.2.0
     implementation 'com.tencent.bugly:nativecrashreport:3.3.1'
 
@@ -350,7 +350,6 @@ dependencies {
     implementation('com.sunfusheng:marqueeview:1.3.3') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
-    implementation files('libs/alipaySdk-20170922.jar')
 
     //极光
     implementation files('libs/jcore-android-1.2.0.jar')

app/src/main/AndroidManifest.xml

@@ -639,15 +639,6 @@
             android:screenOrientation="portrait" />
         <!-- div end -->
 
-
-        <!-- alipay 支付宝 sdk begin -->
-        <activity
-            android:name="com.alipay.sdk.app.H5PayActivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
-            android:screenOrientation="behind"
-            android:windowSoftInputMode="adjustResize|stateHidden" />
-
         <!-- alipay 支付宝 sdk end -->
 
 

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -957,7 +957,7 @@ public class CommonUtil {
                 // 构造PayTask 对象
                 PayTask alipay = new PayTask(activity);
                 // 调用支付接口，获取支付结果
-                final String result = alipay.pay(payInfo, true);
+                final Map<String, String> result = alipay.payV2(payInfo, true);
 
                 activity.runOnUiThread(new Runnable() {
 
@@ -1000,7 +1000,7 @@ public class CommonUtil {
             public void subscribe(ObservableEmitter<String> emitter) throws Exception {
                 PayTask alipay = new PayTask(activity);
                 // 调用支付接口，获取支付结果
-                String result = alipay.pay(payInfo, b);
+                Map<String, String> result = alipay.payV2(payInfo, b);
                 PayResult payResult = new PayResult(result);
                 /**
                  * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/