代码优化

video/app/src/main/assets/SDK_Setting_5423461.json → video/app/src/main/assets/SDK_Setting_5442768.json

 {
 	"init": {
-		"site_id": "5423461",
-		"app_id": "518779",
-		"partner": "pangle_518779",
-		"secure_key": "9f3b49c414b30e9d9f44daca4b5cff54"
+		"site_id": "5442768",
+		"app_id": "552425",
+		"partner": "pangle_552425",
+		"secure_key": "5a86f288970dfc3354cec7ffb92e284a",
+		"secure_key_d": "83587957730a8f16d5837c8026e0a1a0"
 	},
 	"feed": {
 		"news_list_ad_code_id": "",
@@ -12,37 +13,37 @@
 		"video_first_ad_code_id": "",
 		"video_second_ad_code_id": "",
 		"related_ad_code_id": "",
-		"news_draw_ad_code_id": "953183571",
-		"news_draw_native_ad_code_id": "953183575",
+		"news_draw_ad_code_id": "954152404",
+		"news_draw_native_ad_code_id": "954152409",
 		"news_outer_list_ad_code_id": "",
 		"news_outer_first_ad_code_id": "",
 		"news_outer_second_ad_code_id": "",
 		"outer_video_second_ad_code_id": "",
 		"outer_related_ad_code_id": "",
-		"news_outer_draw_ad_code_id": "953183564",
-		"news_outer_draw_native_ad_code_id": "953183578",
+		"news_outer_draw_ad_code_id": "954152399",
+		"news_outer_draw_native_ad_code_id": "954152402",
 		"news_interstitial_code_id": ""
 	},
 	"small_video": {
-		"draw_ad_code_id": "953183569",
-		"draw_native_ad_code_id": "953183565",
-		"grid_ad_code_id": "953183574",
-		"grid_draw_ad_code_id": "953183568",
-		"grid_draw_native_ad_code_id": "953183581",
-		"video_card_ad_code_id": "953183580",
-		"video_card_draw_ad_code_id": "953183579",
-		"video_card_draw_native_ad_code_id": "953183567",
+		"draw_ad_code_id": "954152403",
+		"draw_native_ad_code_id": "954152398",
+		"grid_ad_code_id": "954152411",
+		"grid_draw_ad_code_id": "954152400",
+		"grid_draw_native_ad_code_id": "954152413",
+		"video_card_ad_code_id": "954152401",
+		"video_card_draw_ad_code_id": "954152405",
+		"video_card_draw_native_ad_code_id": "954152394",
 		"interstitial_ad_code_id": "",
-		"interstitial_note_ad_code_id": "953183562",
-		"staggered_grid_ad_code_id": "953183566",
-		"staggered_grid_draw_ad_code_id": "953183569",
-		"staggered_grid_draw_native_ad_code_id": "953183565",
-		"draw_interstitial_ad_code_id": "953183572",
-		"draw_fullscreen_interstitial_ad_code_id": "953183573",
-		"draw_banner_code_id": "953183570",
-		"drama_rewarded_ad_code_id": "953183576",
-		"drama_rewarded_ad_code_id_02": "953183563",
-		"drama_draw_ad_code_id": "953183577"
+		"interstitial_note_ad_code_id": "954152397",
+		"staggered_grid_ad_code_id": "954152410",
+		"staggered_grid_draw_ad_code_id": "954152403",
+		"staggered_grid_draw_native_ad_code_id": "954152398",
+		"draw_interstitial_ad_code_id": "954152414",
+		"draw_fullscreen_interstitial_ad_code_id": "954152408",
+		"draw_banner_code_id": "954152396",
+		"drama_rewarded_ad_code_id": "954152406",
+		"drama_rewarded_ad_code_id_02": "954152395",
+		"drama_draw_ad_code_id": "954152407"
 	},
 	"novel": {
 		"status": 0,

video/app/src/main/java/com/duben/carefree/MintsApplication.java

@@ -18,6 +18,7 @@ import com.duben.carefree.net.V6Service;
 import com.duben.carefree.utils.AppPreferencesManager;
 import com.duben.carefree.utils.ForegroundOrBackground;
 import com.duben.carefree.utils.MateUtils;
+import com.duben.oaid.MiitHelper;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.FormatStrategy;
 import com.orhanobut.logger.Logger;
@@ -167,16 +168,16 @@ public class MintsApplication extends MultiDexApplication {
      */
     private void initMiitHelper() {
         try {
-//            MiitHelper miitHelper = new MiitHelper(new MiitHelper.AppIdsUpdater() {
-//
-//                @Override
-//                public void onIdsValid(String ids) {
-//                    MintsApplication.OAID = ids;
-//
-//                    System.out.println("123123123 oaid=" + ids);
-//                }
-//            });
-//            miitHelper.getDeviceIds(MintsApplication.getContext(), true, true, true);
+            MiitHelper miitHelper = new MiitHelper(new MiitHelper.AppIdsUpdater() {
+
+                @Override
+                public void onIdsValid(String ids) {
+                    MintsApplication.OAID = ids;
+
+                    System.out.println("123123123 oaid=" + ids);
+                }
+            });
+            miitHelper.getDeviceIds(MintsApplication.getContext(), true, true, true);
         } catch (Exception e) {
             e.printStackTrace();
         }

video/app/src/main/java/com/duben/carefree/video/csj/DPHolderManager.kt

@@ -18,7 +18,7 @@ object DPHolderManager {
 
         //1. 初始化，最好放到application.onCreate()执行
         val configBuilder = DPSdkConfig.Builder().debug(true)
-        DPSdk.init(context, "SDK_Setting_5423461.json", configBuilder.build())
+        DPSdk.init(context, "SDK_Setting_5442768.json", configBuilder.build())
 
         startDpSdk()
     }

video/gradle.properties

@@ -36,15 +36,15 @@ RELEASE_SHARESDK_KEY=385c5ea9c5393
 RELEASE_SHARESDK_SECRET=e5512fc5eeaf0ed73dd8f1685e6ea9d3
 
 #weixin
-WEIXIN_APP_PAY_ID ="wx10e29b733b8c71c7"
-WEIXIN_APP_ID =wx10e29b733b8c71c7
-WEIXIN_APP_SECRET =93add1e49825bd4992ba8b6792630a7d
+WEIXIN_APP_PAY_ID ="wxac2abe5f64520675"
+WEIXIN_APP_ID =wxac2abe5f64520675
+WEIXIN_APP_SECRET =ffb7848e59d6ff1ccdbfff19ed4a00d6
 
 #umeng
 RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
 
 #TalkingData
-RELEASE_TALKING_DATA_KEY="2E0D42A54FCD4C059EAF9EFDDEA9FBCE"
+RELEASE_TALKING_DATA_KEY="FBBB0F9F256E45A59AFB26FAAF8DCFCE"
 
 
 GROMORE_APP_ID="5423461"

video/oaid/src/main/assets/com.duben.carefree.cert.pem

+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgICf6cwDQYJKoZIhvcNAQELBQAwgYAxCzAJBgNVBAYTAkNO
+MRAwDgYDVQQIDAdCZWlqaW5nMQwwCgYDVQQKDANNU0ExETAPBgNVBAsMCE9BSURf
+U0RLMR4wHAYDVQQDDBVjb20uYnVuLm1paXRtZGlkLnNpZ24xHjAcBgkqhkiG9w0B
+CQEWD21zYUBjYWljdC5hYy5jbjAeFw0yMzExMDIxNzM1NDRaFw0yNDExMDIxNzM1
+NDRaMIGEMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpamluZzEQMA4GA1UEBwwH
+QmVpamluZzESMBAGA1UECgwJYXBwX2R1YmVuMRswGQYDVQQDDBJjb20uZHViZW4u
+Y2FyZWZyZWUxIDAeBgkqhkiG9w0BCQEWEWFwcF9kdWJlbkAxNjMuY29tMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAshgvU9xluAUrL51Tam/Ph5Z4yQEL
+0z3ex9d5tX/eOblLFGGDGmmbiAmI2+Knn2VMkIMsQVE2HwTk6RO3HHXDaGYAqdOU
+U54N9M75HOKY2sCSJDXiAtjRpTe0arjuCmv9Oi0rquTfm3y+/BNDMGQIp6MUrMH/
+8jWOUdSydm9yOwZ1u61Um+ymwdEOM+SpridOIT1ZewbUnX1Z750VUwQ0Zv3DIMrq
+RJfgghlvB1Ho8zx3R3h0Sta8e37sECPuY4DJg2ETV2Q+AJidLwpbq0EeWrzdsTrs
+QfB27QfpUIrbDZ0Ar2GNV6eLOxbX5k+icwzUP/70YF8WKzmlRX6GP7oKzvkn2ban
+o/pnSkdyoDmgAO+bfM3CXzOlhq2zyZd8R3Nm4Q+JBsEZEwHBye1kDiK1s/OQjwny
+KGIfJ2ZQZbAjWpiSYej5dpwLZp3zLQ7mGSaP9kCuifyhbcsLGCHpFOn4kbCWmrpw
+X+bA/SMW7yXEUQfh0QrMkimBIPM+15YfdHx4pn1IE9BreOP6Pp8z4ewqvQMunVrT
+MWBce/GdXqWqTiXVDaWViBE/MEB64iZmydfE5YnRkQFvOZFtpGtnK+LuhHevCUGv
+pzfpG0tHQ3rrzgRjrIqqgsuWngNKM/PB0VliIGtNjy02WxLOD3WKzcx1giEo55N+
+CqcMMWCVJ+mactcCAwEAAaMQMA4wDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsF
+AAOCAgEAo7D276jpmLi037rws0frxQhTS7oyMNqxU4F4wGJ+0gxMfgRX3uXrQSg3
+WAdfR4Igg/8Lb16lZl/iO7QYC7MsTMOpUT76bMoVTCKNFtl2Ohztjh7FOScgYRx/
+KyzHvjjjkfRDCHC+CB0aSiKH1DogsAAGegfMQcxbltb/bHh1gYL0W7wTLe0sG6zJ
+taDyTNqf0nu0bJ3HHOc8P75HK5gCkZS5WvBrp4Pac4O3U8T5x2NA26ceubxVeS3X
+DBRGbkSYEccPAcWJEOS3o3zE7sUnpU/yjixbDvcNywlf9egjN/FS2sDhCFBaI5BB
+5tVqpoxJXfZa4TBKkUpp51OvhbdGpOGnDavRysPdgzytZoOmx/OuWbxUrZ7kiNLw
+pJjZoOKP3Yt4zgdlFjpKAqn1lIjEypclqvMmWlXPa2/BW4JJPLZ9PrGUREWGxwMx
+cjT+0SALEdWWYWhW8WcgKCXJgYFTfDjgyx6CqmC9nPW6lw4rUG5xKMdC68wF52oL
+hojTeEdiA71R3hxh78ewFCV4aHzVM/QG/40xqtgdS4rQXvka3xVPTH3KVwrH6wRY
+U6R0csVHZ80dtp3SdKfVqfek0oOjfzkDmv2uMF5KdhQVu1epFNqOW3UgwvmN6N54
+SbAQWtajWwm1I25f1PtvA5toSBIVx1U8DE9ms/ho6hnXEFg07dM=
+-----END CERTIFICATE-----

video/oaid/src/main/assets/com.mints.ccsmart.cert.pem

------BEGIN CERTIFICATE-----
-MIIFlDCCA3ygAwIBAgICR+8wDQYJKoZIhvcNAQELBQAwgYAxCzAJBgNVBAYTAkNO
-MRAwDgYDVQQIDAdCZWlqaW5nMQwwCgYDVQQKDANNU0ExETAPBgNVBAsMCE9BSURf
-U0RLMR4wHAYDVQQDDBVjb20uYnVuLm1paXRtZGlkLnNpZ24xHjAcBgkqhkiG9w0B
-CQEWD21zYUBjYWljdC5hYy5jbjAeFw0yMzAzMjAxMzQwMzVaFw0yNDAzMjAxMzQw
-MzVaMIGGMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpamluZzEQMA4GA1UEBwwH
-QmVpamluZzEUMBIGA1UECgwLZGV2X3N1cHBvcnQxGjAYBgNVBAMMEWNvbS5taW50
-cy5jY3NtYXJ0MSEwHwYJKoZIhvcNAQkBFhJodXlpQHRlY2gtbWludHMuY24wggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyGC9T3GW4BSsvnVNqb8+HlnjJ
-AQvTPd7H13m1f945uUsUYYMaaZuICYjb4qefZUyQgyxBUTYfBOTpE7ccdcNoZgCp
-05RTng30zvkc4pjawJIkNeIC2NGlN7RquO4Ka/06LSuq5N+bfL78E0MwZAinoxSs
-wf/yNY5R1LJ2b3I7BnW7rVSb7KbB0Q4z5KmuJ04hPVl7BtSdfVnvnRVTBDRm/cMg
-yupEl+CCGW8HUejzPHdHeHRK1rx7fuwQI+5jgMmDYRNXZD4AmJ0vClurQR5avN2x
-OuxB8HbtB+lQitsNnQCvYY1Xp4s7FtfmT6JzDNQ//vRgXxYrOaVFfoY/ugrO+SfZ
-tqej+mdKR3KgOaAA75t8zcJfM6WGrbPJl3xHc2bhD4kGwRkTAcHJ7WQOIrWz85CP
-CfIoYh8nZlBlsCNamJJh6Pl2nAtmnfMtDuYZJo/2QK6J/KFtywsYIekU6fiRsJaa
-unBf5sD9IxbvJcRRB+HRCsySKYEg8z7Xlh90fHimfUgT0Gt44/o+nzPh7Cq9Ay6d
-WtMxYFx78Z1epapOJdUNpZWIET8wQHriJmbJ18TlidGRAW85kW2ka2cr4u6Ed68J
-Qa+nN+kbS0dDeuvOBGOsiqqCy5aeA0oz88HRWWIga02PLTZbEs4PdYrNzHWCISjn
-k34KpwwxYJUn6Zpy1wIDAQABoxAwDjAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEB
-CwUAA4ICAQBBlkd8vhOrPPZdn8mfKgrzfIvymycqjWwh6p7R20e88o+y06FaCIjx
-nPqlpftmyTQXGUStNplsValNUB6j5TnqqjSvRN9+8/eEwWhc0TpDxBV+2vylABWW
-93bYydL45t97+fidTQ7N5qVQ4O839Obd+ojCbGKaZ+gkISdO60ubhp3MfEC1246W
-wJCOohQQTvar6h2UwNT7DAMpEUNK+Vkwo9/bP0suwa90rS0fcy+iecRvqdffeSjU
-dXDDOd42p9mypnAOVDdLGp6zMbDWsQrCpBvHNgWojK16zJz6LIDDRBJh2yC5odQA
-U5Gd0lbizmUjEWZmTqOSrCqtjwbc0KHYg3askTby511Rs+jmfeKt1oDz4Ix0u7aI
-M6/XuWgoi3HjBIvPm79aGADkrU7JGuW3+PdySN4X8xvddW0js3Rn07xn6XncpNdt
-CgB204uCMnlPuWyqupb+kMPGgeqynPzhKCHhwhgOOBczJzcWXiIh3R+BN3X0p1XT
-lzYBibkpDsHxnabslqshfbgeNAkaMOzP3WL1nKQGrl9LAYCusgE8ugt/Pti/pmfE
-SqPjykcqcVO8PQW0HFFTbg2Cw/EgbRPJqZ6CWknYQndGuBM1d1g2fjWyus02/hLN
-CGVQ4VYjTJnjEYZIj7tJ6LvTF68hdR0jLbBSmgd//eKXgotOkWAWsw==
------END CERTIFICATE-----