Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

config.gradle

@@ -44,7 +44,7 @@ ext {
             "m-audioim"       : "0.0.11",
             "m-confide"       : "0.0.14",
             "m-consultant"    : "0.0.21",
-            "m-course"        : "0.0.5",
+            "m-course"        : "0.0.7",
             "m-fm"            : "0.0.10",
             "m-muse"          : "0.0.6",
             "m-tests"         : "0.0.3",
@@ -62,7 +62,7 @@ ext {
             "ydl-flutter-base": "0.0.3",
             "ydl-media"       : "0.0.8",
             "ydl-net"         : "0.0.1",
-            "ydl-pay"         : "0.0.3",
+            "ydl-pay"         : "0.0.5",
             "ydl-platform"    : "0.0.19",
             "ydl-utils"       : "0.0.2",
             "ydl-webview"     : "0.0.19",
@@ -92,7 +92,7 @@ ext {
             "ydl-flutter-base": "0.0.3",
             "ydl-media"       : "0.0.8",
             "ydl-net"         : "0.0.1",
-            "ydl-pay"         : "0.0.3",
+            "ydl-pay"         : "0.0.5",
             "ydl-platform"    : "0.0.19",
             "ydl-utils"       : "0.0.2",
             "ydl-webview"     : "0.0.19",

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

@@ -15,9 +15,9 @@ import com.alipay.sdk.app.PayTask
 import com.tencent.mm.opensdk.modelpay.PayReq
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.yidianling.ydl_pay.http.HttpUtils
-import com.ydl.ydl_pay.toast.ToastHelper
-import com.ydl.ydl_pay.widget.PayCouponView
-import com.ydl.ydl_pay.widget.PayInfoDetailView
+import com.yidianling.ydl_pay.toast.ToastHelper
+import com.yidianling.ydl_pay.widget.PayCouponView
+import com.yidianling.ydl_pay.widget.PayInfoDetailView
 import com.yidianling.ydl_pay.bean.*
 import com.yidianling.ydl_pay.bean.params.*
 import com.yidianling.ydl_pay.http.utils.NetUtils

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

@@ -3,8 +3,6 @@ package com.yidianling.ydl_pay.actionpoint
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
-import com.ydl.ydl_pay.actionpoint.ActionDataBean
-import com.ydl.ydl_pay.actionpoint.BIConstants
 import com.yidianling.ydl_pay.http.HttpUtils
 import com.yidianling.ydl_pay.http.utils.RxDeviceTool
 import io.reactivex.android.schedulers.AndroidSchedulers

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

-package com.ydl.ydl_pay.actionpoint
+package com.yidianling.ydl_pay.actionpoint
 
 /**
  * Created by xj on 2019/6/22.

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

-package com.ydl.ydl_pay.actionpoint
+package com.yidianling.ydl_pay.actionpoint
 
 /**
  * Created by xj on 2019/7/1.

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

-package com.ydl.ydl_pay.adapter
+package com.yidianling.ydl_pay.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -8,9 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.yidianling.ydl_pay.actionpoint.ActionCountUtils
-import com.ydl.ydl_pay.actionpoint.BIConstants
-import com.ydl.ydl_pay.http.HttpConfig
-import com.ydl.ydl_pay.widget.CouponInfoDetailView
+import com.yidianling.ydl_pay.actionpoint.BIConstants
+import com.yidianling.ydl_pay.http.HttpConfig
+import com.yidianling.ydl_pay.widget.CouponInfoDetailView
 import com.yidianling.ydl_pay.R
 import com.yidianling.ydl_pay.bean.AllCouponListBean
 import com.yidianling.ydl_pay.bean.CommonCouponBean
@@ -158,13 +158,15 @@ class SelectCouponAdapter(var couponListBean: AllCouponListBean, var context: Co
                             couponListBean.available[it].hasSelected = 0
                         }
                         couponListBean.available[realPosition - 1].hasSelected = 1
-                        ActionCountUtils.count(HttpConfig.uid, BIConstants.PART_ID_COURSE_COUPON_PAGE,
+                        ActionCountUtils.count(
+                            HttpConfig.uid, BIConstants.PART_ID_COURSE_COUPON_PAGE,
                                 BIConstants.POSITION_COURSE_COUPON_CLICK, "", "", couponListBean.available[realPosition - 1].couponId)
                         notifyDataSetChanged()
                         event(couponListBean.available[realPosition - 1])
                     } else { //点击的优惠券是选中的
                         couponListBean.available[realPosition - 1].hasSelected = 0
-                        ActionCountUtils.count(HttpConfig.uid, BIConstants.PART_ID_COURSE_COUPON_PAGE,
+                        ActionCountUtils.count(
+                            HttpConfig.uid, BIConstants.PART_ID_COURSE_COUPON_PAGE,
                                 BIConstants.POSITION_COURSE_COUPON_CLICK, "", "", "")
                         notifyDataSetChanged()
                         event(null)

ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/WxPayParam.java

 package com.yidianling.ydl_pay.bean.params;
 
+import com.ydl.ydlcommon.base.BaseApp;
+import com.ydl.ydlcommon.base.config.YDLConstants;
+
 /**
  * @author jiucheng
  * @描述:
@@ -9,7 +12,13 @@ package com.yidianling.ydl_pay.bean.params;
  */
 public class WxPayParam extends CommonPayParam {
 
+
     public WxPayParam(String payId, int isThreePay) {
         super(payId, "wxapp_hz", isThreePay);
+        if (BaseApp.instance.getGlobalConfig().getAppFrom() == YDLConstants.FROM_XLZX) {
+            type = "wxapp_consult";
+        } else {
+            type = "wxapp_hz";
+        }
     }
 }

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

-package com.ydl.ydl_pay.http
+package com.yidianling.ydl_pay.http
 
 /**
  * @author jiucheng

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

 package com.yidianling.ydl_pay.http
 
 import com.google.gson.Gson
-import com.ydl.ydl_pay.actionpoint.ActionDataBean
+import com.yidianling.ydl_pay.actionpoint.ActionDataBean
 import com.ydl.ydlcommon.data.http.BaseCommand
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.utils.NetworkParamsUtils

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

-package com.ydl.ydl_pay.toast
+package com.yidianling.ydl_pay.toast
 
 import android.content.Context
 import android.support.annotation.StringRes

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

-package com.ydl.ydl_pay.widget
+package com.yidianling.ydl_pay.widget
 
 import android.annotation.SuppressLint
 import android.content.Context

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

-package com.ydl.ydl_pay.widget
+package com.yidianling.ydl_pay.widget
 
 import android.content.Context
 import android.os.Handler
@@ -13,9 +13,9 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.ydl.ydl_pay.adapter.SelectCouponAdapter
+import com.yidianling.ydl_pay.adapter.SelectCouponAdapter
 import com.yidianling.ydl_pay.http.HttpUtils
-import com.ydl.ydl_pay.toast.ToastHelper
+import com.yidianling.ydl_pay.toast.ToastHelper
 import com.yidianling.ydl_pay.R
 import com.yidianling.ydl_pay.bean.AllCouponListBean
 import com.yidianling.ydl_pay.bean.CommonCouponBean

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

-package com.ydl.ydl_pay.widget
+package com.yidianling.ydl_pay.widget
 
 import android.annotation.SuppressLint
 import android.content.Context

ydl-platform/src/main/java/com/ydl/ydlcommon/actions/crash/compat/ActivityKillerV28.java

@@ -7,7 +7,6 @@ import android.os.IBinder;
 import android.os.Message;
 
 import com.ydl.ydlcommon.actions.crash.ClientTransaction;
-import com.ydl.ydlcommon.actions.crash.ClientTransaction;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;