From 2f1ab8af88cae4e723126ea5cf2f7d42dff7dbdc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 13:43:56 +0800
Subject: [PATCH] 穿山甲广告SDK更新，隐私合规修改
---
BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java | 63 +
BuWanVideo/libs/armeabi-v7a/libwind.so | 0
BuWanVideo/libs/arm64-v8a/libweibosdkcore.so | 0
library-SocialSdk/libs/umeng-common-9.4.2.jar | 0
BuWanVideo/libs/armeabi/libweibosdkcore.so | 0
BuWanVideo/res/layout/dialog_user_protocol.xml | 28
BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java | 3
BuWanVideo/src/com/weikou/beibeivideo/util/ad/TTAdManagerHolder.java | 22
library-SocialSdk/libs/umeng-sharetool-7.1.6.jar | 0
BuWanVideo/src/com/weikou/beibeivideo/util/ad/ExpressAdManager.java | 18
library-SocialSdk/libs/sina-weibo-openDefault-10.10.0.aar | 0
library-VideoPlayer/src/main/java/com/yeshi/video/player/common/IVideoPlayerListener.java | 25 +
BuWanVideo/libs/armeabi/libwind.so | 0
BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java | 38
library-GDTSDK/build.gradle | 2
BuWanVideo/res/xml/gdt_file_path.xml | 17
BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java | 3
BuWanVideo/res/drawable-xhdpi/icon_auth_notify_storage.png | 0
BuWanVideo/libs/open_ad_sdk_4.0.0.6.aar | 0
BuWanVideo/libs/armeabi-v7a/libutility.so | 0
library-SocialSdk/libs/umeng-share-sina-full-7.1.6.jar | 0
BuWanVideo/libs/arm64-v8a/libwind.so | 0
BuWanVideo/libs/arm64-v8a/libfsp2p.so | 0
BuWanVideo/build.gradle | 2
BuWanVideo/res/drawable-xhdpi/icon_auth_notify_phone.png | 0
library-SocialSdk/libs/umeng-shareboard-widget-7.1.6.jar | 0
library-common/libs/fastjson-1.2.7.jar | 0
BuWanVideo/res/values/strings.xml | 2
library-push/src/main/java/com/yeshi/push/PushUtil.java | 38
BuWanVideo/libs/armeabi/libutility.so | 0
BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java | 2
library-common/libs/eventbus-3.1.1.jar | 0
BuWanVideo/src/com/funshion/video/FSCompleteDeviceInfo.java | 849 +++++++++++++++++++++++++++++++++
BuWanVideo/res/drawable-xhdpi/ic_auth_notify_top.png | 0
BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java | 4
BuWanVideo/src/com/weikou/beibeivideo/util/ad/SplashAdUtil.java | 11
BuWanVideo/res/layout/dialog_auth_notify.xml | 124 ++++
BuWanVideo/libs/open_ad_sdk_3.9.0.2.aar | 0
BuWanVideo/res/layout/item_resource.xml | 64 +-
BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/PermissionAuthNotifyDialog.java | 100 ++++
BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java | 2
BuWanVideo/libs/armeabi-v7a/libweibosdkcore.so | 0
library-SocialSdk/libs/umeng-share-wechat-full-7.1.6.jar | 0
BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/UserProtocolDialog.java | 2
BuWanVideo/src/com/weikou/beibeivideo/util/ad/FullVideoAdManager.java | 8
library-SocialSdk/assets/geo_global_ca.cer | 0
BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/VideoResourceListDialog.java | 8
BuWanVideo/src/com/weikou/beibeivideo/util/ad/RewardVideoAdManager.java | 15
library-SocialSdk/libs/umeng-share-QQ-full-7.1.6.jar | 0
library-SocialSdk/libs/umeng-share-core-7.1.6.jar | 0
BuWanVideo/libs/arm64-v8a/libutility.so | 0
BuWanVideo/libs/armeabi/libfsp2p.so | 0
BuWanVideo/AndroidManifest.xml | 35
53 files changed, 1,327 insertions(+), 158 deletions(-)
diff --git a/BuWanVideo/AndroidManifest.xml b/BuWanVideo/AndroidManifest.xml
index 59848b1..efa3d0a 100644
--- a/BuWanVideo/AndroidManifest.xml
+++ b/BuWanVideo/AndroidManifest.xml
@@ -376,21 +376,20 @@
tools:replace="android:resource" />
</provider>
+ <provider
+ android:name="com.qq.e.comm.GDTFileProvider"
+ android:authorities="${applicationId}.gdt.fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/gdt_file_path" />
+ </provider>
- <!-- 澹版槑SDK鎵�闇�瑕佺殑缁勪欢 -->
+
<service
android:name="com.qq.e.comm.DownloadService"
android:exported="false" />
-
- <activity
- android:name="com.qq.e.ads.PortraitADActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
- android:screenOrientation="portrait" />
-
- <!-- 璇峰紑鍙戣�呮敞鎰忓瓧姣嶇殑澶у皬鍐欙紝ADActivity锛岃�屼笉鏄疉dActivity -->
- <activity
- android:name="com.qq.e.ads.ADActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
<!-- 缃戠洘骞垮憡 -->
<provider
@@ -461,7 +460,9 @@
<activity
android:name=".ui.push.PushOpenClickActivity"
- android:exported="true">
+ android:exported="true"
+ android:launchMode="singleTask"
+ android:screenOrientation="portrait">
<intent-filter>
@@ -485,11 +486,11 @@
android:name="push_kit_auto_init_enabled"
android:value="false" />
<!-- 鍗庝负鎺ㄩ�佹湇鍔℃敞鍐� -->
- <service android:name=".service.HWPushService">
- <intent-filter>
- <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
- </intent-filter>
- </service>
+<!-- <service android:name=".service.HWPushService">-->
+<!-- <intent-filter>-->
+<!-- <action android:name="com.huawei.push.action.MESSAGING_EVENT" />-->
+<!-- </intent-filter>-->
+<!-- </service>-->
<!--灏忕背鎺ㄩ�� -->
<meta-data
diff --git a/BuWanVideo/build.gradle b/BuWanVideo/build.gradle
index 4663132..214386a 100644
--- a/BuWanVideo/build.gradle
+++ b/BuWanVideo/build.gradle
@@ -27,7 +27,7 @@
implementation project(path: ':library-APPUpdate')
//绌垮北鐢插箍鍛�
- implementation files('libs/open_ad_sdk_3.9.0.2.aar')
+ implementation files('libs/open_ad_sdk_4.0.0.6.aar')
//闃块噷鐧惧窛
implementation files('libs/avmpaar3-5.4.36.aar')
diff --git a/BuWanVideo/libs/arm64-v8a/libfsp2p.so b/BuWanVideo/libs/arm64-v8a/libfsp2p.so
new file mode 100644
index 0000000..0404e6a
--- /dev/null
+++ b/BuWanVideo/libs/arm64-v8a/libfsp2p.so
Binary files differ
diff --git a/BuWanVideo/libs/arm64-v8a/libutility.so b/BuWanVideo/libs/arm64-v8a/libutility.so
new file mode 100644
index 0000000..0d17250
--- /dev/null
+++ b/BuWanVideo/libs/arm64-v8a/libutility.so
Binary files differ
diff --git a/BuWanVideo/libs/arm64-v8a/libweibosdkcore.so b/BuWanVideo/libs/arm64-v8a/libweibosdkcore.so
new file mode 100644
index 0000000..e4de30f
--- /dev/null
+++ b/BuWanVideo/libs/arm64-v8a/libweibosdkcore.so
Binary files differ
diff --git a/BuWanVideo/libs/arm64-v8a/libwind.so b/BuWanVideo/libs/arm64-v8a/libwind.so
new file mode 100644
index 0000000..feee45a
--- /dev/null
+++ b/BuWanVideo/libs/arm64-v8a/libwind.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi-v7a/libutility.so b/BuWanVideo/libs/armeabi-v7a/libutility.so
new file mode 100644
index 0000000..b26b1e0
--- /dev/null
+++ b/BuWanVideo/libs/armeabi-v7a/libutility.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi-v7a/libweibosdkcore.so b/BuWanVideo/libs/armeabi-v7a/libweibosdkcore.so
new file mode 100644
index 0000000..ef6434a
--- /dev/null
+++ b/BuWanVideo/libs/armeabi-v7a/libweibosdkcore.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi-v7a/libwind.so b/BuWanVideo/libs/armeabi-v7a/libwind.so
new file mode 100644
index 0000000..70360d2
--- /dev/null
+++ b/BuWanVideo/libs/armeabi-v7a/libwind.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi/libfsp2p.so b/BuWanVideo/libs/armeabi/libfsp2p.so
new file mode 100644
index 0000000..0404e6a
--- /dev/null
+++ b/BuWanVideo/libs/armeabi/libfsp2p.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi/libutility.so b/BuWanVideo/libs/armeabi/libutility.so
new file mode 100644
index 0000000..b26b1e0
--- /dev/null
+++ b/BuWanVideo/libs/armeabi/libutility.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi/libweibosdkcore.so b/BuWanVideo/libs/armeabi/libweibosdkcore.so
new file mode 100644
index 0000000..ef6434a
--- /dev/null
+++ b/BuWanVideo/libs/armeabi/libweibosdkcore.so
Binary files differ
diff --git a/BuWanVideo/libs/armeabi/libwind.so b/BuWanVideo/libs/armeabi/libwind.so
new file mode 100644
index 0000000..70360d2
--- /dev/null
+++ b/BuWanVideo/libs/armeabi/libwind.so
Binary files differ
diff --git a/BuWanVideo/libs/open_ad_sdk_3.9.0.2.aar b/BuWanVideo/libs/open_ad_sdk_3.9.0.2.aar
new file mode 100644
index 0000000..6e834b0
--- /dev/null
+++ b/BuWanVideo/libs/open_ad_sdk_3.9.0.2.aar
Binary files differ
diff --git a/BuWanVideo/libs/open_ad_sdk_4.0.0.6.aar b/BuWanVideo/libs/open_ad_sdk_4.0.0.6.aar
new file mode 100644
index 0000000..1612be2
--- /dev/null
+++ b/BuWanVideo/libs/open_ad_sdk_4.0.0.6.aar
Binary files differ
diff --git a/BuWanVideo/res/drawable-xhdpi/ic_auth_notify_top.png b/BuWanVideo/res/drawable-xhdpi/ic_auth_notify_top.png
new file mode 100644
index 0000000..7b7509f
--- /dev/null
+++ b/BuWanVideo/res/drawable-xhdpi/ic_auth_notify_top.png
Binary files differ
diff --git a/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_phone.png b/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_phone.png
new file mode 100644
index 0000000..421815d
--- /dev/null
+++ b/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_phone.png
Binary files differ
diff --git a/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_storage.png b/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_storage.png
new file mode 100644
index 0000000..e551e5c
--- /dev/null
+++ b/BuWanVideo/res/drawable-xhdpi/icon_auth_notify_storage.png
Binary files differ
diff --git a/BuWanVideo/res/layout/dialog_auth_notify.xml b/BuWanVideo/res/layout/dialog_auth_notify.xml
new file mode 100644
index 0000000..75c64bf
--- /dev/null
+++ b/BuWanVideo/res/layout/dialog_auth_notify.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_user_protocol_dialog_bg"
+ android:orientation="vertical">
+
+ <com.lcjian.library.widget.RatioLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:ratio="0.3243">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_auth_notify_top"></ImageView>
+
+ </com.lcjian.library.widget.RatioLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:padding="20dp">
+
+ <LinearLayout
+ android:layout_marginTop="10dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="7dp"
+ android:src="@drawable/icon_auth_notify_phone">
+
+ </ImageView>
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎵嬫満"
+ android:textColor="#ff333333"
+ android:textSize="16sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="鏍￠獙鎵嬫満璇嗗埆鐮侊紝闃叉璐﹀彿琚洍"
+ android:textColor="#ff999999"
+ android:textSize="11sp" />
+
+ </LinearLayout>
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="7dp"
+ android:src="@drawable/icon_auth_notify_storage"></ImageView>
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="瀛樺偍"
+ android:textColor="#ff333333"
+ android:textSize="16sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="瀛樺偍鍥剧墖鍜岃棰戯紝闄嶄綆缃戠粶娑堣��"
+ android:textColor="#ff999999"
+ android:textSize="11sp" />
+
+ </LinearLayout>
+
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/tv_positive"
+ android:layout_width="match_parent"
+ android:layout_height="44dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="10dp"
+ android:layout_weight="1"
+ android:background="@drawable/shape_dialog_user_protocol_positive"
+ android:gravity="center"
+ android:text="鐜板湪寮�鍚�"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/BuWanVideo/res/layout/dialog_user_protocol.xml b/BuWanVideo/res/layout/dialog_user_protocol.xml
index 12a172e..5168905 100644
--- a/BuWanVideo/res/layout/dialog_user_protocol.xml
+++ b/BuWanVideo/res/layout/dialog_user_protocol.xml
@@ -13,21 +13,27 @@
android:layout_marginTop="10dp"
android:gravity="center"
android:padding="8dp"
- android:text="娓╅Θ鎻愮ず"
+ android:text="鐢ㄦ埛鍗忚涓庨殣绉佷繚鎶�"
android:textColor="@color/black"
android:textSize="20sp" />
-
- <TextView
- android:id="@+id/tv_content"
- android:autoLink="all"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:textSize="10sp"
- android:lineSpacingExtra="8sp"
- android:background="@null"
- android:layout_marginRight="10dp"></TextView>
+ android:layout_height="250dp">
+
+
+ <TextView
+ android:id="@+id/tv_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:autoLink="all"
+ android:background="@null"
+ android:lineSpacingExtra="4sp"
+ android:textSize="12sp"></TextView>
+
+ </ScrollView>
<LinearLayout
android:layout_width="match_parent"
diff --git a/BuWanVideo/res/layout/item_resource.xml b/BuWanVideo/res/layout/item_resource.xml
index ae3fc9c..bd54bf0 100644
--- a/BuWanVideo/res/layout/item_resource.xml
+++ b/BuWanVideo/res/layout/item_resource.xml
@@ -1,38 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="64dp"
- android:background="@color/page_content_bg_color"
- android:gravity="center"
- android:paddingLeft="25dp"
- android:paddingRight="28dp">
+ android:layout_height="wrap_content"
+ android:background="@color/page_content_bg_color">
- <ImageView
- android:id="@+id/iv_resource"
- android:layout_width="35dp"
- android:layout_height="35dp" />
+ <LinearLayout
+ android:id="@+id/ll_content"
+ android:layout_width="match_parent"
+ android:layout_height="64dp"
+ android:gravity="center"
+ android:paddingLeft="25dp"
+ android:paddingRight="28dp">
- <TextView
- android:id="@+id/tv_resource"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="17.5dp"
- android:layout_weight="1"
- android:gravity="left"
- android:text="鐖卞鑹�"
- android:textColor="@color/video_detail_resource_text_color"
- android:textSize="20sp" />
- <TextView
- android:id="@+id/tv_input"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawableRight="@drawable/ic_video_resource_input"
- android:drawablePadding="8.5dp"
- android:text="褰撳墠娴忚"
- android:textColor="#ff666666"
- android:textSize="13sp" />
+ <ImageView
+ android:id="@+id/iv_resource"
+ android:layout_width="35dp"
+ android:layout_height="35dp" />
+
+ <TextView
+ android:id="@+id/tv_resource"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="17.5dp"
+ android:layout_weight="1"
+ android:gravity="left"
+ android:text="鐖卞鑹�"
+ android:textColor="@color/video_detail_resource_text_color"
+ android:textSize="20sp" />
+
+ <TextView
+ android:id="@+id/tv_input"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawableRight="@drawable/ic_video_resource_input"
+ android:drawablePadding="8.5dp"
+ android:text="褰撳墠娴忚"
+ android:textColor="#ff666666"
+ android:textSize="13sp" />
+
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/BuWanVideo/res/values/strings.xml b/BuWanVideo/res/values/strings.xml
index 6d32a37..7ff718f 100644
--- a/BuWanVideo/res/values/strings.xml
+++ b/BuWanVideo/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
- <string name="app_name">褰辫澶у叏</string>
+ <string name="app_name">褰辫澶у叏甯冧父</string>
<string name="recommend">鎺ㄨ崘</string>
<string name="category">鍒嗙被</string>
<string name="discover">鍙戠幇</string>
diff --git a/BuWanVideo/res/xml/gdt_file_path.xml b/BuWanVideo/res/xml/gdt_file_path.xml
index 4364581..925d70e 100644
--- a/BuWanVideo/res/xml/gdt_file_path.xml
+++ b/BuWanVideo/res/xml/gdt_file_path.xml
@@ -1,12 +1,9 @@
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
<!-- 杩欎釜涓嬭浇璺緞涔熶笉鍙互淇敼锛屽繀椤讳负GDTDOWNLOAD -->
- <external-path
- name="gdt_sdk_download_path"
- path="GDTDOWNLOAD" />
- <external-path
- name="files_root"
- path="Android/data/com.doudou.ysvideo/" />
- <external-path
- name="external_storage_root"
- path="." />
+ <external-cache-path
+ name="gdt_sdk_download_path1"
+ path="com_qq_e_download" />
+ <cache-path
+ name="gdt_sdk_download_path2"
+ path="com_qq_e_download" />
</paths>
\ No newline at end of file
diff --git a/BuWanVideo/src/com/funshion/video/FSCompleteDeviceInfo.java b/BuWanVideo/src/com/funshion/video/FSCompleteDeviceInfo.java
new file mode 100644
index 0000000..9b7e606
--- /dev/null
+++ b/BuWanVideo/src/com/funshion/video/FSCompleteDeviceInfo.java
@@ -0,0 +1,849 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.funshion.video;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.location.Location;
+import android.location.LocationManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiInfo;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.provider.Settings.Secure;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+
+import com.funshion.video.config.FSApp;
+
+import java.net.NetworkInterface;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import static android.content.Context.TELEPHONY_SERVICE;
+
+public class FSCompleteDeviceInfo {
+ public static String mMacAddress;
+ public static String packageName;
+ public static String appName;
+ public static String ZIP_CODE_MAP;
+ public static LocationManager locationManager;
+
+ public FSCompleteDeviceInfo() {
+ }
+
+ public static String getAndroidID(Context var0) {
+ try {
+ return Secure.getString(var0.getContentResolver(), "android_id");
+ } catch (Exception var1) {
+ return "";
+ }
+ }
+
+ public static String getMacAddress2(Context var0) {
+ if (!TextUtils.isEmpty(mMacAddress)) {
+ return mMacAddress;
+ } else {
+ mMacAddress = getWifiMac();
+ if (TextUtils.isEmpty(mMacAddress)) {
+ mMacAddress = getMacAddress(var0);
+ }
+
+ return mMacAddress;
+ }
+ }
+
+
+ public static String getWifiMac() {
+ Log.i("FSCompleteDeviceInfo","getWifiMac");
+ if (1 > 0) {
+ return "00:00:00:00:00:00";
+ }
+ Enumeration var10000;
+ boolean var10001;
+ try {
+ var10000 = NetworkInterface.getNetworkInterfaces();
+ } catch (Exception var22) {
+ var10001 = false;
+ return mMacAddress;
+ }
+
+ Enumeration var0 = var10000;
+
+ while (true) {
+ boolean var24;
+ try {
+ var24 = var0.hasMoreElements();
+ } catch (Exception var21) {
+ var10001 = false;
+ break;
+ }
+
+ if (!var24) {
+ break;
+ }
+
+ NetworkInterface var25;
+ try {
+ var25 = (NetworkInterface) var0.nextElement();
+ } catch (Exception var20) {
+ var10001 = false;
+ break;
+ }
+
+ NetworkInterface var1 = var25;
+
+ byte[] var26;
+ try {
+ var26 = var25.getHardwareAddress();
+ } catch (Exception var19) {
+ var10001 = false;
+ break;
+ }
+
+ byte[] var2 = var26;
+ if (var26 != null) {
+ int var27;
+ try {
+ var27 = var2.length;
+ } catch (Exception var18) {
+ var10001 = false;
+ break;
+ }
+
+ if (var27 != 0) {
+ StringBuilder var29;
+ try {
+ var26 = var2;
+ var29 = new StringBuilder();
+ } catch (Exception var17) {
+ var10001 = false;
+ break;
+ }
+
+ StringBuilder var3 = var29;
+
+ try {
+// var29.init();
+ var27 = var26.length;
+ } catch (Exception var16) {
+ var10001 = false;
+ break;
+ }
+
+ int var4 = var27;
+
+ StringBuilder var28;
+ String var31;
+ for (int var5 = 0; var5 < var4; ++var5) {
+ byte var30;
+ try {
+ var28 = var3;
+ var30 = var2[var5];
+ } catch (Exception var15) {
+ var10001 = false;
+ return mMacAddress;
+ }
+
+ byte var6 = var30;
+ var31 = "%02X:";
+
+ Object[] var10002;
+ try {
+ var10002 = new Object[1];
+ } catch (Exception var14) {
+ var10001 = false;
+ return mMacAddress;
+ }
+
+ Object[] var10003 = var10002;
+ byte var10004 = 0;
+
+ try {
+ var10003[var10004] = var6;
+ var28.append(String.format(var31, var10002));
+ } catch (Exception var13) {
+ var10001 = false;
+ return mMacAddress;
+ }
+ }
+
+ try {
+ var27 = var3.length();
+ } catch (Exception var12) {
+ var10001 = false;
+ break;
+ }
+
+ if (var27 > 0) {
+ int var32;
+ try {
+ var28 = var3;
+ var32 = var3.length();
+ } catch (Exception var11) {
+ var10001 = false;
+ break;
+ }
+
+ --var32;
+
+ try {
+ var28.deleteCharAt(var32);
+ } catch (Exception var10) {
+ var10001 = false;
+ break;
+ }
+ }
+
+ try {
+ var25 = var1;
+ var31 = var3.toString();
+ } catch (Exception var9) {
+ var10001 = false;
+ break;
+ }
+
+ String var23 = var31;
+
+ try {
+ var24 = var25.getName().equals("wlan0");
+ } catch (Exception var8) {
+ var10001 = false;
+ break;
+ }
+
+ if (var24) {
+ try {
+ mMacAddress = var23.toLowerCase();
+ } catch (Exception var7) {
+ var10001 = false;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return mMacAddress;
+ }
+
+ public static String getMacAddress(Context var0) {
+ WifiInfo var10000;
+ boolean var10001;
+ try {
+ var10000 = getWifiInfo(var0);
+ } catch (Exception var3) {
+ var10001 = false;
+ return "00:00:00:00:00:00";
+ }
+
+ WifiInfo var4 = var10000;
+ if (var10000 != null) {
+ String var6;
+ try {
+ var6 = var4.getMacAddress();
+ } catch (Exception var2) {
+ var10001 = false;
+ return "00:00:00:00:00:00";
+ }
+
+ String var5 = var6;
+ if (var6 != null) {
+ try {
+ return var5.toLowerCase(Locale.getDefault());
+ } catch (Exception var1) {
+ var10001 = false;
+ }
+ }
+ }
+
+ return "00:00:00:00:00:00";
+ }
+
+ public static String getMacAddressNoFormat(Context var0) {
+ return getMacAddress(var0).replace(":", "");
+ }
+
+ public static WifiInfo getWifiInfo(Context param0) {
+ // $FF: Couldn't be decompiled
+ return null;
+ }
+
+ public static String getBuildBOARD(Context var0) {
+ return Build.BOARD;
+ }
+
+ public static String getBuildBRAND(Context var0) {
+ return Build.BRAND;
+ }
+
+ public static String getBuildCPUABI(Context var0) {
+ return Build.CPU_ABI;
+ }
+
+ public static String getBuildDEVICE(Context var0) {
+ return Build.DEVICE;
+ }
+
+ public static String getBuildDISPLAY(Context var0) {
+ return Build.DISPLAY;
+ }
+
+ public static String getBuildFINGERPRINT(Context var0) {
+ return Build.FINGERPRINT;
+ }
+
+ public static String getBuildHOST(Context var0) {
+ return Build.HOST;
+ }
+
+ public static String getBuildID(Context var0) {
+ return Build.ID;
+ }
+
+ public static String getBuildMANUFACTURER(Context var0) {
+ return Build.MANUFACTURER;
+ }
+
+ public static String getBuildMODEL(Context var0) {
+ return Build.MODEL;
+ }
+
+ public static String getBuildPRODUCT(Context var0) {
+ return Build.PRODUCT;
+ }
+
+ public static String getBuildTAGS(Context var0) {
+ return Build.TAGS;
+ }
+
+ public static long getBuildTIME(Context var0) {
+ return Build.TIME;
+ }
+
+ public static String getBuildTYPE(Context var0) {
+ return Build.TYPE;
+ }
+
+ public static String getBuildUSER(Context var0) {
+ return Build.USER;
+ }
+
+ public static String getFUUID() {
+ return FSApp.getInstance().getFudid();
+ }
+
+ public static String getPackageName(Context var0) {
+ if (!TextUtils.isEmpty(packageName)) {
+ return packageName;
+ } else {
+ try {
+ packageName = var0.getPackageName();
+ } catch (Exception var1) {
+ }
+
+ return packageName;
+ }
+ }
+
+ public static String getAPPName(Context var0) {
+ if (!TextUtils.isEmpty(appName)) {
+ return appName;
+ } else {
+ Exception var10000;
+ label28:
+ {
+ boolean var10001;
+ Context var4;
+ int var5;
+ try {
+ var4 = var0;
+ var5 = var0.getPackageManager().getPackageInfo(var0.getPackageName(), 0).applicationInfo.labelRes;
+ } catch (Exception var2) {
+ var10000 = var2;
+ var10001 = false;
+ break label28;
+ }
+
+ int var3 = var5;
+
+ try {
+ appName = var4.getResources().getString(var3);
+ return appName;
+ } catch (Exception var1) {
+ var10000 = var1;
+ var10001 = false;
+ }
+ }
+
+ var10000.printStackTrace();
+ return appName;
+ }
+ }
+
+ public static String getRunningActivityName(Context var0) {
+ ActivityManager var3;
+ ActivityManager var10000 = var3 = (ActivityManager) var0.getSystemService("activity");
+ String var1 = null;
+ if (var10000 != null) {
+ String var4;
+ try {
+ var4 = ((RunningTaskInfo) var3.getRunningTasks(1).get(0)).topActivity.getClassName();
+ } catch (Exception var2) {
+ return var1;
+ }
+
+ var1 = var4;
+ }
+
+ return var1;
+ }
+
+ public static String getAppVersionName(Context var0) {
+ try {
+ return var0.getPackageManager().getPackageInfo(var0.getPackageName(), 0).versionName;
+ } catch (Exception var1) {
+ return "";
+ }
+ }
+
+ public static int getAppVersionCode(Context var0) {
+ Context var10000 = var0;
+ int var1 = 0;
+
+ int var3;
+ try {
+ var3 = var10000.getPackageManager().getPackageInfo(var0.getPackageName(), 0).versionCode;
+ } catch (Exception var2) {
+ return var1;
+ }
+
+ var1 = var3;
+ return var1;
+ }
+
+ public static String getNetworkType(Context var0) {
+ ConnectivityManager var10000;
+ boolean var10001;
+ try {
+ var10000 = (ConnectivityManager) var0.getSystemService("connectivity");
+ } catch (Exception var6) {
+ var10001 = false;
+ return "others";
+ }
+
+ ConnectivityManager var1 = var10000;
+ if (var10000 != null) {
+ NetworkInfo var8;
+ try {
+ var8 = var1.getActiveNetworkInfo();
+ } catch (Exception var5) {
+ var10001 = false;
+ return "others";
+ }
+
+ NetworkInfo var7 = var8;
+ if (var8 != null) {
+ int var9;
+ try {
+ var9 = var7.getType();
+ } catch (Exception var4) {
+ var10001 = false;
+ return "others";
+ }
+
+ if (var9 != 1) {
+ try {
+ var9 = var7.getType();
+ } catch (Exception var3) {
+ var10001 = false;
+ return "others";
+ }
+
+ if (var9 != 0) {
+ return "others";
+ }
+
+ try {
+ var9 = ((TelephonyManager) var0.getSystemService("phone")).getNetworkType();
+ } catch (Exception var2) {
+ var10001 = false;
+ return "others";
+ }
+
+ switch (var9) {
+ case 1:
+ case 2:
+ case 4:
+ case 7:
+ case 11:
+ return "2G";
+ case 3:
+ case 5:
+ case 6:
+ case 8:
+ case 9:
+ case 10:
+ case 12:
+ case 14:
+ case 15:
+ return "3G";
+ case 13:
+ return "4G";
+ default:
+ return "others";
+ }
+ }
+
+ return "WIFI";
+ }
+ }
+
+ return "others";
+ }
+
+ public static DisplayMetrics getDisplayMetrics(Context param0) {
+ return param0.getResources().getDisplayMetrics(); // $FF: Couldn't be decompiled
+ }
+
+ public static String getResoluton(Context var0) {
+ DisplayMetrics var1;
+ return (var1 = getDisplayMetrics(var0)) != null ? var1.widthPixels + "*" + var1.heightPixels : null;
+ }
+
+ public static int getTimeZoneOffset(Context var0) {
+ try {
+ TimeZone var10000 = TimeZone.getDefault();
+ return var10000.getOffset(GregorianCalendar.getInstance(var10000).getTimeInMillis());
+ } catch (Exception var1) {
+ return 0;
+ }
+ }
+
+ public static final String getIMEI(Context var0) {
+ String var10000;
+ try {
+ var10000 = ((TelephonyManager) var0.getSystemService("phone")).getDeviceId();
+ } catch (Exception var1) {
+ return "";
+ }
+
+ String var2 = var10000;
+ if (var10000 == null) {
+ var2 = "";
+ }
+
+ return var2;
+ }
+
+ public static String getIMSI(Context var0) {
+ String var10000;
+ try {
+ var10000 = ((TelephonyManager) var0.getSystemService("phone")).getSubscriberId();
+ } catch (Exception var1) {
+ return "";
+ }
+
+ String var2 = var10000;
+ if (var10000 == null) {
+ var2 = "";
+ }
+
+ return var2;
+ }
+
+ public static String getOSName() {
+ return "Android";
+ }
+
+ public static String getOSVersion() {
+ return VERSION.RELEASE;
+ }
+
+ public static int getTargetSDKVersion(Context var0) {
+ try {
+ return var0.getPackageManager().getPackageInfo(var0.getPackageName(), 0).applicationInfo.targetSdkVersion;
+ } catch (Exception var1) {
+ return 0;
+ }
+ }
+
+ public static String getChannel(Context var0) {
+ try {
+ return var0.getPackageManager().getApplicationInfo(getPackageName(var0), 128).metaData.getString("ire_channel");
+ } catch (NameNotFoundException var1) {
+ return null;
+ }
+ }
+
+ public static String getContryZipCodeNumber(Context var0) {
+ String var3 = getCountryZipCode(var0);
+ String var1 = "-1";
+ int var2;
+ int var4;
+ if (ZIP_CODE_MAP.contains(var3) && (var4 = ZIP_CODE_MAP.indexOf(var3)) != -1 && (var2 = findIndex(ZIP_CODE_MAP, var4 - 4, var4)) != -1) {
+ var1 = ZIP_CODE_MAP.substring(var2 + 1, var4);
+ }
+
+ return var1;
+ }
+
+ public static int findIndex(String var0, int var1, int var2) {
+ if (ZIP_CODE_MAP.charAt(var1) == '|') {
+ return var1;
+ } else {
+ return ++var1 < var2 ? findIndex(var0, var1, var2) : -1;
+ }
+ }
+
+ public static String getCountryZipCode(Context var0) {
+ return var0.getResources().getConfiguration().locale.getCountry();
+ }
+
+ public static String getDate(String var0) {
+ try {
+ return (new SimpleDateFormat(var0, Locale.getDefault())).format(new Date(System.currentTimeMillis()));
+ } catch (Exception var1) {
+ return null;
+ }
+ }
+
+ public static String getIRSDKVersion() {
+ return "2.3.1";
+ }
+
+ public static boolean isApplicationAvaliable(Context var0, String var1) {
+ List var10000;
+ boolean var10001;
+ try {
+ var10000 = var0.getPackageManager().getInstalledPackages(0);
+ } catch (Exception var5) {
+ var10001 = false;
+ return false;
+ }
+
+ List var6 = var10000;
+ if (var10000 == null) {
+ return false;
+ } else {
+ int var2 = 0;
+
+ while (true) {
+ int var7;
+ int var9;
+ try {
+ var7 = var2;
+ var9 = var6.size();
+ } catch (Exception var4) {
+ var10001 = false;
+ break;
+ }
+
+ if (var7 >= var9) {
+ return false;
+ }
+
+ boolean var8;
+ try {
+ var8 = var1.equals(((PackageInfo) var6.get(var2)).packageName);
+ } catch (Exception var3) {
+ var10001 = false;
+ break;
+ }
+
+ if (var8) {
+ return true;
+ }
+
+ ++var2;
+ }
+
+ return false;
+ }
+ }
+
+ public static SIMInfo getSIMInfo(Context param0) {
+ // $FF: Couldn't be decompiled
+
+ TelephonyManager manager = (TelephonyManager) param0.getSystemService(TELEPHONY_SERVICE);
+ return SIMInfo.build(manager);
+ }
+
+ public static Location getLocation(Context var0) {
+ locationManager = (LocationManager) var0.getSystemService("location");
+ List var10000 = locationManager.getProviders(true);
+ Location var3 = null;
+ Iterator var1 = var10000.iterator();
+
+ while (var1.hasNext()) {
+ Location var2;
+ if ((var2 = locationManager.getLastKnownLocation((String) var1.next())) != null) {
+ if (var3 != null && var2.getAccuracy() >= var3.getAccuracy()) {
+ var2 = var3;
+ }
+
+ var3 = var2;
+ }
+ }
+
+ return var3;
+ }
+
+ public static String getLongitude(Context param0) {
+ // $FF: Couldn't be decompiled
+ return null;
+ }
+
+ public static String getLatitude(Context param0) {
+ // $FF: Couldn't be decompiled
+ return null;
+ }
+
+ public static boolean checkApkExist(Context var0, String var1) {
+ if (TextUtils.isEmpty(var1)) {
+ return false;
+ } else {
+ try {
+ var0.getPackageManager().getApplicationInfo(var1, 8192);
+ } catch (NameNotFoundException var2) {
+ return false;
+ }
+
+ return true;
+ }
+ }
+
+ public static String TestAllFunction(Context var0) {
+ StringBuffer var10000 = new StringBuffer();
+ var10000.append(" androidId:" + getAndroidID(var0));
+ var10000.append(" MAC:" + getMacAddress(var0));
+ var10000.append(" MAC:" + getMacAddressNoFormat(var0));
+ var10000.append(" FUDID:" + getFUUID());
+ var10000.append(" AppPackageName:" + getPackageName(var0));
+ var10000.append(" AppRunningActivityName:" + getRunningActivityName(var0));
+ var10000.append(" AppVersionName:" + getAppVersionName(var0));
+ var10000.append(" AppVersionCode:" + getAppVersionCode(var0));
+ var10000.append(" NetworkType:" + getNetworkType(var0));
+ var10000.append(" Resolution:" + getResoluton(var0));
+ var10000.append(" TimeZone:" + getTimeZoneOffset(var0));
+ var10000.append(" OSName:" + getOSName());
+ var10000.append(" OSVersion:" + getOSVersion());
+ var10000.append(" SDKVersion:" + getTargetSDKVersion(var0));
+ var10000.append(" Channel:" + getChannel(var0));
+ var10000.append(" Date:" + getDate("yyyyMMdd"));
+ var10000.append(" " + getSIMInfo(var0));
+ var10000.append(" Build.Board:" + getBuildBOARD(var0));
+ var10000.append(" Build.Brand:" + getBuildBRAND(var0));
+ var10000.append(" Build.CPU_ABI:" + getBuildCPUABI(var0));
+ var10000.append(" Build.DEVICE:" + getBuildDEVICE(var0));
+ var10000.append(" Build.DISPLAY:" + getBuildDISPLAY(var0));
+ var10000.append(" Build.FINGERPRINT:" + getBuildFINGERPRINT(var0));
+ var10000.append(" Build.HOST:" + getBuildHOST(var0));
+ var10000.append(" Build.ID:" + getBuildID(var0));
+ var10000.append(" Build.MANUFUACTURER:" + getBuildMANUFACTURER(var0));
+ var10000.append(" Build.MODEL:" + getBuildMODEL(var0));
+ var10000.append(" Build.PRODUCT:" + getBuildPRODUCT(var0));
+ var10000.append(" Build.TAGS:" + getBuildTAGS(var0));
+ var10000.append(" Build.TIME:" + getBuildTIME(var0));
+ var10000.append(" Build.TYPE:" + getBuildTYPE(var0));
+ var10000.append(" Build.USER:" + getBuildUSER(var0));
+ return var10000.toString();
+ }
+
+ public static class SIMInfo {
+ public String imei;
+ public String SimOperator;
+ public String MNC;
+ public String MCC;
+ public int LAC;
+ public int CID;
+ public String imsi;
+ public String phoneNumber;
+
+ public SIMInfo() {
+ }
+
+ public static SIMInfo build(TelephonyManager var0) {
+ if (var0 == null) {
+ return null;
+ } else {
+ SIMInfo var10000 = new SIMInfo();
+ SIMInfo var1;
+ SIMInfo var10001 = var1 = var10000;
+ TelephonyManager var10002 = var0;
+ SIMInfo var10003 = var1;
+ TelephonyManager var10004 = var0;
+ SIMInfo var10005 = var1;
+ TelephonyManager var10006 = var0;
+ SIMInfo var10007 = var1;
+ TelephonyManager var10008 = var0;
+// var1.init();
+
+ String var22;
+ boolean var24;
+ try {
+ var10007.imei = var10008.getDeviceId();
+ var10005.SimOperator = var10006.getSimOperator();
+ var10003.phoneNumber = var10004.getLine1Number();
+ var10001.imsi = var10002.getSubscriberId();
+ var22 = var10000.SimOperator;
+ } catch (Throwable var21) {
+ var24 = false;
+ return var1;
+ }
+
+ if (var22 != null) {
+ int var23;
+ try {
+ var23 = var1.SimOperator.length();
+ } catch (Throwable var20) {
+ var24 = false;
+ return var1;
+ }
+
+ if (var23 >= 4) {
+ String var25;
+ try {
+ var10000 = var1;
+ var1.MCC = var1.SimOperator.substring(0, 3);
+ var25 = var1.SimOperator;
+ } catch (Throwable var19) {
+ var24 = false;
+ return var1;
+ }
+
+ byte var26 = 3;
+
+ try {
+ var10000.MNC = var25.substring(var26, var1.SimOperator.length());
+ } catch (Throwable var18) {
+ var24 = false;
+ return var1;
+ }
+ }
+ }
+
+ return var1;
+ }
+ }
+
+ public String toString() {
+ return "SIMInfo [imei=" + this.imei + ", SimOperator=" + this.SimOperator + ", MNC=" + this.MNC + ", MCC=" + this.MCC + ", LAC=" + this.LAC + ", CID=" + this.CID + "]";
+ }
+ }
+}
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java b/BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java
index a8be9a1..c2a48b5 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java
@@ -24,6 +24,8 @@
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
import com.qq.e.comm.managers.GDTADManager;
+import com.qq.e.comm.managers.GDTAdSdk;
+import com.qq.e.comm.util.GDTLogger;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
@@ -56,7 +58,6 @@
import androidx.multidex.MultiDex;
-
public class BeibeiVideoApplication extends Application {
private final static String TAG = BeibeiVideoApplication.class.getName();
@@ -73,6 +74,12 @@
public static BeibeiVideoApplication getInstance() {
return instance;
+ }
+
+ //鍏煎4.4浠ヤ笅鐗堟湰
+ protected void attachBaseContext(Context newBase) {
+ super.attachBaseContext(newBase);
+ MultiDex.install(this);
}
private static Handler handler = new Handler() {
@@ -133,7 +140,7 @@
application = this;
instance = this;
MultiDex.install(this);
- if (UserUtil.isAgreeUserProtocol(this)||BeibeiConstant.IS_TEST) {
+ if (UserUtil.isAgreeUserProtocol(this) || BeibeiConstant.IS_TEST) {
//濡傛灉鍚屾剰浜嗙敤鎴峰崗璁�
init(application);
}
@@ -147,7 +154,12 @@
public static void init(final Application application) {
//鍙嬬洘鍒濆鍖�
String description = ManifestDataUtil.getAppMetaData(application, "UMENG_CHANNEL");
- UMConfigure.init(application, application.getResources().getString(R.string.umeng_key), description, UMConfigure.DEVICE_TYPE_PHONE, null);
+ try {
+ UMConfigure.setLogEnabled(true);
+ UMConfigure.init(application, application.getResources().getString(R.string.umeng_key), description, UMConfigure.DEVICE_TYPE_PHONE, null);
+ } catch (Throwable e) {
+
+ }
// 閫夌敤AUTO椤甸潰閲囬泦妯″紡
MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
UMShareAPI.get(application);
@@ -156,9 +168,13 @@
PlatformConfig.setSinaWeibo(BeibeiConstant.SINA_ID, BeibeiConstant.SINA_KEY, "http://sns.whalecloud.com/sina2/callback");
ImageLoader.getInstance().init(buildDefaultILC(application));
-// initX5();
initCSJAd(application);
- GDTADManager.getInstance().initWith(application, BeibeiConstant.GDT_ID);
+ //TODO 骞跨偣閫氬箍鍛婂垵濮嬪寲
+ try {
+ GDTAdSdk.init(application, BeibeiConstant.GDT_ID);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
initWX(application);
initTaoKe(application);
@@ -191,18 +207,6 @@
} catch (Exception e) {
}
-
- Intent intent = new Intent(application, PushOpenClickActivity.class);
- intent.putExtra("activity", "test");
- JSONObject params = new JSONObject();
- try {
- params.put("id", "123123");
- } catch (JSONException e) {
- e.printStackTrace();
- }
- intent.putExtra("params", params.toString());
- String uriString = intent.toUri(Intent.URI_INTENT_SCHEME);
- Log.i(TAG, uriString);
}
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
index d5d5d99..14aa443 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
@@ -27,6 +27,7 @@
import android.widget.TextView;
import com.google.gson.Gson;
+import com.lcjian.library.dialog.DialogUtil;
import com.lcjian.library.util.ScreenUtils;
import com.lcjian.library.util.common.BitmapUtils;
import com.lcjian.library.util.common.DrawableUtils;
@@ -39,6 +40,7 @@
import com.weikou.beibeivideo.entity.ad.AdPositionEnum;
import com.weikou.beibeivideo.entity.ad.AdTypeVO;
import com.weikou.beibeivideo.ui.ad.SplashADFragment;
+import com.weikou.beibeivideo.ui.dialog.PermissionAuthNotifyDialog;
import com.weikou.beibeivideo.ui.dialog.UserProtocolDialog;
import com.weikou.beibeivideo.ui.main.MainActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
@@ -98,25 +100,13 @@
SharedPreferences preferences = getSharedPreferences("link_page",
Context.MODE_PRIVATE);
isInput = preferences.getBoolean("isInput", false);
- try {
- TelephonyManager manager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
- Build bd = new Build();
- String model = bd.MODEL;
- BeibeiVideoApplication.deviceName = model;
- BeibeiVideoApplication.deviceNumber = manager.getDeviceId();
- } catch (Exception e) {
- }
mPermissionsChecker = new PermissionsChecker(this);
// 鍒濆鍖栧ぇ璁惧
SDCardUtil.initStorage(this);
- //鍒濆鍖栦竴娆anner锛屽惁鍒欏悗闈anner浣跨敤鏃朵細鍑虹幇鍗￠】
-// new BannerView(SplashActivity.this, ADSize.BANNER, BeibeiConstant.GDT_ID, BeibeiConstant.GDT_PLAYER_DETAIL);
- //寮圭敤鎴峰崗璁
+
showProtocol();
-
-
//璁剧疆鑳屾櫙鍥剧墖
Drawable drawable = getResources().getDrawable(R.drawable.ic_splash_bg);
Bitmap bitmap = DrawableUtils.drawableToBitmap(drawable);
@@ -128,15 +118,15 @@
private void showProtocol() {
- String data = "鎰熻阿鎮ㄥ" + getResources().getString(R.string.app_name) + "涓�鐩翠互鏉ョ殑淇′换锛�<br>";
- data += "鎴戜滑渚濈収鏂扮殑鐩戠瑕佹眰鏉′緥鏇存柊浜�";
+ String data = "灏婃暚鐨勭敤鎴�:<br>鎰熻阿鎮ㄥ" + getResources().getString(R.string.app_name) + "涓�鐩翠互鏉ョ殑淇′换锛�<br>";
+ data += "鎴戜滑闈炲父灏婇噸骞朵繚鎶ゆ偍鐨勪釜浜轰俊鎭�侀殣绉併�備负浜嗘洿濂界殑淇濋殰鎮ㄧ殑鏉冨埄锛屽湪鎮ㄤ娇鐢ㄦ垜浠殑浜у搧涔嬪墠锛岃鎮ㄥ姟蹇呭鎱庨槄璇�";
data += String.format("<a href='%s'>銆婇殣绉佹斂绛栥��</a>鍜�", BeibeiConstant.PRIVACY_POLICY);
data += String.format("<a href='%s'>銆婄敤鎴峰崗璁��</a>", BeibeiConstant.USER_AGREEMENT);
- data += "涓洪噰鍙栫浉搴斿畨鍏ㄤ繚鎶ゆ帾鏂斤紝灏藉姏淇濇姢鎮ㄧ殑涓汉淇℃伅瀹夊叏鍙帶锛岀壒鍚戜綘璇存槑濡備笅锛�<br>" +
- "1銆佹偍鍦ㄤ娇鐢�" + getResources().getString(R.string.app_name) + "鍚勯」浜у搧鎴栨湇鍔℃椂锛屽皢浼氭彁渚涗笌鍏蜂綋鍔熻兘鐩稿叧鐨勪釜浜轰俊鎭紙鍙兘娑夊強甯愬彿銆佷綅缃�佸瓨鍌ㄧ瓑淇℃伅锛夈��<br>" +
- "2銆佹偍鍙互闅忔椂鏌ヨ銆佹洿姝ｃ�佸垹闄ゆ偍鐨勪釜浜轰俊鎭紝鎴戜滑涔熸彁渚涜处鎴锋敞閿�鐨勬笭閬撱��<br>" +
- "3銆佹湭缁忔偍鐨勫啀娆″悓鎰忥紝鎴戜滑涓嶄細灏嗕笂杩颁俊鎭敤浜庢偍鏈巿鏉冪殑鍏朵粬鐢ㄩ�旀垨鐩殑銆�<br>" +
- "4銆佹湭缁忕洃鎶や汉鍚屾剰锛屾垜浠笉浼氭敹闆嗕娇鐢�14鍛ㄥ瞾浠ヤ笅锛堝惈14鍛ㄥ瞾锛夋湭鎴愬勾浜轰釜浜轰俊鎭紝涓斾笉浼氬埄鐢ㄥ叾淇℃伅鎺ㄩ�佹柊闂汇�佹椂鏀夸俊鎭�佸箍鍛婄瓑瀹氬悜鎺ㄩ�佹椿鍔ㄣ��";
+ data += "鍐呯殑鎵�鏈夋潯娆撅紝<b>灏ゅ叾鏄細<br>" +
+ "1銆佹垜浠鎮ㄧ殑涓汉淇℃伅锛堝寘鎷絾涓嶉檺浜�<font color='#FF0000'>璁惧MAC鍦板潃銆両MEI/Android ID</font>绛変俊鎭級鐨勬敹闆�/淇濆瓨/浣跨敤/瀵瑰鎻愪緵/淇濇姢绛夎鍒欐潯娆�,浠ュ強鎮ㄧ殑鐢ㄦ埛鏉冨埄绛夋潯娆撅紱<br>" +
+ "2銆佺害瀹氭垜浠殑闄愬埗璐ｄ换銆佸厤璐ｆ潯娆撅紱<br>" +
+ "3銆佸叾浠栦互鍔犵矖鎴栨枩浣撳瓧杩涜鏍囪瘑鐨勯噸瑕佹潯娆俱��</b><br>" +
+ "濡傛偍瀵瑰崗璁湁浠讳綍鐤戣檻锛屽彲閫氳繃鐢靛瓙閭锛� yesbd@qq.com 鍚戞垜浠闂紝鎴戜滑灏嗕负鎮ㄧ璇氳В绛斻�傛偍鐐瑰嚮鈥滃悓鎰忓苟缁х画鈥濈殑琛屼负浠ｈ〃鎮ㄥ凡闃呰瀹屾瘯骞舵帴鍙椾互涓婂崗璁叏閮ㄦ潯娆俱�傚鎮ㄥ悓鎰忎互涓婂崗璁唴瀹癸紝璇锋偍鐐瑰嚮鈥滃悓鎰忓苟缁х画鈥濓紝寮�濮嬩娇鐢ㄦ偍鐨勪骇鍝併��";
if (!UserUtil.isAgreeUserProtocol(BeibeiVideoApplication.application) && !BeibeiConstant.IS_TEST) {
Dialog dialog = new UserProtocolDialog.Builder(this).setNegativeButton("涓嶅悓鎰�", new DialogInterface.OnClickListener() {
@@ -153,19 +143,44 @@
vg_ad.post(new Runnable() {
@Override
public void run() {
- //鍒濆鍖�
- BeibeiVideoApplication.init(BeibeiVideoApplication.application);
- myRequetPermission();
+
+ new PermissionAuthNotifyDialog.Builder(SplashActivity.this).setPositiveButton(null, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ dialogInterface.dismiss();
+ try {
+ TelephonyManager manager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+ Build bd = new Build();
+ String model = bd.MODEL;
+ BeibeiVideoApplication.deviceName = model;
+ BeibeiVideoApplication.deviceNumber = manager.getDeviceId();
+ } catch (Exception e) {
+ }
+ //鍒濆鍖�
+ BeibeiVideoApplication.init(BeibeiVideoApplication.application);
+ myRequetPermission();
+ }
+ }).create().show();
+
+
}
});
}
}).setData(data).create();
if (!isFinishing()) {
- dialog.show();
+ DialogUtil.show(dialog);
}
} else {
+ try {
+ TelephonyManager manager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+ Build bd = new Build();
+ String model = bd.MODEL;
+ BeibeiVideoApplication.deviceName = model;
+ BeibeiVideoApplication.deviceNumber = manager.getDeviceId();
+ } catch (Exception e) {
+ }
//璇锋眰鏉冮檺
vg_ad.post(new Runnable() {
@Override
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/PermissionAuthNotifyDialog.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/PermissionAuthNotifyDialog.java
new file mode 100644
index 0000000..eaa23f3
--- /dev/null
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/PermissionAuthNotifyDialog.java
@@ -0,0 +1,100 @@
+package com.weikou.beibeivideo.ui.dialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.lcjian.library.util.SystemCommon;
+import com.lcjian.library.util.common.StringUtils;
+import com.weikou.beibeivideo.R;
+import com.weikou.beibeivideo.util.ui.TextViewUtil;
+
+/**
+ * 鏉冮檺璇锋眰涔嬪墠鐨勫脊妗�
+ */
+public class PermissionAuthNotifyDialog extends Dialog {
+
+ private static String TAG = "UserProtocolDialog";
+
+ public PermissionAuthNotifyDialog(Context context) {
+ super(context);
+ this.setCancelable(false);
+ }
+
+ public PermissionAuthNotifyDialog(Context context, int theme) {
+ super(context, theme);
+ this.setCancelable(false);
+ }
+
+
+ public static class Builder {
+ public final static int TEXT_ALIGIN_LEFT = 1;
+ public final static int TEXT_ALIGIN_MIDDLE = 2;
+ public final static int TEXT_ALIGIN_RIGHT = 3;
+
+ private Activity context;
+ String webviewData;
+ String title;
+ private String positiveButtonText;
+ private String negativeButtonText;
+ private OnClickListener positiveButtonClickListener;
+ private OnClickListener negativeButtonClickListener;
+
+ public Builder(Activity context) {
+ this.context = context;
+ }
+
+
+ public Builder setPositiveButton(String positiveButtonText,
+ OnClickListener listener) {
+ this.positiveButtonText = positiveButtonText;
+ this.positiveButtonClickListener = listener;
+ return this;
+ }
+
+ public PermissionAuthNotifyDialog create() {
+ LayoutInflater inflater = (LayoutInflater) context
+ .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ final PermissionAuthNotifyDialog dialog = new PermissionAuthNotifyDialog(context, R.style.Dialog);
+ dialog.setCanceledOnTouchOutside(false);
+ final View layout = inflater.inflate(R.layout.dialog_auth_notify, null);
+ dialog.addContentView(layout, new FrameLayout.LayoutParams(
+ FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
+ TextView tv_positive = layout.findViewById(R.id.tv_positive);
+
+
+
+ // set the confirm button
+ if (positiveButtonClickListener != null) {
+ if (!StringUtils.isEmpty(positiveButtonText))
+ tv_positive.setText(positiveButtonText);
+ tv_positive.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ positiveButtonClickListener.onClick(dialog,
+ DialogInterface.BUTTON_POSITIVE);
+ }
+ });
+ }
+
+ dialog.setContentView(layout);
+
+ android.view.WindowManager.LayoutParams params = dialog.getWindow()
+ .getAttributes();
+ params.width = (int) ((SystemCommon.getScreenWidth(context) * 3) / 4);
+ params.height = android.view.WindowManager.LayoutParams.WRAP_CONTENT;
+ dialog.getWindow().setAttributes(params);
+ return dialog;
+ }
+ }
+
+ public interface MeasureCallBack {
+ public void onMeasure(int height);
+ }
+}
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/UserProtocolDialog.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/UserProtocolDialog.java
index f0444ec..2dea0ee 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/UserProtocolDialog.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/UserProtocolDialog.java
@@ -101,7 +101,7 @@
LayoutInflater inflater = (LayoutInflater) context
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
final UserProtocolDialog dialog = new UserProtocolDialog(context, R.style.Dialog);
- dialog.setCanceledOnTouchOutside(true);
+ dialog.setCanceledOnTouchOutside(false);
final View layout = inflater.inflate(R.layout.dialog_user_protocol, null);
dialog.addContentView(layout, new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/VideoResourceListDialog.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/VideoResourceListDialog.java
index 8822d0b..80a9298 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/VideoResourceListDialog.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/dialog/VideoResourceListDialog.java
@@ -17,6 +17,7 @@
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ListView;
import android.widget.TextView;
import com.androidquery.AQuery;
@@ -167,9 +168,10 @@
tv_input.setText(reList.get(position).isChecked() ? "褰撳墠娴忚" : "");
background = reList.get(position).isChecked() ? R.drawable.shape_video_detail_resource_middle_item_selected_bg : R.drawable.shape_video_detail_resource_middle_item_bg;
-
- ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DimenUtils.dip2px(context, 64));
- view.setLayoutParams(params);
+//TODO 瑙ｅ喅bug
+// ViewGroup.LayoutParams params =view.getLayoutParams();
+// params.width=ViewGroup.LayoutParams.MATCH_PARENT;
+// params.height=DimenUtils.dip2px(context, 64);
view.setBackgroundResource(background);
return view;
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
index b966618..2f1cf90 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java
@@ -237,7 +237,7 @@
*/
private void preLoadCommonAD() {
//鍔犺浇鎼滅储缁撴灉椤�
- SearchResultAdManager.getInstance(getApplicationContext()).loadAD(1, null);
+// SearchResultAdManager.getInstance(getApplicationContext()).loadAD(1, null);
}
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
index 5a08feb..03b22de 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java
@@ -157,6 +157,7 @@
fl_pptv = findViewById(R.id.fl_pptv);
fl_pptv.setVisibility(View.GONE);
+
iv_select_play = findViewById(R.id.iv_select_play);
tv_back = findViewById(R.id.iv_back);
iv_download_failure = findViewById(R.id.iv_download_failure);
@@ -780,7 +781,7 @@
FrameLayout layout = findViewById(R.id.fragment_video_play_container1);
if (layout == null)
return;
- android.view.ViewGroup.LayoutParams layoutParams = layout
+ ViewGroup.LayoutParams layoutParams = layout
.getLayoutParams();
layoutParams.height = (int) (DimenUtils.getScreenWidth(this) * 0.5625f);
layout.requestLayout();
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java
index e0b108b..0bb2a99 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java
@@ -313,7 +313,7 @@
private Runnable adRunnable = new Runnable() {
@Override
public void run() {
- loadAD2();
+// loadAD2();
}
};
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java
index dedc14f..fd5d4b6 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java
@@ -119,10 +119,7 @@
}
String cid = map.get("cid");
String vid = map.get("vid");
-
return new String[]{cid, vid};
-
-
}
}
return null;
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java b/BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java
index efff058..f926ed3 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java
@@ -14,8 +14,8 @@
//鏄惁鏈夊紑灞忓箍鍛�
public final static boolean AD_SETTING_KAIPIN = true;
- public static final String USER_AGREEMENT = "http://ysdq.yeshitv.com:8089/BuWan/api_control_ios_bw.jsp";
- public static final String PRIVACY_POLICY = "http://ysdq.yeshitv.com:8089/BuWan/user_protocol_bw.jsp";
+ public static final String USER_AGREEMENT = "http://bwweb.yeshitv.com/user_protocol.html";
+ public static final String PRIVACY_POLICY = "http://bwweb.yeshitv.com/privacy.html";
public static final String ABOUT_US = "http://bwweb.yeshitv.com/abountOur/index.html";
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/ExpressAdManager.java b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/ExpressAdManager.java
index bf6722a..56f9940 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/ExpressAdManager.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/ExpressAdManager.java
@@ -48,9 +48,13 @@
sourceType = adSource;
this.mContext = context;
if (sourceType == AdUtil.AD_TYPE.csj) {
- TTAdManager ttAdManager = TTAdManagerHolder.get();
- mTTAdNative = ttAdManager.createAdNative(context);
-// TTAdManagerHolder.get().requestPermissionIfNecessary(context);
+ TTAdManager ttAdManager = null;
+ try {
+ ttAdManager = TTAdManagerHolder.get();
+ mTTAdNative = ttAdManager.createAdNative(context);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
@@ -468,6 +472,11 @@
.setExpressViewAcceptedSize(width, height)
.setAdCount(count) //璇锋眰骞垮憡鏁伴噺涓�1鍒�3鏉�
.build();
+ if (mTTAdNative == null) {
+ if (adLoadListener != null)
+ adLoadListener.onSuccess(null);
+ return;
+ }
mTTAdNative.loadNativeExpressAd(adSlot, new TTAdNative.NativeExpressAdListener() {
@Override
public void onError(int i, String s) {
@@ -569,7 +578,6 @@
adEventListener.closeAd(ad);
}
}
-
@Override
@@ -691,12 +699,10 @@
}
-
@Override
public void onCancel() {
}
-
});
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/FullVideoAdManager.java b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/FullVideoAdManager.java
index 7d8aacc..11220d7 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/FullVideoAdManager.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/FullVideoAdManager.java
@@ -34,7 +34,13 @@
.setExpressViewAcceptedSize(w, h)
.setOrientation(TTAdConstant.VERTICAL)
.build();
- TTAdManager ttAdManager = TTAdManagerHolder.get();
+ TTAdManager ttAdManager = null;
+ try {
+ ttAdManager = TTAdManagerHolder.get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return;
+ }
mTTAdNative = ttAdManager.createAdNative(context);
//鍔犺浇鍏ㄥ睆瑙嗛
mTTAdNative.loadFullScreenVideoAd(adSlot, new TTAdNative.FullScreenVideoAdListener() {
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/RewardVideoAdManager.java b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/RewardVideoAdManager.java
index 64f5e21..4410729 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/RewardVideoAdManager.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/RewardVideoAdManager.java
@@ -58,8 +58,14 @@
sourceType = adSource;
this.mContext = context;
if (sourceType == AdUtil.AD_TYPE.csj) {
- TTAdManager ttAdManager = TTAdManagerHolder.get();
- mTTAdNative = ttAdManager.createAdNative(context);
+ TTAdManager ttAdManager = null;
+ try {
+ ttAdManager = TTAdManagerHolder.get();
+ mTTAdNative = ttAdManager.createAdNative(context);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
}
}
@@ -124,6 +130,11 @@
.setExpressViewAcceptedSize(width, height)
.setOrientation(hrizontal ? TTAdConstant.HORIZONTAL : TTAdConstant.VERTICAL)
.build();
+ if (mTTAdNative == null) {
+ if (adLoadListener != null)
+ adLoadListener.onError("mTTAdNative涓虹┖");
+ return;
+ }
mTTAdNative.loadRewardVideoAd(adSlot, new TTAdNative.RewardVideoAdListener() {
//璇锋眰骞垮憡澶辫触
@Override
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/SplashAdUtil.java b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/SplashAdUtil.java
index 191ce66..11f011e 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/SplashAdUtil.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/SplashAdUtil.java
@@ -123,7 +123,16 @@
private static void loadCSJ(String code, Context context, final View skip, final SplashAdListener splashAdListener) {
if (skip != null)
skip.setVisibility(View.GONE);
- TTAdManager ttAdManager = TTAdManagerHolder.get();
+ TTAdManager ttAdManager = null;
+
+ try {
+ ttAdManager = TTAdManagerHolder.get();
+ } catch (Exception e) {
+ }
+ if (ttAdManager == null) {
+ splashAdListener.noAd();
+ return;
+ }
TTAdNative mTTAdNative = ttAdManager.createAdNative(context.getApplicationContext());
//绌垮北鐢插箍鍛�
int width = DimenUtils.getScreenWidth(context.getApplicationContext());
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/TTAdManagerHolder.java b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/TTAdManagerHolder.java
index 4fd5687..3c3f4a7 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/util/ad/TTAdManagerHolder.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/util/ad/TTAdManagerHolder.java
@@ -1,6 +1,7 @@
package com.weikou.beibeivideo.util.ad;
import android.content.Context;
+import android.util.Log;
import com.bytedance.sdk.openadsdk.TTAdConfig;
import com.bytedance.sdk.openadsdk.TTAdConstant;
@@ -12,12 +13,13 @@
*/
public class TTAdManagerHolder {
+ private static final String TAG = "TTAdManagerHolder";
private static boolean sInit;
- public static TTAdManager get() {
+ public static TTAdManager get() throws Exception{
if (!sInit) {
- throw new RuntimeException("TTAdSdk is not init, please check.");
+ throw new Exception("TTAdSdk is not init, please check.");
}
return TTAdSdk.getAdManager();
}
@@ -30,8 +32,20 @@
private static void doInit(Context context) {
if (!sInit) {
try {
- TTAdSdk.init(context, buildConfig(context));
- sInit = true;
+ TTAdSdk.init(context, buildConfig(context), new TTAdSdk.InitCallback() {
+ @Override
+ public void success() {
+ Log.i(TAG, "TTAdSdk鍒濆鍖栨垚鍔�");
+ sInit = true;
+ }
+
+ @Override
+ public void fail(int i, String s) {
+ Log.e(TAG, "TTAdSdk鍒濆鍖栧け璐�:"+s);
+ sInit = false;
+ }
+ });
+
} catch (Exception e) {
}
diff --git a/library-GDTSDK/build.gradle b/library-GDTSDK/build.gradle
index 24a699e..02ab0d4 100644
--- a/library-GDTSDK/build.gradle
+++ b/library-GDTSDK/build.gradle
@@ -4,6 +4,8 @@
api fileTree(include: '*.jar', dir: 'libs')
api 'androidx.legacy:legacy-support-v4:1.0.0'
api 'com.qq.e.union:union:+'
+ implementation 'com.qq.e.union:union:4.410.1290'
+// api files("libs/GDTSDK.unionNormal.4.420.1290.aar")
}
android {
diff --git a/library-SocialSdk/assets/geo_global_ca.cer b/library-SocialSdk/assets/geo_global_ca.cer
new file mode 100644
index 0000000..4ae42e8
--- /dev/null
+++ b/library-SocialSdk/assets/geo_global_ca.cer
Binary files differ
diff --git a/library-SocialSdk/libs/sina-weibo-openDefault-10.10.0.aar b/library-SocialSdk/libs/sina-weibo-openDefault-10.10.0.aar
new file mode 100644
index 0000000..b3b2c11
--- /dev/null
+++ b/library-SocialSdk/libs/sina-weibo-openDefault-10.10.0.aar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-common-9.4.2.jar b/library-SocialSdk/libs/umeng-common-9.4.2.jar
new file mode 100644
index 0000000..38b2b26
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-common-9.4.2.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-share-QQ-full-7.1.6.jar b/library-SocialSdk/libs/umeng-share-QQ-full-7.1.6.jar
new file mode 100644
index 0000000..22f9d5b
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-share-QQ-full-7.1.6.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-share-core-7.1.6.jar b/library-SocialSdk/libs/umeng-share-core-7.1.6.jar
new file mode 100644
index 0000000..09e3ba3
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-share-core-7.1.6.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-share-sina-full-7.1.6.jar b/library-SocialSdk/libs/umeng-share-sina-full-7.1.6.jar
new file mode 100644
index 0000000..7d238f9
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-share-sina-full-7.1.6.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-share-wechat-full-7.1.6.jar b/library-SocialSdk/libs/umeng-share-wechat-full-7.1.6.jar
new file mode 100644
index 0000000..bfd6564
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-share-wechat-full-7.1.6.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-shareboard-widget-7.1.6.jar b/library-SocialSdk/libs/umeng-shareboard-widget-7.1.6.jar
new file mode 100644
index 0000000..d5c9d77
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-shareboard-widget-7.1.6.jar
Binary files differ
diff --git a/library-SocialSdk/libs/umeng-sharetool-7.1.6.jar b/library-SocialSdk/libs/umeng-sharetool-7.1.6.jar
new file mode 100644
index 0000000..3df03e4
--- /dev/null
+++ b/library-SocialSdk/libs/umeng-sharetool-7.1.6.jar
Binary files differ
diff --git a/library-VideoPlayer/src/main/java/com/yeshi/video/player/common/IVideoPlayerListener.java b/library-VideoPlayer/src/main/java/com/yeshi/video/player/common/IVideoPlayerListener.java
new file mode 100644
index 0000000..2666203
--- /dev/null
+++ b/library-VideoPlayer/src/main/java/com/yeshi/video/player/common/IVideoPlayerListener.java
@@ -0,0 +1,25 @@
+package com.yeshi.video.player.common;
+
+public interface IVideoPlayerListener {
+
+ //鏆傚仠
+ public void onVideoPause();
+
+ //鎾斁
+ public void onVideoPlay();
+
+ //涓嬩竴闆�
+ public void onNext();
+
+ //杩斿洖
+ public void onBack();
+
+ //閫夐泦
+ public void selectEpisode(int p, VideoEpisode episode);
+
+ //鎼滆棌
+ public void collect(boolean collect);
+
+ //鍒囨崲娓呮櫚搴�
+ public void changeDefinition(int p, VideoDefinition definition);
+}
diff --git a/library-common/libs/eventbus-3.1.1.jar b/library-common/libs/eventbus-3.1.1.jar
new file mode 100644
index 0000000..da9e000
--- /dev/null
+++ b/library-common/libs/eventbus-3.1.1.jar
Binary files differ
diff --git a/library-common/libs/fastjson-1.2.7.jar b/library-common/libs/fastjson-1.2.7.jar
new file mode 100644
index 0000000..0843d7e
--- /dev/null
+++ b/library-common/libs/fastjson-1.2.7.jar
Binary files differ
diff --git a/library-push/src/main/java/com/yeshi/push/PushUtil.java b/library-push/src/main/java/com/yeshi/push/PushUtil.java
index 9db18ee..e31ff43 100644
--- a/library-push/src/main/java/com/yeshi/push/PushUtil.java
+++ b/library-push/src/main/java/com/yeshi/push/PushUtil.java
@@ -1,25 +1,17 @@
package com.yeshi.push;
-import android.app.ActivityManager;
import android.app.Application;
-import android.content.Context;
import android.os.Build;
-import android.os.Process;
-import android.text.TextUtils;
import android.util.Log;
import com.heytap.msp.push.HeytapPushManager;
import com.heytap.msp.push.callback.ICallBackResultService;
-import com.huawei.hms.aaid.HmsInstanceId;
-import com.huawei.hms.common.ApiException;
import com.lcjian.library.util.ManifestDataUtil;
import com.lcjian.library.util.common.StringUtils;
import com.meizu.cloud.pushsdk.PushManager;
import com.vivo.push.IPushActionListener;
import com.vivo.push.PushClient;
import com.xiaomi.mipush.sdk.MiPushClient;
-
-import java.util.List;
public class PushUtil {
@@ -38,21 +30,21 @@
new Thread() {
@Override
public void run() {
- try {
- // 浠巃gconnect-service.json鏂囦欢涓鍙朼ppId
- String appId = "10409568";
- // 杈撳叆token鏍囪瘑"HCM"
- String tokenScope = "HCM";
- String token = HmsInstanceId.getInstance(context).getToken(appId, tokenScope);
- Log.i(TAG, "get token: " + token);
-
- // 鍒ゆ柇token鏄惁涓虹┖
- if(!TextUtils.isEmpty(token)) {
- tokenListener.onToken("hw",token);
- }
- } catch (ApiException e) {
- Log.e(TAG, "hw: get token failed, " + e);
- }
+// try {
+// // 浠巃gconnect-service.json鏂囦欢涓鍙朼ppId
+// String appId = "10409568";
+// // 杈撳叆token鏍囪瘑"HCM"
+// String tokenScope = "HCM";
+// String token = HmsInstanceId.getInstance(context).getToken(appId, tokenScope);
+// Log.i(TAG, "get token: " + token);
+//
+// // 鍒ゆ柇token鏄惁涓虹┖
+// if(!TextUtils.isEmpty(token)) {
+// tokenListener.onToken("hw",token);
+// }
+// } catch (ApiException e) {
+// Log.e(TAG, "hw: get token failed, " + e);
+// }
}
}.start();
return;
--
Gitblit v1.8.0