update 磐石so、RSA加密Key区分正式和测试

app/build.gradle

@@ -37,6 +37,7 @@ android {
             applicationIdSuffix ".debug"
             buildConfigField("String", "API_URL", rootProject.ext.buildParams.debug.API_URL)
             buildConfigField("String", "PROVIDER_NAME", '\"' + rootProject.ext.android.applicationId + ".debug.fileprovider" + '\"')
+            buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
             manifestPlaceholders = [
                     app_name     : "B端测试",
                     file_provider: rootProject.ext.android.applicationId + ".debug.fileprovider",

app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt

@@ -10,12 +10,12 @@ import com.yidian.common.AppConfig
 import com.yidian.common.YdBaseApplication
 import com.yidian.common.http.ApiSaveCookiesInterceptor
 import com.yidian.common.http.ApiSetCookiesInterceptor
-import com.yidian.common.http.URLs
 import com.yidian.common.services.XEventService
 import com.yidian.common.services.XPageService
 import com.yidian.common.utils.JVerificationUtils
 import com.yidian.common.utils.UMConfigUtils
 import com.yidian.commonutil.CommonUtilLifecycleModule
+import com.yidian.framework.mobile.xdiamond.SecretUtil
 import com.yidian.http.ServiceFactory
 import com.yidian.news.util.ProcessUtil
 import com.yidian.xarc.xbrid.*
@@ -82,6 +82,8 @@ class YdSubwayApplication : YdBaseApplication() {
       loadService()
       JVerificationUtils.init(this)
       registerActivityLifecycleCallbacks(activityLifecycle)
+      // 初始化磐石SDK
+      SecretUtil.init(BuildConfig.IS_ENCRYPT_DEBUG_KEY)
     }
   }
 
@@ -144,7 +146,8 @@ class YdSubwayApplication : YdBaseApplication() {
         val params = data.optJSONObject("params")
         val options = data.optJSONObject("options")
 
-                ZapTicket(request.name).withAction(action).withServiceParams(params).withServiceOptions(options).withIdentifier(identifier).onResult { result ->
+        ZapTicket(request.name).withAction(action).withServiceParams(params).withServiceOptions(options).withIdentifier(identifier)
+          .onResult { result ->
             response.result(result.code, result.result!!, "")
           }.onLost { result ->
             response.result(result.code, "", result.mesg)

config/config.gradle

@@ -3,14 +3,15 @@ ext {
             applicationId    : "com.shenghuoquan.business",
             versionCode      : 100,
             versionName      : "1.0.0",
-            serviceVersion: '"000100"',// 上线前需要和服务端确认并更新
-            isEncrypt     : 'true',// 上线前需要开启加密
+            serviceVersion   : '"000100"', // 上线前需要和服务端确认并更新
+            isEncrypt        : 'true', // 上线前需要开启加密
+            isEncryptDebugKey: 'true', // 上线前需要使用正式加密key 置为false
             isApplication    : false
     ]
     buildParams = [
             debug  : [
-//                        API_URL: '"http://bp-dev.go2yd.com"',
-                    API_URL: '"http://bp-test.go2yd.com"',
+                    API_URL: '"http://bp-dev.go2yd.com"',
+//                    API_URL: '"http://bp-test.go2yd.com"',
             ],
             release: [
                     API_URL: '"http://bp-test.go2yd.com"',
@@ -79,7 +80,7 @@ ext.dependencies = [
                 'io.reactivex.rxjava3:rxjava:3.0.9',
                 'com.yidian.framework.mobile:ydhttp:1.0.8-SNAPSHOT',
                 'com.yidian.framework.mobile:ydutils:1.0.1-SNAPSHOT',
-                'com.yidian.framework.mobile:xdiamond:1.0.4-SNAPSHOT',
+                'com.yidian.framework.mobile:xdiamond:1.0.6',
 
                 'com.loopj.android:android-async-http:1.4.9'
         ],