From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级，隐私政策整改
---
app/src/main/java/com/tejia/lijin/app/ui/BrowserActivity.java | 5
app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java | 19
app/src/main/java/com/tejia/lijin/app/util/x5/X5WebViewEventHandler.java | 11
app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java | 2
social_sdk_library_project/libs/umeng-apm-armeabi-v1.5.2.aar | 0
app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyActivity.java | 1
library-push/build.gradle | 3
app/src/main/java/com/tejia/lijin/app/ui/dialog/PermissionAuthNotifyDialog.java | 89 ++
app/src/main/java/com/tejia/lijin/app/ui/trends/CollegeSearchActivity.java | 2
app/src/main/res/layout/activity_settings.xml | 28
library-mine/src/com/wpc/library/util/MobileUtil.java | 3
app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java | 1
app/src/main/java/com/tejia/lijin/app/entity/common/ExpireValue.java | 27
app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java | 4
app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdManager.java | 262 +++-----
app/src/main/java/com/tejia/lijin/app/util/share/ShareImageUtil.java | 3
app/src/main/res/drawable-xhdpi/ic_auth_notify_top.png | 0
app/libs/umeng-common-9.4.4.jar | 0
app/src/main/java/com/tejia/lijin/app/ShoppingApi.java | 77 -
app/src/main/java/com/tejia/lijin/app/util/Tools.java | 33
app/src/main/res/drawable-xhdpi/icon_auth_notify_phone.png | 0
app/build.gradle | 34
app/src/main/java/com/tejia/lijin/app/updateApp/UpdateApp.java | 4
app/src/main/java/com/tejia/lijin/app/ui/BaseActivity.java | 2
app/src/main/java/com/tejia/lijin/app/ui/gmtemplate/GmTemplateContentFragment.java | 2
app/src/main/java/com/tejia/lijin/app/ui/mine/CollectionBrowserActivity.java | 2
app/src/main/java/com/tejia/lijin/app/ui/mine/SettingActivity.java | 20
app/src/main/java/com/tejia/lijin/app/ui/PushOpenClickActivity.java | 23
app/src/main/java/com/tejia/lijin/app/ui/recommend/ShareGoodsImageActivity31.java | 1
app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java | 2
app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java | 2
app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyFragment.java | 2
app/src/main/java/com/tejia/lijin/app/util/ui/TextViewUtil.java | 10
app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java | 3
social_sdk_library_project/libs/umeng-shareboard-widget-7.1.6.jar | 0
app/src/main/res/drawable-xhdpi/icon_auth_notify_storage.png | 0
app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java | 4
app/libs/armeabi/libpangleflipped.so | 0
JdSDK/build.gradle | 5
app/src/main/java/com/tejia/lijin/app/ui/mine/LoginActivity.java | 5
app/libs/umeng-apm-armeabi-v1.5.2.aar | 0
gradle/wrapper/gradle-wrapper.properties | 8
social_sdk_library_project/libs/umeng-share-core-7.1.6.jar | 0
app/src/main/java/com/tejia/lijin/app/util/ad/TTAdManagerHolder.java | 74 ++
library-push/src/main/java/com/yeshi/push/PushUtil.java | 15
social_sdk_library_project/libs/umeng-asms-armeabi-v1.4.1.aar | 0
app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java | 47 +
app/src/main/java/com/tejia/lijin/app/ui/recommend/ChoicenessFreightFreeActivity.java | 3
app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/ShareMainPictureChoiceActivity.java | 2
app/libs/open_ad_sdk_4.7.0.8.aar | 0
app/src/main/java/com/tejia/lijin/app/ui/BaseFragmentActivity.java | 2
social_sdk_library_project/build.gradle | 44
app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdContainer.java | 18
app/src/main/res/drawable/shape_user_protocol_dialog_bg.xml | 2
library-mine/src/com/wpc/library/util/common/DeviceUtil.java | 94 +++
social_sdk_library_project/libs/umeng-share-wechat-full-7.1.6.jar | 0
social_sdk_library_project/src/main/AndroidManifest.xml | 0
app/src/main/java/com/tejia/lijin/app/ui/recommend/SpecialBrowserActivity.java | 2
app/src/main/java/com/tejia/lijin/app/util/DeviceInfoUtil.java | 89 ++
build.gradle | 40 +
social_sdk_library_project/libs/umeng-share-QQ-full-7.1.6.jar | 0
app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java | 145 +++-
app/libs/Native_Libs.jar | 0
app/src/main/java/com/tejia/lijin/app/ui/mine/OrderFormNumSearchActivity33.java | 2
library-mine/src/com/wpc/library/DeviceUuidFactory.java | 4
library-mine/src/com/wpc/library/util/SystemCommon.java | 4
social_sdk_library_project/libs/umeng-sharetool-7.1.6.jar | 0
app/src/main/java/com/tejia/lijin/app/ui/SimpleBrowserActivity.java | 225 +++++++
app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserTestActivity.java | 2
app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java | 2
app/src/main/java/com/tejia/lijin/app/util/web/WebViewUtil.java | 11
app/src/main/res/layout/dialog_auth_notify.xml | 124 ++++
app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryFragment.java | 2
app/src/main/AndroidManifest.xml | 14
app/src/main/java/com/tejia/lijin/app/ui/mine/MyPlayerSearchActivity.java | 2
app/libs/umeng-asms-armeabi-v1.4.1.aar | 0
app/src/main/java/com/tejia/lijin/app/ui/recommend/FragmentSearch.java | 2
app/src/main/res/drawable/shape_permission_notify_btn.xml | 13
social_sdk_library_project/libs/umeng-share-sina-full-7.1.6.jar | 0
social_sdk_library_project/libs/umeng-common-9.4.4.jar | 0
app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java | 3
/dev/null | 0
library-mine/src/com/wpc/library/util/MarketUtils.java | 8
app/src/main/java/com/tejia/lijin/app/BrowserTestActivity.java | 2
app/src/main/java/com/tejia/lijin/app/ui/dialog/UserProtocolDialog.java | 14
app/src/main/java/com/tejia/lijin/app/ui/recommend/GoodsDetailBrowerActivity.java | 2
app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java | 21
app/src/main/res/layout/dialog_user_protocol.xml | 28
88 files changed, 1,289 insertions(+), 472 deletions(-)
diff --git a/JdSDK/build.gradle b/JdSDK/build.gradle
index f6ef554..fdef75e 100644
--- a/JdSDK/build.gradle
+++ b/JdSDK/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.library'
+apply plugin: 'android-library'
android {
compileSdkVersion 28
@@ -9,9 +9,6 @@
targetSdkVersion 26
versionCode 1
versionName "1.0"
-
- testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-
}
buildTypes {
diff --git a/app/build.gradle b/app/build.gradle
index 0839e9f..e99a7a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,9 +48,17 @@
applicationId "com.tejia.lijin"
minSdkVersion 19
targetSdkVersion 26
- versionCode 67//2.0.2
- versionName "1.1.3"
+ versionCode 70
+ versionName "1.1.6"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+// ndk {
+// //鍏煎64浣嶄笌32浣嶇郴缁�
+// abiFilters 'armeabi-v7a', 'arm64-v8a'//, 'x86', 'x86_64'
+// }
+ ndk {
+ //鍏煎64浣嶄笌32浣嶇郴缁�
+ abiFilters 'armeabi-v7a', 'arm64-v8a'//, 'x86', 'x86_64'
+ }
}
@@ -102,8 +110,10 @@
def manifestContent = file(manifestPath).getText()
//鍒犻櫎娉ㄩ噴锛岄槻姝㈡敞閲婇噷闈㈢殑涓枃涔辩爜瀵艰嚧鏇存敼鍚庣殑鍐呭绯荤粺鏃犳硶姝ｅ父瑙ｆ瀽
manifestContent = manifestContent.replaceAll("<!--[\\s\\S]*?-->", "")
- manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.CAMERA" />', '')
- manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.BLUETOOTH" />', '')
+ manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.CAMERA"/>', '')
+ manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.BLUETOOTH"/>', '')
+ manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>', '')
+ manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>', '')
println "AndroidManifest-Content:"
println manifestContent
@@ -120,19 +130,24 @@
api project(':APPUpdate')
api files('libs/eventbus-2.4.0.jar')
api files('libs/universal-image-loader-1.9.5.jar')
- api files('libs/open_ad_sdk.aar')
+ api files("libs/open_ad_sdk_4.7.0.8.aar")
+ api files('libs/umeng-common-9.4.4.jar')
+ api files('libs/umeng-asms-armeabi-v1.4.1.aar')
+ api files('libs/umeng-apm-armeabi-v1.5.2.aar')
implementation 'com.github.bumptech.glide:glide:4.9.0'
implementation project(path: ':library-gallery')
implementation project(path: ':library-push')
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
implementation project(':library-ViewPagerIndicator')
- implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+ implementation 'com.tencent.mm.opensdk:wechat-sdk-android:+'
// implementation project(':social_sdk_library_project')
implementation 'androidx.multidex:multidex:2.0.0'
- api files('libs/tbs_sdk_thirdapp_v2.4.0.1073_36840_sharewithdownload_obfs_20161011_194834.jar')
+ api 'com.qq.e.union:union:4.480.1350'
+
+ api 'com.tencent.tbs:tbssdk:44213'
//QQ鐧诲綍
implementation files('libs/open_sdk_3.5.4.11_r3f56456_lite.jar')
@@ -250,19 +265,14 @@
//鍔犺浇鍔ㄧ敾渚濊禆
implementation 'com.wang.avi:library:2.1.3'
implementation 'jp.wasabeef:glide-transformations:2.0.0'
- api files('libs/umeng-analytics-8.0.0.jar')
implementation 'com.felipecsl:gifimageview:2.0.0'
api project(':guide')
implementation project(':library-mine')
- implementation files('libs/umeng-common-2.0.2.jar')
implementation files('libs/jd_crash_lib_release_210.jar')
implementation files('libs/JDSDK_h.jar')
implementation project(':JdSDK')
//瀵艰埅鏍�
implementation 'com.github.hackware1993:MagicIndicator:1.7.0'
-
- //骞跨偣閫氬箍鍛�
- implementation(name: 'GDTSDK.unionNormal.4.362.1232', ext: 'aar')
implementation 'com.google.android.material:material:1.0.0'
diff --git a/app/libs/Native_Libs.jar b/app/libs/Native_Libs.jar
new file mode 100644
index 0000000..5bc9ab3
--- /dev/null
+++ b/app/libs/Native_Libs.jar
Binary files differ
diff --git a/app/libs/armeabi/libpangleflipped.so b/app/libs/armeabi/libpangleflipped.so
new file mode 100644
index 0000000..38b297a
--- /dev/null
+++ b/app/libs/armeabi/libpangleflipped.so
Binary files differ
diff --git a/app/libs/open_ad_sdk.aar b/app/libs/open_ad_sdk.aar
deleted file mode 100644
index c3daac9..0000000
--- a/app/libs/open_ad_sdk.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/open_ad_sdk_4.7.0.8.aar b/app/libs/open_ad_sdk_4.7.0.8.aar
new file mode 100644
index 0000000..7a2900a
--- /dev/null
+++ b/app/libs/open_ad_sdk_4.7.0.8.aar
Binary files differ
diff --git a/app/libs/umeng-analytics-8.0.0.jar b/app/libs/umeng-analytics-8.0.0.jar
deleted file mode 100644
index 403f634..0000000
--- a/app/libs/umeng-analytics-8.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/umeng-apm-armeabi-v1.5.2.aar b/app/libs/umeng-apm-armeabi-v1.5.2.aar
new file mode 100644
index 0000000..e020303
--- /dev/null
+++ b/app/libs/umeng-apm-armeabi-v1.5.2.aar
Binary files differ
diff --git a/app/libs/umeng-asms-armeabi-v1.4.1.aar b/app/libs/umeng-asms-armeabi-v1.4.1.aar
new file mode 100644
index 0000000..80575b5
--- /dev/null
+++ b/app/libs/umeng-asms-armeabi-v1.4.1.aar
Binary files differ
diff --git a/app/libs/umeng-common-2.0.2.jar b/app/libs/umeng-common-2.0.2.jar
deleted file mode 100644
index 8ab97e3..0000000
--- a/app/libs/umeng-common-2.0.2.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/umeng-common-9.4.4.jar b/app/libs/umeng-common-9.4.4.jar
new file mode 100644
index 0000000..efa3bd3
--- /dev/null
+++ b/app/libs/umeng-common-9.4.4.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3efe64e..e01009d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,6 @@
<!-- HMS-SDK寮曞鍗囩骇HMS鍔熻兘锛屼繚瀛樹笅杞界殑鍗囩骇鍖呴渶瑕丼D鍗″啓鏉冮檺 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 妫�娴嬬綉缁滅姸鎬� -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 妫�娴媤ifi鐘舵�� -->
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 涓轰簡鑾峰彇鐢ㄦ埛鎵嬫満鐨処MEI锛岀敤鏉ュ敮涓�鐨勬爣璇嗙敤鎴枫�� -->
- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 濡傛灉鏄畨鍗�8.0锛屽簲鐢ㄧ紪璇戦厤缃殑targetSdkVersion>=26锛岃鍔″繀娣诲姞浠ヤ笅鏉冮檺 -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- 鎺ユ敹PUSH TOKEN鐨勫箍鎾互鍙奝USH娑堟伅闇�瑕佸畾涔夎鏉冮檺 ${PACKAGE_NAME} 瑕佹浛鎹笂鎮ㄥ簲鐢ㄧ殑鍖呭悕 -->
<permission
android:name="com.tejia.lijin.permission.PROCESS_PUSH_MSG"
@@ -55,6 +53,12 @@
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+
+ <queries>
+ <intent>
+ <action android:name="com.huawei.hms.core.aidlservice" />
+ </intent>
+ </queries>
<application
android:name=".ShoppingApplication"
@@ -131,6 +135,11 @@
<activity
android:name=".ui.recommend.SelfBuyAndReductionActivity"
android:screenOrientation="portrait"></activity>
+
+ <activity
+ android:name=".ui.SimpleBrowserActivity"
+ android:screenOrientation="portrait" />
+
<activity
android:name=".ui.HMPushReceiveActivity"
android:screenOrientation="portrait">
@@ -555,6 +564,7 @@
<activity
android:name=".ui.PushOpenClickActivity"
android:exported="true"
+ android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/fullScreen">
<intent-filter>
diff --git a/app/src/main/java/com/tejia/lijin/app/BrowserTestActivity.java b/app/src/main/java/com/tejia/lijin/app/BrowserTestActivity.java
index 053df34..0ee1a86 100644
--- a/app/src/main/java/com/tejia/lijin/app/BrowserTestActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/BrowserTestActivity.java
@@ -103,13 +103,11 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
}
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java b/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
index ff682d4..45680a6 100644
--- a/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
+++ b/app/src/main/java/com/tejia/lijin/app/ShoppingApi.java
@@ -7,6 +7,13 @@
import com.google.gson.Gson;
import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.SyncHttpClient;
+import com.tejia.lijin.app.entity.goods.ShareCommonGoods;
+import com.tejia.lijin.app.entity.user.TeamScreenInfo;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
+import com.tejia.lijin.app.util.ToolUtil;
+import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
+import com.tejia.lijin.app.util.user.LoginAndInviteStatusUtil;
+import com.tejia.lijin.app.util.user.UserUtil;
import com.wpc.library.DeviceUuidFactory;
import com.wpc.library.util.GetManifestDataUtil;
import com.wpc.library.util.MacUtil;
@@ -15,12 +22,6 @@
import com.wpc.library.util.common.PackageUtils2;
import com.wpc.library.util.common.StringUtils;
import com.wpc.library.util.security.MD5Utils;
-import com.tejia.lijin.app.entity.goods.ShareCommonGoods;
-import com.tejia.lijin.app.entity.user.TeamScreenInfo;
-import com.tejia.lijin.app.util.ToolUtil;
-import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
-import com.tejia.lijin.app.util.user.LoginAndInviteStatusUtil;
-import com.tejia.lijin.app.util.user.UserUtil;
import com.yeshi.push.entity.PushRomType;
import org.apache.http.Header;
@@ -3139,9 +3140,7 @@
* @param context
* @param goodsId
* @param goodsType
- * @param lijinId
* @param uid
- * @param from
* @param handler
*/
public static void getUserLijinCreatedInfo(Context context, String goodsId, Integer goodsType, Long uid,
@@ -3475,7 +3474,7 @@
}
public static void recieveHongBao(Context context, String id,
- BasicTextHttpResponseHandler handler) {
+ BasicTextHttpResponseHandler handler) {
LinkedHashMap<String, String> params = new LinkedHashMap<String, String>();
Long uid = UserUtil.getUid(context);
if (uid != null)
@@ -3607,36 +3606,6 @@
}
}
- private static String getDeviceId(Context context) {
- SharedPreferences deviceInfo = context.getSharedPreferences("deviceInfo", MODE_PRIVATE);
- String deviceId = deviceInfo.getString("device", "");
- if (StringUtils.isEmpty(deviceId)) {
- deviceId = new DeviceUuidFactory(context).getDeviceUuid() + "";
- if (!StringUtils.isEmpty(deviceId)) {
- SharedPreferences.Editor editor = deviceInfo.edit();
- editor.putString("device", deviceId);
- editor.commit();
- }
- }
- return deviceId;
- }
-
- private static String getUtdid(Context context) {
- SharedPreferences deviceInfo = context.getSharedPreferences("deviceInfo", MODE_PRIVATE);
- String utdid = deviceInfo.getString("utdid", "");
- if (StringUtils.isEmpty(utdid)) {
- utdid = com.ta.utdid2.device.UTDevice.getUtdid(context);
- if (!StringUtils.isEmpty(utdid)) {
- SharedPreferences.Editor editor = deviceInfo.edit();
- editor.putString("utdid", utdid);
- editor.commit();
- }
- }
- if (StringUtils.isEmpty(utdid))
- return "";
- else
- return utdid;
- }
public static LinkedHashMap<String, String> validateParams(
LinkedHashMap<String, String> params, Context context) {
@@ -3646,7 +3615,7 @@
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
@@ -3654,16 +3623,16 @@
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
List<String> list = new ArrayList<>();
@@ -3696,23 +3665,23 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
params.put("platform", "android");
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei)) {
params.put("imei", imei);
}
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
@@ -3755,22 +3724,22 @@
// }
int version = PackageUtils2.getVersionCode(context);
long time = System.currentTimeMillis();
- String deviceType = MobileUtil.getSystemModel();
+ String deviceType = DeviceInfoUtil.getSystemModel(context);
params.put("packages", API_PACKAGE_NAME);
params.put("Version", version + "");
params.put("appkey", BuXinConstant.TAO_BAO_KE_KEY);
params.put("platform", "android");
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(context, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(context);
+ String imei = DeviceInfoUtil.getIMEI(context);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
- params.put("osVersion", MobileUtil.getSystemVersion());
+ params.put("osVersion", DeviceInfoUtil.getSystemVersion(context));
params.put("network", NetUtils.getNetworkState(context));
params.put("deviceType", StringUtils.isEmpty(deviceType) ? "" : deviceType);
params.put("time", time + "");
- params.put("Device", getDeviceId(context));
- params.put("utdid", getUtdid(context));
+ params.put("Device", DeviceInfoUtil.getDeviceId(context));
+ params.put("utdid", DeviceInfoUtil.getUtdid(context));
Iterator<String> its = params.keySet().iterator();
List<String> list = new ArrayList<>();
diff --git a/app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java b/app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java
index 4f3574b..00fb9b3 100644
--- a/app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java
+++ b/app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java
@@ -14,29 +14,36 @@
import de.greenrobot.event.EventBus;
import android.util.Log;
+import android.widget.Toast;
import com.alibaba.baichuan.android.trade.AlibcTradeSDK;
import com.alibaba.baichuan.android.trade.callback.AlibcTradeInitCallback;
import com.alibaba.baichuan.trade.biz.core.taoke.AlibcTaokeParams;
+import com.bytedance.sdk.openadsdk.LocationProvider;
import com.bytedance.sdk.openadsdk.TTAdConfig;
import com.bytedance.sdk.openadsdk.TTAdConstant;
import com.bytedance.sdk.openadsdk.TTAdSdk;
+import com.bytedance.sdk.openadsdk.TTCustomController;
import com.kepler.jd.Listener.AsyncInitListener;
import com.kepler.jd.login.KeplerApiManager;
-import com.qq.e.comm.managers.GDTADManager;
+import com.qq.e.comm.managers.GDTAdSdk;
+import com.qq.e.comm.managers.setting.GlobalSetting;
import com.tejia.lijin.app.ui.SplashActivity;
import com.tejia.lijin.app.util.Constant;
+import com.tejia.lijin.app.util.ad.TTAdManagerHolder;
import com.tejia.lijin.app.util.ui.GoodsDetailUtil;
import com.tejia.lijin.app.util.user.UserUtil;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.umeng.analytics.MobclickAgent;
import com.umeng.commonsdk.UMConfigure;
+import com.wpc.library.util.ManifestDataUtil;
import com.wpc.library.util.NetUtils;
import com.tejia.lijin.app.service.NetworkStateService;
import com.tejia.lijin.app.util.CrashHandler;
import com.tejia.lijin.app.util.TestUtil;
import com.tejia.lijin.app.util.ToolUtil;
+import com.wpc.library.util.common.DeviceUtil;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -54,11 +61,14 @@
public static ShoppingApplication application = null;
public static boolean isJDInit = false;
+ public static boolean init = false;
+
// public Tencent mTencent;
@Override
public void onCreate() {
super.onCreate();
+ Log.i(TAG, "onCreate");
application = this;
disableAPIDialog();
//娴嬭瘯娉ㄥ叆鐢ㄦ埛淇℃伅
@@ -70,6 +80,7 @@
public static void init(final Application application) {
+ init = true;
GoodsDetailUtil.initInstallTime(application);
initAD(application);
//杩涚▼鍚嶅瓧
@@ -86,7 +97,10 @@
CrashHandler.getInstance().init(application);
}
- UMConfigure.init(application, UMConfigure.DEVICE_TYPE_PHONE, null);
+ String channel = ManifestDataUtil.getAppMetaData(application, "UMENG_CHANNEL");
+ UMConfigure.init(application, application.getResources().getString(R.string.umeng_key), channel, UMConfigure.DEVICE_TYPE_PHONE, null);
+ UMConfigure.setEncryptEnabled(true);
+ MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
if (!AlibcTradeSDK.initState.isInitialized() && !AlibcTradeSDK.initState.isInitializing())
AlibcTradeSDK.asyncInit(application, new AlibcTradeInitCallback() {
@@ -195,23 +209,22 @@
/**
* 绌垮北鐢插箍鍛婂垵濮嬪寲
*/
- private static void initAD(Context context) {
+ private static void initAD(final Context context) {
try {
- GDTADManager.getInstance().initWith(context, Constant.GDT_APP_ID);
+ GlobalSetting.setEnableCollectAppInstallStatus(false);
+ GDTAdSdk.init(application, Constant.GDT_APP_ID);
- TTAdSdk.init(context,
- new TTAdConfig.Builder()
- .appId(Constant.CSJ_APP_ID)
- .useTextureView(true) //榛樿浣跨敤SurfaceView鎾斁瑙嗛骞垮憡,褰撴湁SurfaceView鍐茬獊鐨勫満鏅紝鍙互浣跨敤TextureView
- .appName("鐗逛环")
- .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)//钀藉湴椤典富棰�
- .allowShowNotify(true) //鏄惁鍏佽sdk灞曠ず閫氱煡鏍忔彁绀�
- .debug(true) //娴嬭瘯闃舵鎵撳紑锛屽彲浠ラ�氳繃鏃ュ織鎺掓煡闂锛屼笂绾挎椂鍘婚櫎璇ヨ皟鐢�
- .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI) //鍏佽鐩存帴涓嬭浇鐨勭綉缁滅姸鎬侀泦鍚�,娌℃湁璁剧疆鐨勭綉缁滀笅鐐瑰嚮涓嬭浇apk浼氭湁浜屾纭寮圭獥锛屽脊绐椾腑浼氭姭闇插簲鐢ㄤ俊鎭�
- .supportMultiProcess(false) //鏄惁鏀寔澶氳繘绋嬶紝true鏀寔
- .asyncInit(true) //鏄惁寮傛鍒濆鍖杝dk,璁剧疆涓簍rue鍙互鍑忓皯SDK鍒濆鍖栬�楁椂銆�3450鐗堟湰寮�濮嬪簾寮儈~
- //.httpStack(new MyOkStack3())//鑷畾涔夌綉缁滃簱锛宒emo涓粰鍑轰簡okhttp3鐗堟湰鐨勬牱渚嬶紝鍏朵綑璇疯嚜琛屽紑鍙戞垨鑰呭挩璇㈠伐浣滀汉鍛樸��
- .build());
+ TTAdManagerHolder.init(context, new TTAdSdk.InitCallback() {
+ @Override
+ public void success() {
+ Log.i(TAG, "绌垮北鐢插垵濮嬪寲鎴愬姛");
+ }
+
+ @Override
+ public void fail(int i, String s) {
+ Log.e(TAG, "绌垮北鐢插垵濮嬪寲澶辫触锛�"+s);
+ }
+ });
} catch (Exception e) {
}
diff --git a/app/src/main/java/com/tejia/lijin/app/entity/common/ExpireValue.java b/app/src/main/java/com/tejia/lijin/app/entity/common/ExpireValue.java
new file mode 100644
index 0000000..672700d
--- /dev/null
+++ b/app/src/main/java/com/tejia/lijin/app/entity/common/ExpireValue.java
@@ -0,0 +1,27 @@
+package com.tejia.lijin.app.entity.common;
+
+public class ExpireValue {
+ private String value;
+ private long expireTime;
+
+ public ExpireValue(String value, long expireTime) {
+ this.value = value;
+ this.expireTime = expireTime;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public long getExpireTime() {
+ return expireTime;
+ }
+
+ public void setExpireTime(long expireTime) {
+ this.expireTime = expireTime;
+ }
+}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BaseActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/BaseActivity.java
index 93aa6b7..60d56cd 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BaseActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BaseActivity.java
@@ -55,7 +55,6 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
if (!showRecommend)
return;
final SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
@@ -92,7 +91,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BaseFragmentActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/BaseFragmentActivity.java
index 723b471..49f72ca 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BaseFragmentActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BaseFragmentActivity.java
@@ -44,7 +44,6 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
final SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
if (enableRecommend) {
ClipboardUtil.getClipboardContent(this, new IClipboardContentListener() {
@@ -81,7 +80,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/BrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/BrowserActivity.java
index bd3d6c6..b49fb69 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/BrowserActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/BrowserActivity.java
@@ -30,6 +30,7 @@
import com.tejia.lijin.app.ShoppingApplication;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.util.Constant;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.google.gson.Gson;
import com.umeng.analytics.MobclickAgent;
@@ -152,13 +153,11 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
}
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
}
@Override
@@ -406,7 +405,7 @@
params.put("platform", "android");
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(BrowserActivity.this, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(BrowserActivity.this);
+ String imei = DeviceInfoUtil.getIMEI(BrowserActivity.this);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
params.put("osVersion", MobileUtil.getSystemVersion());
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/PushOpenClickActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/PushOpenClickActivity.java
index 959fcc9..0124b20 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/PushOpenClickActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/PushOpenClickActivity.java
@@ -25,6 +25,7 @@
private static void jump(Activity context, String type, String activity, String params) {
+ Log.i(TAG, "鎺ㄩ�佷簨浠惰烦杞�");
pushData = null;
Log.i(TAG, String.format("%s:%s:%s", type, activity, params));
JumpDetail jumpDetail = new JumpDetail();
@@ -42,6 +43,10 @@
super.onCreate(savedInstanceState);
mTextView = new TextView(this);
setContentView(mTextView);
+ init(getIntent());
+ }
+
+ private void init(Intent intent) {
String activity = getIntent().getStringExtra("activity");
String params = getIntent().getStringExtra("params");
String type = getIntent().getStringExtra("type");
@@ -51,17 +56,31 @@
builder.append("params:" + params);
mTextView.setText(builder.toString());
if (!isAppRunning(getApplicationContext(), getPackageName())) {
+ Log.i(TAG, "褰撳墠搴旂敤娌℃湁杩愯");
//鏆傚瓨鏁版嵁
pushData = new PushData(type, activity, params);
- Intent intent = new Intent(this, MainActivity.class);
- startActivity(intent);
+ Intent intent1 = new Intent(this, MainActivity.class);
+ startActivity(intent1);
finish();
} else {
+ Log.i(TAG, "褰撳墠搴旂敤鍦ㄨ繍琛�");
jump(this, type, activity, params);
finish();
}
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ Log.i(TAG, "onResume");
+ }
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ Log.i(TAG, "onNewIntent");
+ init(intent);
+ }
private boolean isAppRunning(Context context, String packageName) {
ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/SimpleBrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/SimpleBrowserActivity.java
new file mode 100644
index 0000000..45f3c72
--- /dev/null
+++ b/app/src/main/java/com/tejia/lijin/app/ui/SimpleBrowserActivity.java
@@ -0,0 +1,225 @@
+package com.tejia.lijin.app.ui;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.tejia.lijin.app.R;
+import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
+import com.tejia.lijin.app.util.AndroidBug5497Workaround;
+import com.tejia.lijin.app.util.TopStatusSettings;
+import com.tejia.lijin.app.util.web.RebateJavaInterface;
+import com.tejia.lijin.app.util.web.RebateJavaInterfaceBS;
+import com.wpc.library.util.common.StringUtils;
+
+public class SimpleBrowserActivity extends Activity implements OnClickListener {
+
+ private TextView tv_top_bar_left;
+ private TextView tv_top_bar_left2;
+ private ImageView iv_right;
+ private Button tv_top_bar_middle;
+ private WebView webview;
+ private FrameLayout fl_webview;
+ View v_cover_web;
+ ProgressBar progressBar;
+ ShapeLoadingDialog pd = null;
+ String mTitle;
+ RebateJavaInterface javaInterface;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.browser_activity);
+// AndroidBug5497Workaround.assistActivity(this);
+// TopStatusSettings.setStatusViewAndDeepColor(this);
+// getWindow().setFormat(PixelFormat.TRANSLUCENT);
+ tv_top_bar_left = findViewById(R.id.tv_top_bar_left);
+ tv_top_bar_left2 = findViewById(R.id.tv_top_bar_left2);
+ tv_top_bar_left2.setVisibility(View.VISIBLE);
+ tv_top_bar_middle = findViewById(R.id.tv_top_bar_middle1);
+ v_cover_web = findViewById(R.id.v_cover_web);
+ iv_right = findViewById(R.id.iv_top_bar_right);
+ iv_right.setVisibility(View.GONE);
+ fl_webview = findViewById(R.id.fl_webview);
+
+ tv_top_bar_left.setOnClickListener(this);
+ tv_top_bar_left2.setOnClickListener(this);
+ iv_right.setOnClickListener(this);
+ v_cover_web.setOnClickListener(this);
+ tv_top_bar_middle.setVisibility(View.VISIBLE);
+
+
+ mTitle = getIntent().getStringExtra("title");
+ if (!StringUtils.isEmpty(mTitle)) {
+ tv_top_bar_middle.setText(mTitle);
+ }
+ pd = new ShapeLoadingDialog.Builder(this).build();
+
+ webview = new WebView(SimpleBrowserActivity.this);
+
+ fl_webview.addView(webview, new FrameLayout.LayoutParams(
+ FrameLayout.LayoutParams.MATCH_PARENT,
+ FrameLayout.LayoutParams.MATCH_PARENT));
+
+
+ initWebView();
+ progressBar = findViewById(R.id.myProgressBar);
+ progressBar.setMax(100);
+ progressBar.setProgressDrawable(this.getResources()
+ .getDrawable(R.drawable.color_progressbar));
+ webview.loadUrl(getIntent().getStringExtra("url"));
+ }
+
+ /**
+ * 鍒濆鍖杦ebview
+ */
+ @SuppressLint("SetJavaScriptEnabled")
+ private void initWebView() {
+ WebSettings webSettings = webview.getSettings();
+ webSettings.setJavaScriptEnabled(true);
+ webSettings.setDomStorageEnabled(true);
+ webSettings.setUseWideViewPort(true);
+ webSettings.setTextZoom(100);
+ webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);//璁剧疆缂撳瓨妯″紡锛堟牴鎹甤ache-control鍐冲畾鏄惁浠庣綉缁滀笂鍙栨暟鎹�傦級
+
+ webview.setWebViewClient(webViewClient);
+ webview.setWebChromeClient(webChromeClient);
+ javaInterface = new RebateJavaInterface(SimpleBrowserActivity.this,
+ tv_top_bar_middle, tv_top_bar_left2, new TextView(this), iv_right, webview, pd);
+ webview.addJavascriptInterface(javaInterface, "yestv");
+ }
+
+ WebViewClient webViewClient = new WebViewClient() {
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+ System.out.println("shouldOverrideUrlLoading");
+ return super.shouldOverrideUrlLoading(view, request);
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ if (!url.startsWith("http"))
+ return true;
+ return super.shouldOverrideUrlLoading(view, url);
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ super.onPageStarted(view, url, favicon);
+ if (view.canGoBack()) {
+ tv_top_bar_left2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_web_close, 0, 0, 0);
+ } else {
+ tv_top_bar_left2.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+ }
+ }
+ };
+
+ WebChromeClient webChromeClient = new WebChromeClient() {
+
+
+ @Override
+ public void onReceivedTitle(WebView view, String title) {
+ if (StringUtils.isEmpty(mTitle) && null != title && !StringUtils.isEmpty(title.trim())) {
+ tv_top_bar_middle.setText(title);
+ }
+ }
+
+ @Override
+ public void onProgressChanged(WebView webView, int i) {
+ if (i == 100) {
+ progressBar.setVisibility(View.GONE);
+ } else {
+ if (View.INVISIBLE == progressBar.getVisibility()) {
+ progressBar.setVisibility(View.VISIBLE);
+ }
+ progressBar.setProgress(i);
+ }
+ super.onProgressChanged(webView, i);
+ }
+
+ };
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (webview != null) {
+ webview.onResume();
+ webview.loadUrl("javascript:yestvcallback.resume()");
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (webview != null) {
+ webview.onPause();
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (webview != null) {
+ webview.removeAllViews();
+ webview.destroy();
+ }
+ super.onDestroy();
+ }
+
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.tv_top_bar_left: {
+ if (webview.canGoBack()) {
+ webview.goBack();
+ } else {
+ finish();
+ }
+ }
+ break;
+ case R.id.tv_top_bar_left2: {
+ finish();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if ((keyCode == KeyEvent.KEYCODE_BACK)) {
+ if (webview.canGoBack()) {
+ webview.goBack(); // goBack()琛ㄧず杩斿洖WebView鐨勪笂涓�椤甸潰
+ return true;
+ } else {
+ finish();
+ }
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ }
+}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
index 1294f2c..413ecbf 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
@@ -35,9 +35,11 @@
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.qq.e.ads.splash.SplashAD;
import com.qq.e.ads.splash.SplashADListener;
-import com.qq.e.comm.managers.GDTADManager;
+import com.qq.e.comm.managers.GDTAdSdk;
+import com.qq.e.comm.managers.setting.GlobalSetting;
import com.qq.e.comm.util.AdError;
import com.tejia.lijin.app.ShoppingApplication;
+import com.tejia.lijin.app.ui.dialog.PermissionAuthNotifyDialog;
import com.tejia.lijin.app.ui.dialog.UserGuideDialog;
import com.tejia.lijin.app.ui.dialog.UserProtocolDialog;
import com.tejia.lijin.app.util.user.UserUtil;
@@ -72,12 +74,17 @@
import java.util.HashMap;
import java.util.List;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import okhttp3.Call;
+
+import static android.content.pm.PackageManager.PERMISSION_DENIED;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
/**
* Created by weikou2015 on 2017/2/20.
*/
-public class SplashActivity extends BaseActivity implements SplashADListener {
+public class SplashActivity extends Activity implements SplashADListener {
// 鎵�闇�鐨勫叏閮ㄦ潈闄�
static final String[] PERMISSIONS = new String[]{
Manifest.permission.READ_PHONE_STATE};//, Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -121,32 +128,26 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash);
initView();
- setShowRecommend(false);
// TopStatusSettings.setStatusViewAndDeepColor(this);
- ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
- ActivityManager.RunningTaskInfo info = manager.getRunningTasks(1).get(0);
- int acitivitynum = info.numActivities;
- if (acitivitynum > 1) {
- finish();
- }
-
/*鍚屽寲椤堕儴鐘舵�佹爮*/
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- Window window = getWindow();
- window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
- window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
- window.setStatusBarColor(Color.TRANSPARENT);
- //璁剧疆鐘舵�佹爮鏂囧瓧棰滆壊鍙婂浘鏍囦负娣辫壊
- window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- try {
- Class decorViewClazz = Class.forName("com.android.internal.policy.DecorView");
- Field field = decorViewClazz.getDeclaredField("mSemiTransparentStatusBarColor");
- field.setAccessible(true);
- field.setInt(getWindow().getDecorView(), Color.TRANSPARENT); //鏀逛负閫忔槑
- } catch (Exception e) {
+ if (UserUtil.isAgreeUserProtocol(getApplicationContext())) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ Window window = getWindow();
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.setStatusBarColor(Color.TRANSPARENT);
+ //璁剧疆鐘舵�佹爮鏂囧瓧棰滆壊鍙婂浘鏍囦负娣辫壊
+ window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ try {
+ Class decorViewClazz = Class.forName("com.android.internal.policy.DecorView");
+ Field field = decorViewClazz.getDeclaredField("mSemiTransparentStatusBarColor");
+ field.setAccessible(true);
+ field.setInt(getWindow().getDecorView(), Color.TRANSPARENT); //鏀逛负閫忔槑
+ } catch (Exception e) {
+ }
}
}
}
@@ -163,14 +164,33 @@
iv_splash = findViewById(R.id.iv_splash);
if (UserUtil.isAgreeUserProtocol(this)) {
- init();
+ nextStep();
} else {
- String data = "鎰熻阿鎮ㄥ鐗逛环涓�鐩翠互鏉ョ殑淇′换锛�<br> 鎴戜滑渚濈収鏂扮殑鐩戠瑕佹眰鏉′緥鏇存柊浜�<a href=\"http://h5.tejia.yeshitv.com/privacy.html\" style=\"text-decoration: none;\">銆婇殣绉佹斂绛栥��</a> 鍜�<a href=\"http://h5.tejia.yeshitv.com/user-protocol.html\" style=\"text-decoration: none;\">銆婄敤鎴峰崗璁��</a>锛屼负閲囧彇鐩稿簲瀹夊叏淇濇姢鎺柦锛屽敖鍔涗繚鎶ゆ偍鐨勪釜浜轰俊鎭畨鍏ㄥ彲鎺э紝鐗瑰悜浣犺鏄庡涓嬶細\n" +
- "\t\t<br> 1銆佹偍鍦ㄤ娇鐢ㄧ壒浠峰悇椤逛骇鍝佹垨鏈嶅姟鏃讹紝灏嗕細鎻愪緵涓庡叿浣撳姛鑳界浉鍏崇殑涓汉淇℃伅锛堝彲鑳芥秹鍙婂笎鍙枫�佷綅缃�佷氦鏄撶瓑淇℃伅锛夈�俓n" +
- "\t\t<br> 2銆佹偍鍙互闅忔椂鏌ヨ銆佹洿姝ｃ�佸垹闄ゆ偍鐨勪釜浜轰俊鎭紝鎴戜滑涔熸彁渚涜处鎴锋敞閿�鐨勬笭閬撱�俓n" +
- "\t\t<br> 3銆佹湭缁忔偍鐨勫啀娆″悓鎰忥紝鎴戜滑涓嶄細灏嗕笂杩颁俊鎭敤浜庢偍鏈巿鏉冪殑鍏朵粬鐢ㄩ�旀垨鐩殑銆俓n" +
- "\t\t<br> 4銆佹湭缁忕洃鎶や汉鍚屾剰锛屾垜浠笉浼氭敹闆嗕娇鐢�14鍛ㄥ瞾浠ヤ笅锛堝惈14鍛ㄥ瞾锛夋湭鎴愬勾浜轰釜浜轰俊鎭紝涓斾笉浼氬埄鐢ㄥ叾淇℃伅鎺ㄩ�佹柊闂汇�佹椂鏀夸俊鎭�佸箍鍛婄瓑瀹氬悜鎺ㄩ�佹椿鍔ㄣ��";
+ String data = "灏婃暚鐨勭敤鎴�:<br>鎰熻阿鎮ㄥ" + getResources().getString(R.string.app_name) + "涓�鐩翠互鏉ョ殑淇′换锛�<br>";
+ data += "鎴戜滑闈炲父灏婇噸骞朵繚鎶ゆ偍鐨勪釜浜轰俊鎭�侀殣绉併�備负浜嗘洿濂界殑淇濋殰鎮ㄧ殑鏉冨埄锛屽湪鎮ㄤ娇鐢ㄦ垜浠殑浜у搧涔嬪墠锛岃鎮ㄥ姟蹇呭鎱庨槄璇�";
+ data += String.format("<a href='%s'>銆婇殣绉佹斂绛栥��</a>鍜�", "http://h5.tejia.yeshitv.com/privacy.html");
+ data += String.format("<a href='%s'>銆婄敤鎴峰崗璁��</a>", "http://h5.tejia.yeshitv.com/user-protocol.html");
+ data += "鍐呯殑鎵�鏈夋潯娆撅紝<b>灏ゅ叾鏄細<br>" +
+ "1銆佹垜浠鎮ㄧ殑涓汉淇℃伅锛堝寘鎷絾涓嶉檺浜�<font color='#FF0000'>璁惧MAC鍦板潃銆両MEI/AndroidID/OAID/IMSI/ICCID/GAID/MEID</font>绛変俊鎭級鐨勬敹闆�/淇濆瓨/浣跨敤/瀵瑰鎻愪緵/淇濇姢绛夎鍒欐潯娆�,浠ュ強鎮ㄧ殑鐢ㄦ埛鏉冨埄绛夋潯娆撅紱<br>" +
+ "2銆佺害瀹氭垜浠殑闄愬埗璐ｄ换銆佸厤璐ｆ潯娆撅紱<br>" +
+ "3銆佸叾浠栦互鍔犵矖鎴栨枩浣撳瓧杩涜鏍囪瘑鐨勯噸瑕佹潯娆俱��</b><br>" +
+ "濡傛偍瀵瑰崗璁湁浠讳綍鐤戣檻锛屽彲閫氳繃鐢靛瓙閭锛� tjapp@qq.com 鍚戞垜浠闂紝鎴戜滑灏嗕负鎮ㄧ璇氳В绛斻�傛偍鐐瑰嚮鈥滃悓鎰忊�濈殑琛屼负浠ｈ〃鎮ㄥ凡闃呰瀹屾瘯骞舵帴鍙椾互涓婂崗璁叏閮ㄦ潯娆俱�傚鎮ㄥ悓鎰忎互涓婂崗璁唴瀹癸紝璇锋偍鐐瑰嚮鈥滃悓鎰忊�濓紝寮�濮嬩娇鐢ㄦ偍鐨勪骇鍝併��";
showUserProtocolAndGuide(data);
+ }
+ }
+
+
+ private void myRequetPermission() {
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) != PERMISSION_GRANTED) {
+ SharedPreferences sharedPreferences = getSharedPreferences("permission", Context.MODE_PRIVATE);
+ //鏄惁闇�瑕佸啀娆¤姹傛潈闄�
+ if (sharedPreferences.getBoolean("show", true))
+ ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_PHONE_STATE}, REQUEST_CODE);
+ else {
+ nextStep();
+ }
+ } else {
+ nextStep();
}
}
@@ -190,15 +210,33 @@
public void onClick(DialogInterface dialog, int which) {
UserUtil.agreeUserProtocol(getApplicationContext());
dialog.dismiss();
- ShoppingApplication.init(ShoppingApplication.application);
- init();
+ //灞曠ず寮规
+ new PermissionAuthNotifyDialog.Builder(SplashActivity.this).setPositiveButton(null, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ myRequetPermission();
+ }
+ }).create().show();
+ //璇锋眰鏉冮檺
}
});
dialogBuilder.create().show();
}
- private void init() {
+
+ private void nextStep() {
+ ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+ ActivityManager.RunningTaskInfo info = manager.getRunningTasks(1).get(0);
+ int acitivitynum = info.numActivities;
+ if (acitivitynum > 1) {
+ finish();
+ }
+ if (!ShoppingApplication.init) {
+ ShoppingApplication.init(ShoppingApplication.application);
+ }
+
if (!AlibcTradeSDK.initState.isInitialized() && !AlibcTradeSDK.initState.isInitializing())
taobaoInit();
getSystemParams();
@@ -293,18 +331,21 @@
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- if (requestCode == 1024 && hasAllPermissionsGranted(grantResults)) {
- GDTAdInfo adInfo = AdUtil.getGDTADInfo(getApplicationContext());
- if (adInfo == null)
- return;
- fetchSplashAD(this, container, skipView, adInfo.getSplashPid(), this, 0);
- } else {
- // 濡傛灉鐢ㄦ埛娌℃湁鎺堟潈锛岄偅涔堝簲璇ヨ鏄庢剰鍥撅紝寮曞鐢ㄦ埛鍘昏缃噷闈㈡巿鏉冦��
- Toast.makeText(this, "搴旂敤缂哄皯蹇呰鐨勬潈闄愶紒璇风偣鍑籠"鏉冮檺\"锛屾墦寮�鎵�闇�瑕佺殑鏉冮檺銆�", Toast.LENGTH_LONG).show();
- Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- intent.setData(Uri.parse("package:" + getPackageName()));
- startActivity(intent);
- finish();
+ if (requestCode == REQUEST_CODE) {
+ for (int i = 0; i < permissions.length; i++) {
+ if (grantResults[i] == PERMISSION_GRANTED) {//閫夋嫨浜嗏�滃缁堝厑璁糕��
+ myRequetPermission();
+ } else {
+ //鎷掔粷浜嗘巿鏉�
+ if (grantResults[i] == PERMISSION_DENIED) {
+ SharedPreferences sharedPreferences = getSharedPreferences("permission", Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ editor.putBoolean("show", false);
+ editor.commit();
+ }
+ nextStep();
+ }
+ }
}
}
@@ -413,7 +454,8 @@
GDTAdInfo info = new Gson().fromJson(ad.toString(), GDTAdInfo.class);
if (info != null) {
AdUtil.saveGDTADInfo(getApplicationContext(), info);
- GDTADManager.getInstance().initWith(SplashActivity.this, info.getAppId());
+ GlobalSetting.setEnableCollectAppInstallStatus(false);
+ GDTAdSdk.init(SplashActivity.this, info.getAppId());
loadAD();
iv_splash.postDelayed(new Runnable() {
@Override
@@ -486,10 +528,6 @@
OkHttpUtils.getInstance().cancelTag(tag2);
OkHttpUtils.getInstance().cancelTag(tag3);
handler.removeCallbacksAndMessages(null);
- }
-
- private void startPermissionsActivity() {
- PermissionsActivity.startActivityForResult(this, REQUEST_CODE, true, PERMISSIONS);
}
@Override
@@ -616,8 +654,7 @@
@Override
public void onADClicked() {
- Log.i("AD_DEMO", "SplashADClicked clickUrl: "
- + (splashAD.getExt() != null ? splashAD.getExt().get("clickUrl") : ""));
+
}
/**
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/dialog/PermissionAuthNotifyDialog.java b/app/src/main/java/com/tejia/lijin/app/ui/dialog/PermissionAuthNotifyDialog.java
new file mode 100644
index 0000000..efcf3fa
--- /dev/null
+++ b/app/src/main/java/com/tejia/lijin/app/ui/dialog/PermissionAuthNotifyDialog.java
@@ -0,0 +1,89 @@
+package com.tejia.lijin.app.ui.dialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.tejia.lijin.app.R;
+import com.wpc.library.util.SystemCommon;
+import com.wpc.library.util.common.StringUtils;
+
+public class PermissionAuthNotifyDialog extends Dialog {
+
+ 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;
+ }
+ }
+
+
+}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/dialog/UserProtocolDialog.java b/app/src/main/java/com/tejia/lijin/app/ui/dialog/UserProtocolDialog.java
index 61c5763..11f948f 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/dialog/UserProtocolDialog.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/dialog/UserProtocolDialog.java
@@ -4,6 +4,7 @@
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
import android.graphics.Color;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
@@ -11,6 +12,7 @@
import android.widget.FrameLayout;
import android.widget.TextView;
+import com.tejia.lijin.app.ui.SimpleBrowserActivity;
import com.wpc.library.util.SystemCommon;
import com.wpc.library.util.common.StringUtils;
import com.tejia.lijin.app.R;
@@ -103,13 +105,19 @@
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.FILL_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
+ FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
TextView tv_title = layout.findViewById(R.id.tv_title);
TextView tv_content = layout.findViewById(R.id.tv_content);
- tv_content.setText(TextViewUtil.getClickableHtml(webviewData, context, Color.rgb(23, 106, 230)));
+ tv_content.setText(TextViewUtil.getClickableHtml(webviewData, context, Color.rgb(23, 106, 230), new TextViewUtil.URLClickListener() {
+
+ @Override
+ public void onClick(String url) {
+ context.startActivity(new Intent(context, SimpleBrowserActivity.class).putExtra("url", url));
+ }
+ }));
tv_content.setMovementMethod(LinkMovementMethod.getInstance());
tv_content.setClickable(false);
tv_content.setHighlightColor(context.getResources().getColor(android.R.color.transparent));
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/gmtemplate/GmTemplateContentFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/gmtemplate/GmTemplateContentFragment.java
index d076849..c595400 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/gmtemplate/GmTemplateContentFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/gmtemplate/GmTemplateContentFragment.java
@@ -240,14 +240,12 @@
mChangeHelper.registerReceiver();
indicator_category.setViewPager(vp_banner);
-// MobclickAgent.onPageStart("鍒嗙被璇︽儏椤�");
}
@Override
public void onPause() {
super.onPause();
mChangeHelper.unregisterReceiver();
-// MobclickAgent.onPageEnd("鍒嗙被璇︽儏椤�");
srl_second_category.setRefreshing(false);
srl_second_category.destroyDrawingCache();
srl_second_category.clearAnimation();
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
index ddc07b1..14e1d73 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserActivity.java
@@ -184,7 +184,7 @@
mPermissionsChecker = new PermissionHelper(this, this);
// webview.loadUrl("http://mp.weixin.qq.com/s/mu3lJ1DYEc0MxgnMHArHYA");
-// String url = "http://192.168.1.122:8848/test/WKWebView.html";
+ //url = "https://amcn.bytedance.com/ug/armor/623040fd8df75a02420060e1?show_loading=1&pull_down_close=0&enter_from=UG_CF_CSJ_2022&ug_feed_type=1&ug_app=0&plan_id=7106425777876369677&ug_app=0&page_id=F618&ecom_pid=dy_107062945313497465096_11642_3276765365";
if (!StringUtils.isEmpty(url)) {
getWebConfig(url);
}
@@ -645,7 +645,6 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
if (webview != null) {
webview.onResume();
webview.loadUrl("javascript:yestvcallback.resume()");
@@ -655,7 +654,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
if (webview != null) {
webview.onPause();
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserTestActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserTestActivity.java
index 2b3d7f2..c6f8062 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserTestActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/invite/ShareBrowserTestActivity.java
@@ -639,7 +639,6 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
if (webview != null) {
webview.onResume();
webview.loadUrl("javascript:yestvcallback.resume()");
@@ -650,7 +649,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
if (webview != null) {
webview.onPause();
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java
index 8fa7a07..07ca102 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java
@@ -532,8 +532,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("涓婚〉");
- MobclickAgent.onPause(this);
//娉ㄩ攢缇庢唇瀹㈡湇骞挎挱
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java
index 219423c..9d297c1 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/main/MineFragment.java
@@ -194,7 +194,7 @@
listener(contentView);
app = new UpdateApp(getActivity(), getResources().getString(R.string.update_key));
mPermissionsChecker = new PermissionHelper(getActivity(), this);
-// startActivity(new Intent(getContext(),ShareBrowserActivity.class).putExtra("url","http://192.168.3.122:8848/flqFront/help/pdd.html?resourceType=39997"));
+// startActivity(new Intent(getContext(),ShareBrowserActivity.class).putExtra("url","http://192.168.3.16:52330/index.html"));
}
private void init(View contentView) {
@@ -307,7 +307,6 @@
getUserConfig();
getLijinUserLevel();
getUnReadMsgCount(UserUtil.getUid(getContext()));
- MobclickAgent.onPageStart("鎴戠殑");
vp_banner.postDelayed(mAutoScroller, 2000);
}
@@ -1033,7 +1032,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("鎴戠殑");
lastTime = System.currentTimeMillis();
toast_dialog.dialog_dismiss();
ll_balance.setEnabled(true);
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java
index 69e3e82..11ad4af 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java
@@ -533,7 +533,6 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("绮鹃��");
mChangeHelper.registerReceiver();
SharedPreferences sp = ll_recommend_content.getContext()
.getSharedPreferences("user", MODE_PRIVATE);
@@ -614,7 +613,6 @@
public void onPause() {
super.onPause();
mChangeHelper.unregisterReceiver();
- MobclickAgent.onPageEnd("绮鹃��");
// Log.e("mResult", "棣栭〉onPause");
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/CollectionBrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/CollectionBrowserActivity.java
index 1482b6f..5bbc35b 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/CollectionBrowserActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/CollectionBrowserActivity.java
@@ -235,13 +235,11 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
}
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginActivity.java
index 016127c..8ec1243 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginActivity.java
@@ -171,7 +171,8 @@
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
-
+ setSendCodeState();
+ setSetLoginPhoneState();
}
@Override
@@ -222,7 +223,6 @@
protected void onResume() {
super.onResume();
Log.i(TAG, "onResume");
- MobclickAgent.onResume(this);
SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
boolean isLogin =UserUtil.isLogin(getApplicationContext());
if (isLogin) {//鐢ㄦ埛宸茬粡鐧诲綍
@@ -416,7 +416,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
if (isIntent) {
finish();
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
index e975bf5..c8051c2 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
@@ -89,6 +89,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login_select);
+ setShowRecommend(false);
mAquery = new AQuery(this);
TopStatusSettings.setStatusViewAndDeepColorNoView(this);
initData(getIntent());
@@ -327,11 +328,20 @@
canSend = true;
}
}
+ if(canSend) {
+ tv_login_gain_sms.setEnabled(canSend);
+ }
}
@Override
public void afterTextChanged(Editable editable) {
- tv_login_gain_sms.setEnabled(editable.length() == 13 ? true : false);
+ String text=editable !=null?editable.toString():"";
+ if(text.replace(" ","").length()==11){
+ tv_login_gain_sms.setEnabled(true);
+ }else{
+ tv_login_gain_sms.setEnabled(false);
+ }
+
// tv_login_gain_sms.setBackgroundResource(editable.length() == 13 ?
// R.drawable.shape_mobile_login_light : R.drawable.shape_login_gain_sms);
}
@@ -342,7 +352,6 @@
protected void onResume() {
super.onResume();
Log.i(TAG, "onResume");
- MobclickAgent.onResume(this);
boolean isLogin = UserUtil.isLogin(getApplicationContext());
if (isLogin) {//鐢ㄦ埛宸茬粡鐧诲綍
if (isWXLogin) {
@@ -372,6 +381,9 @@
mAquery.id(R.id.ll_other_login).visibility(View.GONE);
mAquery.id(R.id.tv_login_onekey).text("鏈満鍙风爜涓�閿粦瀹�");
mAquery.id(R.id.tv_mobile_hint).text(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿", getResources().getString(R.string.app_name)));
+
+ mAquery.id(R.id.cb_agree).checked(false);
+
break;
}
@@ -513,7 +525,7 @@
break;
case R.id.tv_login_gain_sms:
- if (!isAgreed()) {
+ if (!isAgreed() && (type == TYPE_LOGIN || type == TYPE_BIND_WITHOUT_LOGINED)) {
return;
}
tv_login_gain_sms.setEnabled(false);
@@ -547,7 +559,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
if (isIntent) {
finish();
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/MyPlayerSearchActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/MyPlayerSearchActivity.java
index 8018b7b..149c285 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/MyPlayerSearchActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/MyPlayerSearchActivity.java
@@ -149,13 +149,11 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
}
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
class HistoryAdapter extends BaseAdapter {
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java
index 53a358f..6520da8 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderActivity33.java
@@ -539,7 +539,6 @@
public void onResume() {
super.onResume();
mChangeHelper.registerReceiver();
- MobclickAgent.onPageStart("缃戦〉");
if (clickState == 1) {
showOrder();
}
@@ -1169,7 +1168,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
mChangeHelper.unregisterReceiver();
if (ups != null) {
ups.dialog_dismiss();
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderFormNumSearchActivity33.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderFormNumSearchActivity33.java
index 623a0ec..73a7745 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderFormNumSearchActivity33.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/OrderFormNumSearchActivity33.java
@@ -151,14 +151,12 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
setSearchHistoryData();
}
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/SettingActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/SettingActivity.java
index 1913916..58a7b83 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/SettingActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/SettingActivity.java
@@ -52,7 +52,7 @@
private TextView tv_version;
private TextView tv_cache_num;
private CheckBox cb_msg, cb_no_see_red_point, cb_no_see_reward_statistics,
- cb_no_see_share_and_selection, cb_no_see_phone;// cb_no_see_invite_reward;, cb_open_share_red_packet//寮�鍚帹骞跨孩鍖�
+ cb_no_see_share_and_selection, cb_no_see_phone,cb_push;// cb_no_see_invite_reward;, cb_open_share_red_packet//寮�鍚帹骞跨孩鍖�
private LinearLayout ll_clear_cache, ll_check_update, ll_person_info, ll_account_grade,
ll_about_us, ll_exit_account;
private int shareRedPacket, noBonusCount, noNewsRedDot, noShareRecordAndStorage, noDisplayPhoneNum;
@@ -74,6 +74,7 @@
cb_no_see_share_and_selection = findViewById(R.id.cb_no_see_share_and_selection);
cb_no_see_phone = findViewById(R.id.cb_no_see_phone);
+ cb_push= findViewById(R.id.cb_push);
// cb_no_see_invite_reward = findViewById(R.id.cb_no_see_invite_reward);
ll_clear_cache = findViewById(R.id.ll_clear_cache);
ll_check_update = findViewById(R.id.ll_check_update);
@@ -121,6 +122,21 @@
editor.commit();
}
});
+
+ cb_push.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ UserCustomEvent.userSettingCommon(SettingActivity.this, "涓�у寲鎺ㄩ�佸紑鍏�");
+ SharedPreferences.Editor editor = sp.edit();
+ ToolUtil.notDisturb(SettingActivity.this, isChecked);
+ if (isChecked)
+ editor.putBoolean("doNotRecommend", true);
+ else
+ editor.putBoolean("doNotRecommend", false);
+ editor.commit();
+ }
+ });
+
cb_no_see_red_point.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -162,6 +178,8 @@
noDisplayPhoneNum = getIntent().getIntExtra("noDisplayPhoneNum", 0);
cb_msg.setChecked(sp.getBoolean("doNotDisturb", false));
+ cb_push.setChecked(sp.getBoolean("doNotRecommend", false));
+
// cb_open_share_red_packet.setChecked(shareRedPacket == 1 ? true : false);
cb_no_see_red_point.setChecked(noNewsRedDot == 1 ? true : false);
cb_no_see_reward_statistics.setChecked(noBonusCount == 1 ? true : false);
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyActivity.java
index 8a432af..7683c52 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyActivity.java
@@ -95,7 +95,6 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
dialog.cancel();
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyFragment.java
index bd2e104..d96a7f0 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/ShoppingTrolleyFragment.java
@@ -423,7 +423,6 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("璐墿杞�");
final SharedPreferences sp = getActivity().getSharedPreferences("user", MODE_PRIVATE);
boolean isLogin = sp.getBoolean("isLogin", false);
if (isLogin) {
@@ -513,7 +512,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("璐墿杞�");
}
private void bindInfo() {
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/ChoicenessFreightFreeActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/ChoicenessFreightFreeActivity.java
index e05775a..05014a3 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/ChoicenessFreightFreeActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/ChoicenessFreightFreeActivity.java
@@ -29,6 +29,7 @@
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.tejia.lijin.app.util.Constant;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
import com.umeng.analytics.MobclickAgent;
import com.wpc.library.DeviceUuidFactory;
import com.wpc.library.util.GetManifestDataUtil;
@@ -526,7 +527,7 @@
params.put("uid", getSharedPreferences("user", MODE_PRIVATE).getString("uid", ""));
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(ChoicenessFreightFreeActivity.this, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(ChoicenessFreightFreeActivity.this);
+ String imei = DeviceInfoUtil.getIMEI(ChoicenessFreightFreeActivity.this);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
params.put("osVersion", MobileUtil.getSystemVersion());
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/FragmentSearch.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/FragmentSearch.java
index d5a985f..fa52ec4 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/FragmentSearch.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/FragmentSearch.java
@@ -201,7 +201,6 @@
public void onResume() {
super.onResume();
mChangeHelper.registerReceiver();
- MobclickAgent.onPageStart("鎼滅储椤�");
mPresenter.setHistoricalRecords(mBundle.getInt("id"), mList, ll_search_history_hint, null, ll_guidevideo, videoPicture);//鏄剧ず鍘嗗彶璁板綍
setSearchHistoryData();
}
@@ -210,7 +209,6 @@
public void onPause() {
super.onPause();
mChangeHelper.unregisterReceiver();
- MobclickAgent.onPageEnd("鎼滅储椤�");
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/GoodsDetailBrowerActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/GoodsDetailBrowerActivity.java
index 0543fa8..8f2adba 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/GoodsDetailBrowerActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/GoodsDetailBrowerActivity.java
@@ -750,7 +750,6 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
if (!getSharedPreferences("user", MODE_PRIVATE).getBoolean("isLogin", false)) {
if (getSharedPreferences("user", MODE_PRIVATE).getString("is_goods_web_detail", "0").contains("0")) {
findViewById(R.id.tv_prombt).setVisibility(View.GONE);
@@ -772,7 +771,6 @@
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java
index 94be1cc..0971a61 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/MultiGoodsShareActivity.java
@@ -1093,7 +1093,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryFragment.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryFragment.java
index 2248990..9087656 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryFragment.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendCategoryFragment.java
@@ -250,7 +250,6 @@
super.onResume();
mChangeHelper.registerReceiver();
indicator_category.setViewPager(vp_banner);
- MobclickAgent.onPageStart("鍒嗙被璇︽儏椤�");
long stayTime = System.currentTimeMillis() - bannerAdapter.clickTime;
if (bannerAdapter.clickTime > 0 && stayTime > 15 * 1000) {
@@ -267,7 +266,6 @@
public void onPause() {
super.onPause();
mChangeHelper.unregisterReceiver();
- MobclickAgent.onPageEnd("鍒嗙被璇︽儏椤�");
srl_second_category.setRefreshing(false);
srl_second_category.destroyDrawingCache();
srl_second_category.clearAnimation();
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
index 06fd903..86159a6 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SearchActivity.java
@@ -282,13 +282,11 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onPageStart("鎼滅储椤�");
}
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("鎼滅储椤�");
}
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/ShareGoodsImageActivity31.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/ShareGoodsImageActivity31.java
index 37dbb83..1b634a2 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/ShareGoodsImageActivity31.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/ShareGoodsImageActivity31.java
@@ -244,7 +244,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SpecialBrowserActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SpecialBrowserActivity.java
index 9bbf726..fba4e16 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/SpecialBrowserActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/SpecialBrowserActivity.java
@@ -272,13 +272,11 @@
@Override
public void onResume() {
super.onResume();
- MobclickAgent.onPageStart("缃戦〉");
}
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("缃戦〉");
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/ShareMainPictureChoiceActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/ShareMainPictureChoiceActivity.java
index 408587a..53b743c 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/ShareMainPictureChoiceActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/recommend/singleshare/ShareMainPictureChoiceActivity.java
@@ -90,7 +90,6 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onResume(this);
}
@Override
@@ -124,7 +123,6 @@
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPause(this);
}
@Override
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/trends/CollegeSearchActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/trends/CollegeSearchActivity.java
index 17bcd71..a519834 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/trends/CollegeSearchActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/trends/CollegeSearchActivity.java
@@ -108,13 +108,11 @@
@Override
protected void onResume() {
super.onResume();
- MobclickAgent.onPageStart("瀛﹂櫌鏂囩珷鎼滅储椤�");
}
@Override
protected void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("瀛﹂櫌鏂囩珷鎼滅储椤�");
}
diff --git a/app/src/main/java/com/tejia/lijin/app/updateApp/UpdateApp.java b/app/src/main/java/com/tejia/lijin/app/updateApp/UpdateApp.java
index 52b39b5..9463bad 100644
--- a/app/src/main/java/com/tejia/lijin/app/updateApp/UpdateApp.java
+++ b/app/src/main/java/com/tejia/lijin/app/updateApp/UpdateApp.java
@@ -26,6 +26,7 @@
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.ShoppingApi;
import com.tejia.lijin.app.util.TimeJudge;
+import com.wpc.library.util.common.DeviceUtil;
import org.apache.http.Header;
import org.json.JSONObject;
@@ -256,8 +257,7 @@
//妫�娴嬫槸鍚﹀畨瑁呬簡搴旂敤瀹�
private boolean isMobile_spExist() {
- PackageManager manager = mActivity.getPackageManager();
- List<PackageInfo> pkgList = manager.getInstalledPackages(0);
+ List<PackageInfo> pkgList = DeviceUtil.getInstalledPackagesCache(mActivity);
for (int i = 0; i < pkgList.size(); i++) {
PackageInfo pI = pkgList.get(i);
if (pI.packageName.equalsIgnoreCase("com.tencent.android.qqdownloader"))
diff --git a/app/src/main/java/com/tejia/lijin/app/util/DeviceInfoUtil.java b/app/src/main/java/com/tejia/lijin/app/util/DeviceInfoUtil.java
new file mode 100644
index 0000000..a6d4a90
--- /dev/null
+++ b/app/src/main/java/com/tejia/lijin/app/util/DeviceInfoUtil.java
@@ -0,0 +1,89 @@
+package com.tejia.lijin.app.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.google.gson.Gson;
+import com.tejia.lijin.app.entity.common.ExpireValue;
+import com.wpc.library.DeviceUuidFactory;
+import com.wpc.library.util.MobileUtil;
+import com.wpc.library.util.common.StringUtils;
+
+import static android.content.Context.MODE_PRIVATE;
+
+public class DeviceInfoUtil {
+ enum DeviceInfoType {
+ deviceId("device_id_"), imei("imei_"), androidId("android_id_"), mac("mac_"), utdid("utdid_"), systemModel("system_model_"), systemVersion("system_version_");
+ private String key;
+
+ public String getKey() {
+ return key;
+ }
+
+ private DeviceInfoType(String key) {
+ this.key = key;
+ }
+ }
+
+
+ private static String getDeviceInfo(Context context, DeviceInfoType deviceInfoType) {
+ SharedPreferences deviceInfo = context.getSharedPreferences("deviceInfo", MODE_PRIVATE);
+ String data = deviceInfo.getString(deviceInfoType.getKey(), "");
+ ExpireValue value = null;
+ if (!StringUtils.isEmpty(data)) {
+ value = new Gson().fromJson(data, ExpireValue.class);
+ if (value.getExpireTime() < System.currentTimeMillis()) {
+ value = null;
+ }
+ }
+
+ if (value == null) {
+ String v = "";
+ if (deviceInfoType == DeviceInfoType.imei) {
+ v = MobileUtil.getIMEI(context);
+ } else if (deviceInfoType == DeviceInfoType.utdid) {
+ v = com.ta.utdid2.device.UTDevice.getUtdid(context);
+ } else if (deviceInfoType == DeviceInfoType.systemModel) {
+ v = MobileUtil.getSystemModel();
+ } else if (deviceInfoType == DeviceInfoType.systemVersion) {
+ v = MobileUtil.getSystemVersion();
+ } else if (deviceInfoType == DeviceInfoType.deviceId) {
+ v = new DeviceUuidFactory(context).getDeviceUuid() + "";
+ }
+ value = new ExpireValue(v, System.currentTimeMillis() + 1000 * 60 * 10);
+ SharedPreferences.Editor editor = deviceInfo.edit();
+ editor.putString(deviceInfoType.getKey(), new Gson().toJson(value));
+ editor.commit();
+ }
+ if (value == null)
+ return "";
+ else
+ return value.getValue();
+ }
+
+ public static String getIMEI(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.imei);
+ }
+
+ public static String getAndroidId(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.androidId);
+ }
+
+ public static String getUtdid(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.utdid);
+ }
+
+ public static String getSystemModel(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.systemModel);
+ }
+
+ public static String getSystemVersion(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.systemVersion);
+ }
+
+ public static String getDeviceId(Context context) {
+ return getDeviceInfo(context, DeviceInfoType.deviceId);
+ }
+
+
+}
diff --git a/app/src/main/java/com/tejia/lijin/app/util/Tools.java b/app/src/main/java/com/tejia/lijin/app/util/Tools.java
index 6e13c4a..011f083 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/Tools.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/Tools.java
@@ -5,6 +5,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
@@ -21,6 +22,7 @@
import com.wpc.lcjianlibrary.BuildConfig;
import com.wpc.library.util.MobileUtil;
import com.tejia.lijin.app.ui.dialog.UnbindDialog;
+import com.wpc.library.util.common.DeviceUtil;
import java.io.File;
import java.io.FileNotFoundException;
@@ -305,7 +307,7 @@
public static int isTaobaoAvilible(final Context context) {
int returnNum;
final PackageManager packageManager = context.getPackageManager();// 鑾峰彇packagemanager
- List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);// 鑾峰彇鎵�鏈夊凡瀹夎绋嬪簭鐨勫寘淇℃伅
+ List<PackageInfo> pinfo = DeviceUtil.getInstalledPackagesCache(context);
if (pinfo != null) {
boolean isReadSuc = false;
for (int i = 0; i < pinfo.size(); i++) {
@@ -340,7 +342,6 @@
}
/**
- *
* @param context
* @return 0-瀹夎浜嗗井淇� 1-娌℃湁璇诲彇搴旂敤鏉冮檺 2-娌℃湁瀹夎寰俊
*/
@@ -348,7 +349,7 @@
public static int isWeixinAvilible(final Context context) {
int returnNum = 2;
final PackageManager packageManager = context.getPackageManager();// 鑾峰彇packagemanager
- List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);// 鑾峰彇鎵�鏈夊凡瀹夎绋嬪簭鐨勫寘淇℃伅
+ List<PackageInfo> pinfo = DeviceUtil.getInstalledPackagesCache(context);
if (pinfo != null) {
boolean isReadSuc = false;
for (int i = 0; i < pinfo.size(); i++) {
@@ -385,7 +386,7 @@
//鍒ゆ柇鏄惁瀹夎浜唖ina
public static int isSinaAvilible(Context context) {
final PackageManager packageManager = context.getPackageManager();// 鑾峰彇packagemanager
- List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);// 鑾峰彇鎵�鏈夊凡瀹夎绋嬪簭鐨勫寘淇℃伅
+ List<PackageInfo> pinfo = DeviceUtil.getInstalledPackagesCache(context);
int returnNum = 2;
if (pinfo != null) {
boolean isReadSuc = false;
@@ -423,7 +424,7 @@
//鍒ゆ柇鏄惁瀹夎浜哘Q
public static int isQQAvilible(Context context) {
final PackageManager packageManager = context.getPackageManager();// 鑾峰彇packagemanager
- List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);// 鑾峰彇鎵�鏈夊凡瀹夎绋嬪簭鐨勫寘淇℃伅
+ List<PackageInfo> pinfo = DeviceUtil.getInstalledPackagesCache(context);
int returnNum;
if (pinfo != null) {
boolean isReadSuc = false;
@@ -460,7 +461,7 @@
private static void openAppListPermission(final Context context, String platform) {
UnbindDialog.Builder builder = new UnbindDialog.Builder(context);
- builder.setMessage("闇�瑕佹娴嬫槸鍚﹀畨瑁�" + platform +"锛岃鎵撳紑 璇诲彇搴旂敤鍒楄〃鏉冮檺")
+ builder.setMessage("闇�瑕佹娴嬫槸鍚﹀畨瑁�" + platform + "锛岃鎵撳紑 璇诲彇搴旂敤鍒楄〃鏉冮檺")
.setNegativeButton("鍙栨秷", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
@@ -555,6 +556,26 @@
* @return content Uri
*/
public static Uri getImageContentUri(Context context, File imageFile) {
+// if (1 > 0) {
+// try {
+// ApplicationInfo applicationInfo = context.getApplicationInfo();
+// int targetSDK = applicationInfo.targetSdkVersion;
+// Uri uri;
+// if (targetSDK >= Build.VERSION_CODES.N && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+// uri = Uri.parse(android.provider.MediaStore.Images.Media.insertImage(context.getContentResolver(),
+// imageFile.getAbsolutePath(), imageFile.getName(), null));
+// } else {
+// uri = Uri.fromFile(new File(imageFile.getPath()));
+// }
+//
+// return uri;
+// } catch (Exception e) {
+// return null;
+// }
+//
+// }
+
+
String filePath = imageFile.getAbsolutePath();
Cursor cursor = context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
new String[]{MediaStore.Images.Media._ID}, MediaStore.Images.Media.DATA + "=? ",
diff --git a/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdContainer.java b/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdContainer.java
index 901e3d7..20e830a 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdContainer.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdContainer.java
@@ -3,13 +3,12 @@
import com.bytedance.sdk.openadsdk.TTNativeExpressAd;
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.ads.nativ.NativeUnifiedADData;
-import com.qq.e.ads.nativ.express2.NativeExpressADData2;
//淇℃伅娴佸師鐢熷箍鍛婂鍣�
public class ExpressAdContainer {
TTNativeExpressAd csj;
- NativeExpressADData2 gdt2;//2.0鐗堝箍鐐归��
+ NativeExpressADView gdt;//鏃х増骞跨偣閫�
NativeUnifiedADData gdt2Unfied;//2.0骞跨偣閫氳嚜娓叉煋
public NativeUnifiedADData getGdt2Unfied() {
@@ -25,10 +24,7 @@
}
public ExpressAdContainer(NativeExpressADView gdt) {
- }
-
- public ExpressAdContainer(NativeExpressADData2 gdt2) {
- this.gdt2 = gdt2;
+ this.gdt = gdt;
}
public ExpressAdContainer(NativeUnifiedADData gdt2Unfied) {
@@ -43,13 +39,11 @@
this.csj = csj;
}
- public NativeExpressADData2 getGdt2() {
- return gdt2;
+ public NativeExpressADView getGdt() {
+ return gdt;
}
- public void setGdt2(NativeExpressADData2 gdt2) {
- this.gdt2 = gdt2;
+ public void setGdt(NativeExpressADView gdt) {
+ this.gdt = gdt;
}
-
-
}
diff --git a/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdManager.java b/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdManager.java
index 8e567d1..344e2dd 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdManager.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ad/ExpressAdManager.java
@@ -12,11 +12,10 @@
import com.bytedance.sdk.openadsdk.TTAdManager;
import com.bytedance.sdk.openadsdk.TTAdNative;
import com.bytedance.sdk.openadsdk.TTNativeExpressAd;
+import com.qq.e.ads.cfg.VideoOption;
+import com.qq.e.ads.nativ.ADSize;
+import com.qq.e.ads.nativ.NativeExpressAD;
import com.qq.e.ads.nativ.NativeExpressADView;
-import com.qq.e.ads.nativ.express2.AdEventListener;
-import com.qq.e.ads.nativ.express2.NativeExpressAD2;
-import com.qq.e.ads.nativ.express2.NativeExpressADData2;
-import com.qq.e.ads.nativ.express2.VideoOption2;
import com.qq.e.comm.util.AdError;
import com.wpc.library.util.common.DimenUtils;
@@ -60,23 +59,17 @@
*/
public void loadAd(int widthDP, int heightDP, String pid, int count, final IAdLoadListener adLoadListener) {
if (sourceType == AdUtil.AD_TYPE.gdt2) {
- loadGDT2(pid, widthDP, heightDP, count, new IGDTAdLoadListener() {
+ loadGDT(pid, widthDP, heightDP, count, new IGDTAdLoadListener() {
@Override
public void onSuccess(List<NativeExpressADView> adList) {
-
- }
-
- @Override
- public void onSuccess2(List<NativeExpressADData2> adList) {
List<ExpressAdContainer> adContainerList = new ArrayList<>();
if (adList != null)
- for (NativeExpressADData2 ad : adList) {
- adContainerList.add(new ExpressAdContainer(ad));
+ for (NativeExpressADView adView : adList) {
+ adContainerList.add(new ExpressAdContainer(adView));
}
adLoadListener.onSuccess(adContainerList);
}
}, mContext);
-
} else if (sourceType == AdUtil.AD_TYPE.csj) {
loadCSJ(pid, widthDP, heightDP, count, new ICSJAdLoadListener() {
@Override
@@ -110,45 +103,6 @@
}
/**
- * 2.0鐗堟湰骞跨偣閫氬師鐢�
- *
- * @param positionId
- * @param widthDP
- * @param heightDP
- * @param count
- * @param adLoadListener
- * @param context
- */
- private void loadGDT2(String positionId, int widthDP, int heightDP, int count, final IGDTAdLoadListener adLoadListener, Context context) {
-
- Log.i(TAG, String.format("loadGDT2:positionId-%s widthDP-%s heightDP-%s", positionId, widthDP, heightDP));
-
- NativeExpressAD2 nativeExpressAD2 = new NativeExpressAD2(context, positionId, new NativeExpressAD2.AdLoadListener() {
- @Override
- public void onLoadSuccess(List<NativeExpressADData2> list) {
- if (adLoadListener != null)
- adLoadListener.onSuccess2(list);
- }
-
- @Override
- public void onNoAD(AdError adError) {
- if (adLoadListener != null)
- adLoadListener.onSuccess2(null);
- }
- });
-
- nativeExpressAD2.setAdSize(widthDP, heightDP);
- VideoOption2.Builder builder = new VideoOption2.Builder();
- builder.setAutoPlayPolicy(VideoOption2.AutoPlayPolicy.WIFI) // WIFI 鐜涓嬪彲浠ヨ嚜鍔ㄦ挱鏀捐棰�
- .setAutoPlayMuted(true) // 鑷姩鎾斁鏃朵负闈欓煶
- .setDetailPageMuted(false) // 瑙嗛璇︽儏椤垫挱鏀炬椂涓嶉潤闊�
- .setMaxVideoDuration(0) // 璁剧疆杩斿洖瑙嗛骞垮憡鐨勬渶澶ц棰戞椂闀匡紙闂尯闂达紝鍙崟鐙缃級锛屽崟浣�:绉掞紝榛樿涓� 0 浠ｈ〃鏃犻檺鍒讹紝鍚堟硶杈撳叆涓猴細5<=maxVideoDuration<=60. 姝よ缃細褰卞搷骞垮憡濉厖锛岃璋ㄦ厧璁剧疆
- .setMinVideoDuration(0); // 璁剧疆杩斿洖瑙嗛骞垮憡鐨勬渶灏忚棰戞椂闀匡紙闂尯闂达紝鍙崟鐙缃級锛屽崟浣�:绉掞紝榛樿涓� 0 浠ｈ〃鏃犻檺鍒讹紝 姝よ缃細褰卞搷骞垮憡濉厖锛岃璋ㄦ厧璁剧疆
- nativeExpressAD2.setVideoOption2(builder.build());
- nativeExpressAD2.loadAd(count);
- }
-
- /**
* 绌垮北鐢插箍鍛�
*
* @param codeId
@@ -178,6 +132,69 @@
});
}
+ /**
+ * 鍔犺浇骞跨偣閫氬箍鍛�
+ *
+ * @param positionId
+ * @param count
+ * @param adLoadListener
+ * @param context
+ */
+ private void loadGDT(String positionId, int widthDP, int heightDP, int count, final IGDTAdLoadListener adLoadListener, Context context) {
+
+
+ NativeExpressAD nativeExpressAD = new NativeExpressAD(context, new ADSize(widthDP, ADSize.AUTO_HEIGHT),
+ positionId, new NativeExpressAD.NativeExpressADListener() {
+
+ @Override
+ public void onADLoaded(List<NativeExpressADView> list) {
+ if (adLoadListener != null)
+ adLoadListener.onSuccess(list);
+ }
+
+ @Override
+ public void onRenderFail(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onRenderSuccess(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onADExposure(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onADClicked(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onADClosed(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onADLeftApplication(NativeExpressADView nativeExpressADView) {
+
+ }
+
+ @Override
+ public void onNoAD(AdError adError) {
+ if (adLoadListener != null)
+ adLoadListener.onSuccess(null);
+ }
+ }); // 浼犲叆Activity
+ nativeExpressAD.setVideoOption(new VideoOption.Builder()
+ .setAutoPlayPolicy(VideoOption.AutoPlayPolicy.WIFI) // WIFI 鐜涓嬪彲浠ヨ嚜鍔ㄦ挱鏀捐棰�
+ .setAutoPlayMuted(true) // 鑷姩鎾斁鏃朵负闈欓煶
+ .build()); //
+ nativeExpressAD.loadAD(count);
+ }
+
/**
* 娓叉煋妯℃澘鍜屽～鍏呭箍鍛�
@@ -193,45 +210,16 @@
fl_ad.setVisibility(View.GONE);
} else {
fl_ad.setVisibility(View.VISIBLE);
- if (ad.getGdt2() != null) {
- if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getGdt2().getAdView()) {
+ if (ad.getGdt() != null) {
+ if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getGdt()) {
return;
}
fl_ad.removeAllViews();
-
- ad.getGdt2().setAdEventListener(new AdEventListener() {
- @Override
- public void onClick() {
-
- }
-
- @Override
- public void onExposed() {
-
- }
-
- @Override
- public void onRenderSuccess() {
- if (ad.getGdt2().getAdView().getParent() != null) {
- ((ViewGroup) ad.getGdt2().getAdView().getParent()).removeAllViews();
- }
- fl_ad.addView(ad.getGdt2().getAdView());
- }
-
- @Override
- public void onRenderFail() {
-
- }
-
- @Override
- public void onAdClosed() {
- if (adEventListener != null) {
- adEventListener.closeAd(ad);
- }
- }
- });
- ad.getGdt2().render();
-
+ ad.getGdt().render();
+ if (ad.getGdt().getParent() != null) {
+ ((ViewGroup) ad.getGdt().getParent()).removeAllViews();
+ }
+ fl_ad.addView(ad.getGdt());
} else if (ad.getCsj() != null) {
if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getCsj().getExpressAdView()) {
return;
@@ -253,6 +241,7 @@
}
}
+
@Override
public void onCancel() {
@@ -269,7 +258,6 @@
}
-
/**
* 娓叉煋骞垮憡
*
@@ -284,43 +272,14 @@
return;
}
- if (ad.getGdt2() != null) {
- ad.getGdt2().setAdEventListener(new AdEventListener() {
- @Override
- public void onClick() {
-
- }
-
- @Override
- public void onExposed() {
-
- }
-
- @Override
- public void onRenderSuccess() {
- List<ExpressAdContainer> list = new ArrayList<>();
- list.add(ad);
- if (adRenderListener != null)
- adRenderListener.onRenderSuccess(list);
- }
-
- @Override
- public void onRenderFail() {
- List<ExpressAdContainer> list = new ArrayList<>();
- list.add(ad);
- if (adRenderListener != null)
- adRenderListener.onRenderFail(list);
- }
-
- @Override
- public void onAdClosed() {
- if (adEventListener != null)
- adEventListener.closeAd(ad);
- }
- });
- ad.getGdt2().render();
-
+ if (ad.getGdt() != null) {
+ ad.getGdt().render();
+ List<ExpressAdContainer> list = new ArrayList<>();
+ list.add(ad);
+ if (adRenderListener != null)
+ adRenderListener.onRenderSuccess(list);
} else if (ad.getCsj() != null) {
+ Log.i(TAG, "骞垮憡鏇濆厜:csj");
ad.getCsj().setExpressInteractionListener(new TTNativeExpressAd.ExpressAdInteractionListener() {
@Override
public void onAdClicked(View view, int i) {
@@ -365,6 +324,7 @@
}
}
+
@Override
public void onCancel() {
@@ -377,7 +337,6 @@
}
-
/**
* 涓哄箍鍛婄粦瀹氬叧闂簨浠�
*
@@ -391,35 +350,9 @@
return;
}
- if (ad.getGdt2() != null) {
- ad.getGdt2().setAdEventListener(new AdEventListener() {
- @Override
- public void onClick() {
-
- }
-
- @Override
- public void onExposed() {
-
- }
-
- @Override
- public void onRenderSuccess() {
-
- }
-
- @Override
- public void onRenderFail() {
- }
-
- @Override
- public void onAdClosed() {
- if (adEventListener != null)
- adEventListener.closeAd(ad);
- }
- });
-
- } else if (ad.getCsj() != null) {
+ if (ad.getGdt() != null) {
+ return;
+ } else if (ad.getCsj() != null) {
ad.getCsj().setExpressInteractionListener(new TTNativeExpressAd.ExpressAdInteractionListener() {
@Override
public void onAdClicked(View view, int i) {
@@ -456,16 +389,19 @@
}
}
+
@Override
public void onCancel() {
}
+
});
}
}
+
/**
@@ -483,17 +419,16 @@
fl_ad.setVisibility(View.GONE);
} else {
fl_ad.setVisibility(View.VISIBLE);
- if (ad.getGdt2() != null) {
- if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getGdt2().getAdView()) {
+ if (ad.getGdt() != null) {
+ if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getGdt()) {
return;
}
- if (ad.getGdt2().getAdView().getParent() != null) {
- ((ViewGroup) ad.getGdt2().getAdView().getParent()).removeAllViews();
+ if (ad.getGdt().getParent() != null) {
+ ((ViewGroup) ad.getGdt().getParent()).removeAllViews();
}
fl_ad.removeAllViews();
- fl_ad.addView(ad.getGdt2().getAdView());
-
- } else if (ad.getCsj() != null) {
+ fl_ad.addView(ad.getGdt());
+ }else if (ad.getCsj() != null) {
if (fl_ad.getChildCount() > 0 && fl_ad.getChildAt(0) == ad.getCsj().getExpressAdView()) {
return;
}
@@ -519,11 +454,8 @@
}
-
interface IGDTAdLoadListener {
public void onSuccess(List<NativeExpressADView> adList);
-
- public void onSuccess2(List<NativeExpressADData2> adList);
}
interface ICSJAdLoadListener {
diff --git a/app/src/main/java/com/tejia/lijin/app/util/ad/TTAdManagerHolder.java b/app/src/main/java/com/tejia/lijin/app/util/ad/TTAdManagerHolder.java
index 8e21ca5..172a124 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ad/TTAdManagerHolder.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ad/TTAdManagerHolder.java
@@ -2,12 +2,15 @@
import android.content.Context;
+import com.bytedance.sdk.openadsdk.LocationProvider;
import com.bytedance.sdk.openadsdk.TTAdConfig;
import com.bytedance.sdk.openadsdk.TTAdConstant;
import com.bytedance.sdk.openadsdk.TTAdManager;
import com.bytedance.sdk.openadsdk.TTAdSdk;
+import com.bytedance.sdk.openadsdk.TTCustomController;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.util.Constant;
+import com.wpc.library.util.common.DeviceUtil;
/**
* 鍙互鐢ㄤ竴涓崟渚嬫潵淇濆瓨TTAdManager瀹炰緥锛屽湪闇�瑕佸垵濮嬪寲sdk鐨勬椂鍊欒皟鐢�
@@ -24,35 +27,80 @@
return TTAdSdk.getAdManager();
}
- public static void init(Context context) {
- doInit(context);
+ public static void init(Context context,TTAdSdk.InitCallback initCallback) {
+ doInit(context,initCallback);
}
//step1:鎺ュ叆缃戠洘骞垮憡sdk鐨勫垵濮嬪寲鎿嶄綔锛岃鎯呰鎺ュ叆鏂囨。鍜岀┛灞辩敳骞冲彴璇存槑
- private static void doInit(Context context) {
- if (!sInit) {
+ private static void doInit(Context context, TTAdSdk.InitCallback initCallback) {
+ if (!TTAdSdk.isInitSuccess()) {
try {
- TTAdSdk.init(context, buildConfig(context));
- sInit = true;
- } catch (Exception e) {
+ TTAdSdk.init(context, buildConfig(context), initCallback);
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ } else {
+ initCallback.success();
}
}
- private static TTAdConfig buildConfig(Context context) {
+ private static TTAdConfig buildConfig(final Context context) {
return new TTAdConfig.Builder()
.appId(Constant.CSJ_APP_ID)
.useTextureView(true) //浣跨敤TextureView鎺т欢鎾斁瑙嗛,榛樿涓篠urfaceView,褰撴湁SurfaceView鍐茬獊鐨勫満鏅紝鍙互浣跨敤TextureView
.appName(context.getString(R.string.app_name))
.titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
.allowShowNotify(true) //鏄惁鍏佽sdk灞曠ず閫氱煡鏍忔彁绀�
- .allowShowPageWhenScreenLock(true) //鏄惁鍦ㄩ攣灞忓満鏅敮鎸佸睍绀哄箍鍛婅惤鍦伴〉
.debug(true) //娴嬭瘯闃舵鎵撳紑锛屽彲浠ラ�氳繃鏃ュ織鎺掓煡闂锛屼笂绾挎椂鍘婚櫎璇ヨ皟鐢�
- .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI)
- .supportMultiProcess(true)//鏄惁鏀寔澶氳繘绋�
- .asyncInit(true)
- .needClearTaskReset()
+ .supportMultiProcess(false)//鏄惁鏀寔澶氳繘绋�
+
+ .customController(new TTCustomController() {
+ @Override
+ public boolean isCanUseLocation() {
+ return false;
+ }
+
+ @Override
+ public LocationProvider getTTLocation() {
+ return super.getTTLocation();
+ }
+
+ @Override
+ public boolean isCanUsePhoneState() {
+ return false;
+ }
+
+ @Override
+ public String getDevImei() {
+ return DeviceUtil.getImeiCache(context);
+ }
+
+ @Override
+ public boolean isCanUseWifiState() {
+ return false;
+ }
+
+ @Override
+ public String getMacAddress() {
+ return super.getMacAddress();
+ }
+
+ @Override
+ public boolean isCanUseWriteExternal() {
+ return false;
+ }
+
+ @Override
+ public String getDevOaid() {
+ return super.getDevOaid();
+ }
+
+ @Override
+ public boolean isCanUseAndroidId() {
+ return false;
+ }
+ }).asyncInit(true)
//.httpStack(new MyOkStack3())//鑷畾涔夌綉缁滃簱锛宒emo涓粰鍑轰簡okhttp3鐗堟湰鐨勬牱渚嬶紝鍏朵綑璇疯嚜琛屽紑鍙戞垨鑰呭挩璇㈠伐浣滀汉鍛樸��
.build();
}
diff --git a/app/src/main/java/com/tejia/lijin/app/util/share/ShareImageUtil.java b/app/src/main/java/com/tejia/lijin/app/util/share/ShareImageUtil.java
index 9b14971..f34b408 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/share/ShareImageUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/share/ShareImageUtil.java
@@ -23,7 +23,6 @@
ComponentName comp = new ComponentName(packageName, activityName);
intent.setComponent(comp);
intent.setType("image/*");
-
if (imageList.size() == 1) {
intent.putExtra(Intent.EXTRA_STREAM, imageList.get(0));
intent.setAction(Intent.ACTION_SEND);
@@ -37,6 +36,8 @@
intent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);//澧炲姞璇诲啓鏉冮檺
}
context.startActivity(intent);
+// intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+// context.startActivity(Intent.createChooser(intent, "鍒嗕韩鍒帮細"));
}
diff --git a/app/src/main/java/com/tejia/lijin/app/util/ui/TextViewUtil.java b/app/src/main/java/com/tejia/lijin/app/util/ui/TextViewUtil.java
index ea5863c..e97557e 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ui/TextViewUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ui/TextViewUtil.java
@@ -31,6 +31,16 @@
return clickableHtmlBuilder;
}
+ public static CharSequence getClickableHtml(String html, Context context, Integer color, URLClickListener urlClickListener) {
+ Spanned spannedHtml = Html.fromHtml(html);
+ SpannableStringBuilder clickableHtmlBuilder = new SpannableStringBuilder(spannedHtml);
+ URLSpan[] urls = clickableHtmlBuilder.getSpans(0, spannedHtml.length(), URLSpan.class);
+ for (final URLSpan span : urls) {
+ setLinkClickable(clickableHtmlBuilder, span, context, color, urlClickListener);
+ }
+ return clickableHtmlBuilder;
+ }
+
public static CharSequence getClickableHtml(Spanned spannedHtml, Context context, Integer color) {
SpannableStringBuilder clickableHtmlBuilder = new SpannableStringBuilder(spannedHtml);
URLSpan[] urls = clickableHtmlBuilder.getSpans(0, spannedHtml.length(), URLSpan.class);
diff --git a/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java b/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java
index f506909..d09a64c 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterface.java
@@ -13,6 +13,7 @@
import com.tejia.lijin.app.ShoppingApi;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.util.Constant;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.tejia.lijin.app.util.WXUtil;
import com.umeng.analytics.MobclickAgent;
@@ -177,7 +178,7 @@
params.put("uid", mContext.getSharedPreferences("user", MODE_PRIVATE).getString("uid", ""));
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(mContext, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(mContext);
+ String imei = DeviceInfoUtil.getIMEI(mContext);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
params.put("osVersion", MobileUtil.getSystemVersion());
diff --git a/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java b/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java
index b5b2706..24920d2 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/web/BaseRebateJavaInterfaceBS.java
@@ -16,6 +16,7 @@
import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
import com.tejia.lijin.app.ui.recommend.SearchActivity;
+import com.tejia.lijin.app.util.DeviceInfoUtil;
import com.tejia.lijin.app.util.JumpActivityUtil;
import com.tejia.lijin.app.util.SystemParamsUtil;
import com.tejia.lijin.app.util.WXUtil;
@@ -203,7 +204,7 @@
params.put("uid", mContext.getSharedPreferences("user", MODE_PRIVATE).getString("uid", ""));
params.put("apiversion", "1");
params.put("channel", GetManifestDataUtil.getAppMetaData(mContext, "UMENG_CHANNEL"));
- String imei = MobileUtil.getIMEI(mContext);
+ String imei = DeviceInfoUtil.getIMEI(mContext);
if (!StringUtils.isEmpty(imei))
params.put("imei", imei);
params.put("osVersion", MobileUtil.getSystemVersion());
diff --git a/app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java b/app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java
index 6f7727d..9d4100b 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/web/RebateJavaInterfaceBS.java
@@ -542,8 +542,6 @@
TTAdNative mTTAdNative = TTAdSdk.getAdManager().createAdNative(mContext);
AdSlot adSlot = new AdSlot.Builder()
.setCodeId(pid)
- .setRewardName("閲戝竵") //濂栧姳鐨勫悕绉� 閫夊～
- .setRewardAmount(3) //濂栧姳鐨勬暟閲� 閫夊～
// .setUserID("tag123")//tag_id
.setMediaExtra("media_extra") //闄勫姞鍙傛暟
.setOrientation(TTAdConstant.VERTICAL) //蹇呭～鍙傛暟锛屾湡鏈涜棰戠殑鎾斁鏂瑰悜锛歍TAdConstant.HORIZONTAL 鎴� TTAdConstant.VERTICAL
@@ -568,6 +566,16 @@
mttRewardVideoAd.showRewardVideoAd(mContext, TTAdConstant.RitScenes.CUSTOMIZE_SCENES, "scenes_test");
mttRewardVideoAd = null;
}
+ com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
+ result.put("code", 100);
+ result.put("msg", "缂撳瓨鎴愬姛");
+ handler.setProgressData(result);
+ }
+
+ @Override
+ public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
+ mttRewardVideoAd=ttRewardVideoAd;
+ //寮�鍙戣�呭仛涓�涓爣璇�
com.alibaba.fastjson.JSONObject result = new com.alibaba.fastjson.JSONObject();
result.put("code", 100);
result.put("msg", "缂撳瓨鎴愬姛");
@@ -617,6 +625,11 @@
result.put("code", 0);
result.put("msg", "骞垮憡灞曠ず瀹屾垚");
handler.complete(result);
+ }
+
+ @Override
+ public void onRewardArrived(boolean b, int i, Bundle bundle) {
+
}
@Override
@@ -863,9 +876,9 @@
ArrayList<Uri> uriList = new ArrayList<Uri>();
if (imageList != null)
- for (ShareImageEntity entity : imageList)
+ for (ShareImageEntity entity : imageList) {
uriList.add(Tools.getImageContentUri(mContext, new File(entity.getFilePath())));
-
+ }
if (platfrom == 1) {
ShareImageUtil.shareWXPictureByIntent(mContext, uriList);
} else if (platfrom == 2) {
diff --git a/app/src/main/java/com/tejia/lijin/app/util/web/WebViewUtil.java b/app/src/main/java/com/tejia/lijin/app/util/web/WebViewUtil.java
index e59b9ed..4f83a0d 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/web/WebViewUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/web/WebViewUtil.java
@@ -13,6 +13,8 @@
import com.tejia.lijin.app.util.Tools;
import com.tejia.lijin.app.util.clipboard.ClipboardUtil;
+import java.net.URLDecoder;
+
public class WebViewUtil {
public static Boolean interceptUrl(final Context context, String url) {
@@ -85,6 +87,15 @@
return true;
} else
return true;
+ } else if (url.startsWith("snssdk1128://")) {//鎶栭煶
+ try {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
+ } catch (Exception e) {
+
+ }
+ return true;
}
return true;
diff --git a/app/src/main/java/com/tejia/lijin/app/util/x5/X5WebViewEventHandler.java b/app/src/main/java/com/tejia/lijin/app/util/x5/X5WebViewEventHandler.java
index a77b80f..e2a519a 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/x5/X5WebViewEventHandler.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/x5/X5WebViewEventHandler.java
@@ -14,6 +14,7 @@
import com.tencent.smtt.export.external.extension.proxy.ProxyWebViewClientExtension;
import com.tencent.smtt.export.external.interfaces.IX5WebViewBase.HitTestResult;
import com.tencent.smtt.export.external.interfaces.JsResult;
+import com.tencent.smtt.export.external.interfaces.MediaAccessPermissionsCallback;
import com.tencent.smtt.sdk.WebViewCallbackClient;
import java.util.HashMap;
@@ -32,6 +33,11 @@
@Override
public void onColorModeChanged(long l) {
+ }
+
+ @Override
+ public boolean onPermissionRequest(String s, long l, MediaAccessPermissionsCallback mediaAccessPermissionsCallback) {
+ return false;
}
@Override
@@ -213,6 +219,11 @@
}
@Override
+ public void invalidate() {
+
+ }
+
+ @Override
public boolean dispatchTouchEvent(MotionEvent ev, View view) {
return webView.tbs_dispatchTouchEvent(ev, view);
}
diff --git a/app/src/main/res/drawable-xhdpi/ic_auth_notify_top.png b/app/src/main/res/drawable-xhdpi/ic_auth_notify_top.png
new file mode 100644
index 0000000..a3c242d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_auth_notify_top.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_auth_notify_phone.png b/app/src/main/res/drawable-xhdpi/icon_auth_notify_phone.png
new file mode 100644
index 0000000..04030cf
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_auth_notify_phone.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_auth_notify_storage.png b/app/src/main/res/drawable-xhdpi/icon_auth_notify_storage.png
new file mode 100644
index 0000000..0885847
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_auth_notify_storage.png
Binary files differ
diff --git a/app/src/main/res/drawable/shape_permission_notify_btn.xml b/app/src/main/res/drawable/shape_permission_notify_btn.xml
new file mode 100644
index 0000000..3d71542
--- /dev/null
+++ b/app/src/main/res/drawable/shape_permission_notify_btn.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <gradient
+ android:angle="180"
+ android:endColor="#FF227B"
+ android:startColor="#FF2A3E"
+ android:type="linear"
+ android:useLevel="true" />
+ <corners
+ android:radius="40dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_user_protocol_dialog_bg.xml b/app/src/main/res/drawable/shape_user_protocol_dialog_bg.xml
index 7fd475f..9e968b1 100644
--- a/app/src/main/res/drawable/shape_user_protocol_dialog_bg.xml
+++ b/app/src/main/res/drawable/shape_user_protocol_dialog_bg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="5dp" />
+ <corners android:radius="12dp" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 97d35d3..6b13929 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -119,6 +119,34 @@
</LinearLayout>
+
+ <LinearLayout
+ style="@style/myInfoItemStyle"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="12dp"
+ android:gravity="center_vertical"
+ android:text="鍏抽棴涓�у寲鎺ㄩ��"
+ android:textColor="@color/text_black_1"
+ android:textSize="14sp" />
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+
+ <CheckBox
+ android:id="@+id/cb_push"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="12dp"
+ android:button="@drawable/selector_msg_ischecked" />
+
+ </LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
diff --git a/app/src/main/res/layout/dialog_auth_notify.xml b/app/src/main/res/layout/dialog_auth_notify.xml
new file mode 100644
index 0000000..3d1038a
--- /dev/null
+++ b/app/src/main/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.wpc.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.wpc.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_permission_notify_btn"
+ android:gravity="center"
+ android:text="绔嬪嵆寮�鍚�"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_user_protocol.xml b/app/src/main/res/layout/dialog_user_protocol.xml
index cadb17a..a46e165 100644
--- a/app/src/main/res/layout/dialog_user_protocol.xml
+++ b/app/src/main/res/layout/dialog_user_protocol.xml
@@ -13,24 +13,30 @@
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"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="260dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
- android:layout_marginBottom="10dp"
- android:autoLink="all"
- android:background="@null"
- android:foreground="@null"
- android:lineSpacingExtra="8sp"
- android:textSize="10sp"></TextView>
+ android:layout_marginBottom="10dp">
+
+ <TextView
+ android:id="@+id/tv_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autoLink="all"
+ android:background="@null"
+ android:foreground="@null"
+ android:lineSpacingExtra="8sp"
+ android:textSize="14sp"></TextView>
+
+ </ScrollView>
+
<LinearLayout
android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 034315a..1348645 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,34 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
+
+ //瀛楄妭璺冲姩SDK
+ maven {
+ url "https://artifact.bytedance.com/repository/Volcengine/"
+ }
+ maven {
+ url "https://artifact.bytedance.com/repository/pangle/"
+ }
+ maven { url "https://artifact.bytedance.com/repository/AwemeOpenSDK" }
+
+ maven {url 'https://developer.huawei.com/repo/'}
maven { url "https://maven.aliyun.com/repository/public" }
+ maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url "https://maven.aliyun.com/repository/google" }
// google()
// jcenter()
// maven { url "https://maven.google.com" }
- maven { url "https://dl.bintray.com/thelasterstar/maven/" }
+ // maven { url "https://dl.bintray.com/thelasterstar/maven/" }
+ mavenCentral()
google()
- maven {url 'https://developer.huawei.com/repo/'}
+
+
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'//Added line
- classpath 'com.huawei.agconnect:agcp:1.4.2.300'
+ classpath 'com.huawei.agconnect:agcp:1.6.0.300'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -22,18 +36,26 @@
}
allprojects {
repositories {
+ mavenCentral()
+ //瀛楄妭璺冲姩SDK
+ maven {
+ url "https://artifact.bytedance.com/repository/Volcengine/"
+ }
+ maven {
+ url "https://artifact.bytedance.com/repository/pangle/"
+ }
+ maven { url "https://artifact.bytedance.com/repository/AwemeOpenSDK" }
+
+ maven {url 'https://developer.huawei.com/repo/'}
maven { url "https://maven.aliyun.com/repository/public" }
+ maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url "https://maven.aliyun.com/repository/google" }
-// maven { url "https://maven.google.com" }
- maven { url "https://dl.bintray.com/thelasterstar/maven/" }
+ //maven { url "https://dl.bintray.com/thelasterstar/maven/" }
//Bmob鐨刴aven浠撳簱鍦板潃锛屽繀椤诲～鍐�
// maven { url "https://raw.github.com/bmob/bmob-android-sdk/master" }
maven { url "https://jitpack.io" }
+
google()
-
- maven {url 'https://developer.huawei.com/repo/'}
-
-
}
}
task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 142a2d4..2a9c61a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 18 16:33:16 CST 2021
+#Mon Aug 08 12:04:48 CST 2022
distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/library-mine/src/com/wpc/library/DeviceUuidFactory.java b/library-mine/src/com/wpc/library/DeviceUuidFactory.java
index 5d7894b..d6371c4 100644
--- a/library-mine/src/com/wpc/library/DeviceUuidFactory.java
+++ b/library-mine/src/com/wpc/library/DeviceUuidFactory.java
@@ -10,6 +10,8 @@
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;
+import com.wpc.library.util.common.DeviceUtil;
+
public class DeviceUuidFactory {
protected static final String PREFS_FILE = "device_id.xml";
@@ -43,7 +45,7 @@
String deviceId="";
if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
|| ContextCompat.checkSelfPermission(context, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
- deviceId = tm.getDeviceId();// 鑾峰彇deviceId
+ deviceId = DeviceUtil.getImeiCache(context);
}
uuid = deviceId != null ? UUID.nameUUIDFromBytes(deviceId.getBytes("utf8")) : UUID.randomUUID();
}
diff --git a/library-mine/src/com/wpc/library/util/MarketUtils.java b/library-mine/src/com/wpc/library/util/MarketUtils.java
index d780f61..83ac9b6 100644
--- a/library-mine/src/com/wpc/library/util/MarketUtils.java
+++ b/library-mine/src/com/wpc/library/util/MarketUtils.java
@@ -17,6 +17,8 @@
import android.text.TextUtils;
import android.util.Log;
+import com.wpc.library.util.common.DeviceUtil;
+
import java.util.ArrayList;
import java.util.List;
@@ -70,8 +72,7 @@
List<ApplicationInfo> infos = new ArrayList<>();
if (context == null || MarketPackages == null || MarketPackages.size() == 0)
return infos;
- PackageManager pm = context.getPackageManager();
- List<PackageInfo> installedPkgs = pm.getInstalledPackages(0);
+ List<PackageInfo> installedPkgs = DeviceUtil.getInstalledPackagesCache(context);
int li = installedPkgs.size();
int lj = MarketPackages.size();
for (int j = 0; j < lj; j++) {
@@ -146,8 +147,7 @@
ArrayList<String> empty = new ArrayList<String>();
if (context == null || pkgs == null || pkgs.size() == 0)
return empty;
- PackageManager pm = context.getPackageManager();
- List<PackageInfo> installedPkgs = pm.getInstalledPackages(0);
+ List<PackageInfo> installedPkgs = DeviceUtil.getInstalledPackagesCache(context);
int li = installedPkgs.size();
int lj = pkgs.size();
for (int j = 0; j < lj; j++) {
diff --git a/library-mine/src/com/wpc/library/util/MobileUtil.java b/library-mine/src/com/wpc/library/util/MobileUtil.java
index 70b80d8..4fc56a0 100644
--- a/library-mine/src/com/wpc/library/util/MobileUtil.java
+++ b/library-mine/src/com/wpc/library/util/MobileUtil.java
@@ -5,6 +5,7 @@
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;
+import com.wpc.library.util.common.DeviceUtil;
import com.wpc.library.util.common.StringUtils;
import java.io.File;
@@ -86,7 +87,7 @@
String deviceId="";
if (ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
|| ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
- deviceId = tm.getDeviceId();// 鑾峰彇deviceId
+ deviceId = DeviceUtil.getImeiCache(ctx);
}
return deviceId;
}
diff --git a/library-mine/src/com/wpc/library/util/SystemCommon.java b/library-mine/src/com/wpc/library/util/SystemCommon.java
index 2dd89fd..6dcf194 100644
--- a/library-mine/src/com/wpc/library/util/SystemCommon.java
+++ b/library-mine/src/com/wpc/library/util/SystemCommon.java
@@ -7,6 +7,8 @@
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
+import com.wpc.library.util.common.DeviceUtil;
+
public class SystemCommon {
/**
@@ -21,7 +23,7 @@
String deviceId="";
if (ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
|| ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
- deviceId = tm.getDeviceId();// 鑾峰彇deviceId
+ deviceId = DeviceUtil.getImeiCache(ctx);
}
return deviceId;
}
diff --git a/library-mine/src/com/wpc/library/util/common/DeviceUtil.java b/library-mine/src/com/wpc/library/util/common/DeviceUtil.java
new file mode 100644
index 0000000..53d937b
--- /dev/null
+++ b/library-mine/src/com/wpc/library/util/common/DeviceUtil.java
@@ -0,0 +1,94 @@
+package com.wpc.library.util.common;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.core.app.ActivityCompat;
+
+import static android.content.Context.TELEPHONY_SERVICE;
+
+public class DeviceUtil {
+
+ private static List<PackageInfo> installedPackages;
+ private static String imei;
+ private static String android_id;
+ private static String imsi;
+
+ public static synchronized List<PackageInfo> getInstalledPackagesCache(Context context) {
+ if (installedPackages != null) {
+ return installedPackages;
+ }
+ PackageManager pManager = context.getPackageManager();
+ //鑾峰彇鎵嬫満鍐呮墍鏈夊簲鐢�
+ installedPackages = pManager.getInstalledPackages(0);
+ return installedPackages;
+ }
+
+
+ public static synchronized List<String> getInstalledPackageNamesCache(Context context) {
+ List<PackageInfo> list = getInstalledPackagesCache(context);
+ List<String> nameList = new ArrayList<>();
+ for (PackageInfo pi : list) {
+ nameList.add(pi.packageName);
+ }
+ return nameList;
+ }
+
+ public static synchronized String getImeiCache(Context context) {
+ if (imei != null) {
+ return imei;
+ }
+
+ TelephonyManager manager = (TelephonyManager) context.getSystemService(TELEPHONY_SERVICE);
+ try {
+ if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+ return "";
+ }
+ imei = manager.getDeviceId();
+ } catch (Exception e) {
+
+ }
+ imei = imei == null ? "" : imei;
+ return imei;
+ }
+
+ public static synchronized String getAndroidIdCache(Context context) {
+ if (android_id != null) {
+ return android_id;
+ }
+ try {
+ android_id = Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+ } catch (Exception e) {
+
+ }
+ android_id = android_id == null ? "" : android_id;
+ return android_id;
+ }
+
+
+ public static synchronized String getImsiCache(Context context) {
+ if (imsi != null) {
+ return imsi;
+ }
+ TelephonyManager mTelephonyMgr = (TelephonyManager) context
+ .getSystemService(Context.TELEPHONY_SERVICE);
+ try {
+ if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+ return "";
+ }
+ imsi = mTelephonyMgr.getSubscriberId();
+ }catch(Exception e){
+
+ }
+ imsi = imsi == null ? "" : imsi;
+ return imsi;
+ }
+
+}
diff --git a/library-push/build.gradle b/library-push/build.gradle
index 5b76732..50513ce 100644
--- a/library-push/build.gradle
+++ b/library-push/build.gradle
@@ -1,5 +1,4 @@
-apply plugin: 'com.android.library'
-
+apply plugin: 'android-library'
android {
compileSdkVersion 29
buildToolsVersion "29.0.0"
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 e4aa698..4c3daf9 100644
--- a/library-push/src/main/java/com/yeshi/push/PushUtil.java
+++ b/library-push/src/main/java/com/yeshi/push/PushUtil.java
@@ -7,8 +7,11 @@
import com.heytap.msp.push.HeytapPushManager;
import com.heytap.msp.push.callback.ICallBackResultService;
+import com.huawei.hmf.tasks.OnCompleteListener;
+import com.huawei.hmf.tasks.Task;
import com.huawei.hms.aaid.HmsInstanceId;
import com.huawei.hms.common.ApiException;
+import com.huawei.hms.push.HmsMessaging;
import com.meizu.cloud.pushsdk.PushManager;
import com.vivo.push.IPushActionListener;
import com.vivo.push.PushClient;
@@ -52,6 +55,18 @@
}
}.start();
+ HmsMessaging.getInstance(context).turnOnPush().addOnCompleteListener(new OnCompleteListener<Void>() {
+ @Override
+ public void onComplete(Task<Void> task) {
+ // 鑾峰彇缁撴灉
+ if (task.isSuccessful()) {
+ Log.i(TAG, "turnOnPush Complete");
+ } else {
+ Log.e(TAG, "turnOnPush failed: ret=" + task.getException().getMessage());
+ }
+ }
+ });
+
return;
case "oppo"://涓婇潰瀹樻柟鍒ゆ柇
/***OPPO瀹樻柟鍒ゆ柇鏂规硶*/
diff --git a/social_sdk_library_project/build.gradle b/social_sdk_library_project/build.gradle
index 02138bf..e7c1678 100644
--- a/social_sdk_library_project/build.gradle
+++ b/social_sdk_library_project/build.gradle
@@ -1,16 +1,22 @@
apply plugin: 'android-library'
dependencies {
- api fileTree(include: '*.jar', dir: 'libs')
- api files('libs/umeng-share-QQ-full-6.9.6.jar')
- api files('libs/umeng-share-core-6.9.6.jar')
- api files('libs/umeng-share-sina-full-6.9.6.jar')
- api files('libs/umeng-share-wechat-simplify-6.9.6.jar')
- api files('libs/umeng-shareboard-widget-6.9.6.jar')
- api files('libs/umeng-sharetool-6.9.6.jar')
- // api files('libs/SocialSDK_sms.jar')
+ api fileTree(include: '*.jar', dir: 'libs')
+ api files('libs/umeng-common-9.4.4.jar')
+
+// api files('libs/umeng-asms-armeabi-v1.4.1.aar')
+// api files('libs/umeng-apm-armeabi-v1.5.2.aar')
+ implementation(name:'umeng-asms-armeabi-v1.4.1', ext:'aar')
+ implementation(name:'umeng-apm-armeabi-v1.5.2', ext:'aar')
+ api files('libs/umeng-share-QQ-full-7.1.6.jar')
+ api files('libs/umeng-share-core-7.1.6.jar')
+ api files('libs/umeng-share-sina-full-7.1.6.jar')
+ api files('libs/umeng-share-wechat-full-7.1.6.jar')
+ api files('libs/umeng-shareboard-widget-7.1.6.jar')
+ api files('libs/umeng-sharetool-7.1.6.jar')
api files('libs/open_sdk_r5990_lite.jar')
provided files('libs/core-4.3.1-openDefaultRelease.aar')
+
}
android {
@@ -20,24 +26,10 @@
minSdkVersion 17
targetSdkVersion 26
}
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- resources.srcDirs = ['src']
- aidl.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- res.srcDirs = ['res']
- assets.srcDirs = ['assets']
- }
- // Move the build types to build-types/<type>
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src/<type>/... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
+ repositories {
+ flatDir {
+ dirs 'libs'
+ }
}
}
diff --git a/social_sdk_library_project/libs/umeng-apm-armeabi-v1.5.2.aar b/social_sdk_library_project/libs/umeng-apm-armeabi-v1.5.2.aar
new file mode 100644
index 0000000..e020303
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-apm-armeabi-v1.5.2.aar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-asms-armeabi-v1.4.1.aar b/social_sdk_library_project/libs/umeng-asms-armeabi-v1.4.1.aar
new file mode 100644
index 0000000..80575b5
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-asms-armeabi-v1.4.1.aar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-common-9.4.4.jar b/social_sdk_library_project/libs/umeng-common-9.4.4.jar
new file mode 100644
index 0000000..efa3bd3
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-common-9.4.4.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-QQ-full-6.9.6.jar b/social_sdk_library_project/libs/umeng-share-QQ-full-6.9.6.jar
deleted file mode 100644
index 1cc204f..0000000
--- a/social_sdk_library_project/libs/umeng-share-QQ-full-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-QQ-full-7.1.6.jar b/social_sdk_library_project/libs/umeng-share-QQ-full-7.1.6.jar
new file mode 100644
index 0000000..22f9d5b
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-share-QQ-full-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-core-6.9.6.jar b/social_sdk_library_project/libs/umeng-share-core-6.9.6.jar
deleted file mode 100644
index c7a079f..0000000
--- a/social_sdk_library_project/libs/umeng-share-core-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-core-7.1.6.jar b/social_sdk_library_project/libs/umeng-share-core-7.1.6.jar
new file mode 100644
index 0000000..09e3ba3
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-share-core-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-sina-full-6.9.6.jar b/social_sdk_library_project/libs/umeng-share-sina-full-6.9.6.jar
deleted file mode 100644
index 38cd5f2..0000000
--- a/social_sdk_library_project/libs/umeng-share-sina-full-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-sina-full-7.1.6.jar b/social_sdk_library_project/libs/umeng-share-sina-full-7.1.6.jar
new file mode 100644
index 0000000..7d238f9
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-share-sina-full-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-wechat-full-7.1.6.jar b/social_sdk_library_project/libs/umeng-share-wechat-full-7.1.6.jar
new file mode 100644
index 0000000..bfd6564
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-share-wechat-full-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-share-wechat-simplify-6.9.6.jar b/social_sdk_library_project/libs/umeng-share-wechat-simplify-6.9.6.jar
deleted file mode 100644
index ce96e97..0000000
--- a/social_sdk_library_project/libs/umeng-share-wechat-simplify-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-shareboard-widget-6.9.6.jar b/social_sdk_library_project/libs/umeng-shareboard-widget-6.9.6.jar
deleted file mode 100644
index 99cb348..0000000
--- a/social_sdk_library_project/libs/umeng-shareboard-widget-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-shareboard-widget-7.1.6.jar b/social_sdk_library_project/libs/umeng-shareboard-widget-7.1.6.jar
new file mode 100644
index 0000000..d5c9d77
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-shareboard-widget-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-sharetool-6.9.6.jar b/social_sdk_library_project/libs/umeng-sharetool-6.9.6.jar
deleted file mode 100644
index b3907eb..0000000
--- a/social_sdk_library_project/libs/umeng-sharetool-6.9.6.jar
+++ /dev/null
Binary files differ
diff --git a/social_sdk_library_project/libs/umeng-sharetool-7.1.6.jar b/social_sdk_library_project/libs/umeng-sharetool-7.1.6.jar
new file mode 100644
index 0000000..3df03e4
--- /dev/null
+++ b/social_sdk_library_project/libs/umeng-sharetool-7.1.6.jar
Binary files differ
diff --git a/social_sdk_library_project/AndroidManifest.xml b/social_sdk_library_project/src/main/AndroidManifest.xml
similarity index 100%
rename from social_sdk_library_project/AndroidManifest.xml
rename to social_sdk_library_project/src/main/AndroidManifest.xml
--
Gitblit v1.8.0