支付库更新

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -7,10 +7,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Process;
 import android.support.annotation.RequiresApi;
-
 import com.facebook.stetho.Stetho;
 import com.meituan.android.walle.WalleChannelReader;
-import com.netease.nimlib.sdk.util.NIMUtil;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.smtt.sdk.QbSdk;
 import com.umeng.analytics.MobclickAgent;
@@ -23,14 +21,13 @@ import com.ydl.media.audio.PlayService;
 import com.ydl.ydlcommon.base.config.HttpConfig;
 import com.ydl.ydlcommon.base.config.YDLConstants;
 import com.ydl.ydlcommon.base.delegate.IAppLifecycles;
+import com.ydl.ydlcommon.utils.AppProgressUtils;
 import com.ydl.ydlcommon.utils.LogUtil;
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
 import com.yidianling.course.lifeCallback.CoursePlayLifecycle;
 import com.yidianling.im.config.NimApplication;
-
-import org.jetbrains.annotations.NotNull;
-
 import io.flutter.view.FlutterMain;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created by haorui on 2019-09-02.
@@ -48,7 +45,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
     public void onCreate(@NotNull Application application) {
         //模块初始化
         moduleInit(application);
-        if (NIMUtil.isMainProcess(application)) {
+        if (AppProgressUtils.isMainProcess(application)) {
             //第三方SDK初始化
             initThirdServiceSDK(application);
             //Flutter 初始化需要在主线程中执行
@@ -88,9 +85,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
                 //子线程中初始化X5内核，防止ANR问题
                 initX5(application);
 
-                if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){
+                if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)) {
 //                    YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
-                }else {
+                } else {
 //                    YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821");
                 }
 
@@ -110,13 +107,13 @@ public class DemoAppLifecycles implements IAppLifecycles {
                 if (BuildConfig.FLAVOR.endsWith("ydl")) {
                     umAppkey = "56970affe0f55a9cda001e24";
                     channel = "android_" + channel;
-                    initUM(umAppkey, channel,application);
+                    initUM(umAppkey, channel, application);
                     PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45");
                     PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR");
-                }else if (BuildConfig.FLAVOR.endsWith("xlzx")) {
+                } else if (BuildConfig.FLAVOR.endsWith("xlzx")) {
                     umAppkey = "5859e1656e27a42fa400021f";
                     channel = "ATK_7_android_" + channel;
-                    initUM(umAppkey, channel,application);
+                    initUM(umAppkey, channel, application);
                     PlatformConfig.setWeixin("wx1c6af5a11b5f531f", "1ddb93abbb2d81e604657d38e94a5720");
                     PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ");
                 }
@@ -139,7 +136,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
     }
 
 
-
     private void initUM(String umAppKey, String channel, Application application) {
         /**
          * 初始化common库
@@ -156,6 +152,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
 
     /**
      * 初始化X5内核
+     *
      * @param application
      */
     private void initX5(Application application) {
@@ -173,7 +170,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
             @Override
             public void onViewInitFinished(boolean arg0) {
                 //初始化完成回调
-                LogUtil.i("QbSdk onViewInitFinished："+arg0);
+                LogUtil.i("QbSdk onViewInitFinished：" + arg0);
             }
 
             @Override

build.gradle

@@ -16,6 +16,8 @@ buildscript {
         constrait_support_version = '1.0.2'
     }
     repositories {
+        google()
+
         //壹点灵android maven私服 开发版
         maven{
             url 'http://nexus.yidianling.com/repository/AndroidRepository/'

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -74,7 +74,7 @@ ext {
 
             "ydl-webview"     : "0.0.37.2",
             "ydl-media"       : "0.0.20",
-            "ydl-pay"         : "0.0.17",
+            "ydl-pay"         : "0.0.17.1",
             "m-audioim"       : "0.0.46.2",
             "ydl-flutter-base": "0.0.10",
 

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/RxPay.kt

@@ -9,6 +9,7 @@ import com.tencent.mm.opensdk.modelpay.PayReq
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.yidianling.ydl_pay.pay.bean.WXPayEvent
 import com.ydl.ydlcommon.data.http.CustomThrowable
+import com.yidianling.ydl_pay.common.bean.CommonWXPayBean
 import com.yidianling.ydl_pay.common.bean.PayResult
 import de.greenrobot.event.EventBus
 import io.reactivex.Emitter
@@ -29,7 +30,7 @@ object RxPay {
     private var emitter: Emitter<PayStatus>? = null
 
     // 微信支付
-    fun wxPay(context: Context, option: WXPay.WXOption): Observable<PayStatus> {
+    fun wxPay(context: Context, option: CommonWXPayBean.WXOption): Observable<PayStatus> {
         return Observable.create<PayStatus> { e ->
             val api = WXAPIFactory.createWXAPI(context, null)
             if (api.wxAppSupportAPI < Build.PAY_SUPPORTED_SDK_INT) {