添加oaid

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.shortplay"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.3"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -117,6 +117,7 @@ android {
         oppo {}
         huawei {}
         xiaomi {}
+        gdt_cz {}
         store360 {}
     }
 

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

@@ -9,6 +9,7 @@ import androidx.multidex.MultiDexApplication;
 
 import com.downloader.PRDownloader;
 import com.downloader.PRDownloaderConfig;
+import com.duben.oaid.MiitHelper;
 import com.duben.shortplay.ad.TTAdManagerHolder;
 import com.duben.shortplay.common.Constant;
 import com.duben.shortplay.manager.TXCSDKService;
@@ -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/shortplay/ui/activitys/VipActivity.kt

@@ -542,12 +542,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                 }
                 when (v.id) {
                     R.id.iv_dialog_vip_quit -> {
-//                        if (isGuide) {
-//                            readyGoThenKill(MainActivity::class.java)
-//                        } else {
-//                            finish()
-//                        }
-                        payYesDialog!!.dismiss()
+                        if (isGuide) {
+                            readyGoThenKill(MainActivity::class.java)
+                        } else {
+                            finish()
+                        }
+//                        payYesDialog!!.dismiss()
                     }
                     R.id.tv_dialog_vip_next -> {
                         cbVipAgreement.isChecked = true

video/app/src/main/java/com/duben/shortplay/utils/UIUtils.java

@@ -22,13 +22,22 @@ import java.lang.reflect.Method;
 public class UIUtils {
 
     public static int getScreenWidth(Context context) {
+        try {
             DisplayMetrics dm = context.getResources().getDisplayMetrics();
             return dm.widthPixels;
+        }catch (Exception e){
+            return 0;
+        }
     }
 
     public static int getScreenHeight(Context context) {
+
+        try {
             DisplayMetrics dm = context.getResources().getDisplayMetrics();
             return dm.heightPixels;
+        }catch (Exception e){
+            return 0;
+        }
     }
 
 

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

+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgICf6YwDQYJKoZIhvcNAQELBQAwgYAxCzAJBgNVBAYTAkNO
+MRAwDgYDVQQIDAdCZWlqaW5nMQwwCgYDVQQKDANNU0ExETAPBgNVBAsMCE9BSURf
+U0RLMR4wHAYDVQQDDBVjb20uYnVuLm1paXRtZGlkLnNpZ24xHjAcBgkqhkiG9w0B
+CQEWD21zYUBjYWljdC5hYy5jbjAeFw0yMzExMDIxNzM1NDRaFw0yNDExMDIxNzM1
+NDRaMIGFMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpamluZzEQMA4GA1UEBwwH
+QmVpamluZzESMBAGA1UECgwJYXBwX2R1YmVuMRwwGgYDVQQDDBNjb20uZHViZW4u
+c2hvcnRwbGF5MSAwHgYJKoZIhvcNAQkBFhFhcHBfZHViZW5AMTYzLmNvbTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALIYL1PcZbgFKy+dU2pvz4eWeMkB
+C9M93sfXebV/3jm5SxRhgxppm4gJiNvip59lTJCDLEFRNh8E5OkTtxx1w2hmAKnT
+lFOeDfTO+RzimNrAkiQ14gLY0aU3tGq47gpr/TotK6rk35t8vvwTQzBkCKejFKzB
+//I1jlHUsnZvcjsGdbutVJvspsHRDjPkqa4nTiE9WXsG1J19We+dFVMENGb9wyDK
+6kSX4IIZbwdR6PM8d0d4dErWvHt+7BAj7mOAyYNhE1dkPgCYnS8KW6tBHlq83bE6
+7EHwdu0H6VCK2w2dAK9hjVenizsW1+ZPonMM1D/+9GBfFis5pUV+hj+6Cs75J9m2
+p6P6Z0pHcqA5oADvm3zNwl8zpYats8mXfEdzZuEPiQbBGRMBwcntZA4itbPzkI8J
+8ihiHydmUGWwI1qYkmHo+XacC2ad8y0O5hkmj/ZAron8oW3LCxgh6RTp+JGwlpq6
+cF/mwP0jFu8lxFEH4dEKzJIpgSDzPteWH3R8eKZ9SBPQa3jj+j6fM+HsKr0DLp1a
+0zFgXHvxnV6lqk4l1Q2llYgRPzBAeuImZsnXxOWJ0ZEBbzmRbaRrZyvi7oR3rwlB
+r6c36RtLR0N6684EY6yKqoLLlp4DSjPzwdFZYiBrTY8tNlsSzg91is3MdYIhKOeT
+fgqnDDFglSfpmnLXAgMBAAGjEDAOMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEL
+BQADggIBAFtnAj/k/NcHGBczm24jOErubPz8ZoDEXZQMD20Q8wwfkrfeNVWIRcaw
+dDU5jaWz90Wcad0kV2ac64Y0rQNR0Q3pCPZnYrm6ijr1aR3Oonxmyq16XNr8HIBx
+UBeRXLxHRpviA+8XOt7/UUn1Ld8ljZluawyHsw1NNhB7BOlTwfKt5G5lahed584J
+jecJpSg1onEVkHPWgeeN4XZ6nRKs5hjMKpeLrnFgZoh63Twm7ndj9b3RAmMRfsfN
+bP0mIrwfbJF/KTiUXXSotmNvq04iUTwSuIFQwGwJulhdDI0Vm8wE9mScnLbbLxKD
+X4frFuMDtZkLT/HC93DECWjff/YC1MCkRBVLCZqQigjBC+mbX3yP8x05L0k6Rs9M
+Pjc/g7K+Yycxh1zn9t4ZB0qhVC2IqC8B3PxBOwNZpV1oI/YEOVBDNRN6B/TIYv93
+loFo+urI8aPkXqWZBTO+RasJJO+WLeie1Wd00r1SRWEknY5A2WoNwlNBP78G5i/F
+Y0hfLU/e2/L6W3mE79XL4hGxYmKDP6PmeeQw4kkhjd3th/VBhBv1J8F9Vdiy5l1J
+qpWmDvU7IvBhQ23M9qRrQJWE7Sy1wKGKzrd/rRVyBYKAUrnhM4VQN4OBhHYEl1+Z
+730foJ4HT3QDfP7tdcxBpb+/VWuPDpe2ceMU5978rsPdTKSDxwSZ
+-----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-----