diff --git a/.gitignore b/.gitignore index 502c314..e307fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,11 @@ *.iml .gradle -/local.properties +local.properties .DS_Store -/build -/captures +build +captures .externalNativeBuild .idea -.gradle/ -.idea/ -.git/ -.DS_Store -gradlew.bat -import-summary.txt -local.properties +.git *.iml -build/ -captures/ -config.xml diff --git a/README.md b/README.md index fe64e05..a865fe2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ### 【友盟+】统计、推送、分享三合一组件化SDK集成Demo +重要更新：增加用户授权隐私协议友盟sdk初始化逻辑，具体请查看SplashTestActivity + 本项目仅提供离线包依赖方式集成示例。 如果您是采用maven库在线依赖相关友盟SDK，请参考[如下Demo工程](https://github.com/umeng/MultiFunctionAndroidMavenDemo-master)。 diff --git a/UMLibrary/.gitignore b/UMLibrary/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/UMLibrary/.gitignore @@ -0,0 +1 @@ +/build diff --git a/UMLibrary/AndroidManifest.xml b/UMLibrary/AndroidManifest.xml deleted file mode 100644 index b727b54..0000000 --- a/UMLibrary/AndroidManifest.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UMLibrary/build.gradle b/UMLibrary/build.gradle index 47b7408..b9d48f5 100644 --- a/UMLibrary/build.gradle +++ b/UMLibrary/build.gradle @@ -1,34 +1,55 @@ apply plugin: 'com.android.library' +ArrayList getShareDir(String name) { + ArrayList tmp = new ArrayList() + File[] files = (new File(rootDir, "share")).listFiles() + if (files != null) { + tmp.addAll(files) + } + ArrayList dirs = new ArrayList() + while (tmp.size() > 0) { + File file = tmp.remove(0) + if (file.isDirectory() && name == file.getName()) { + dirs.add(file.getPath()) + } else if (file.isDirectory()) { + files = file.listFiles() + if (files != null) { + tmp.addAll(files) + } + } + } + return dirs +} + android { - compileSdkVersion 30 + compileSdkVersion 34 defaultConfig { minSdkVersion 14 targetSdkVersion 30 + + sourceSets { + main { + ArrayList resSrcList = getShareDir("res") + resSrcList.add("src/main/res") + res.srcDirs = resSrcList + } + } } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - } - } } dependencies { - api fileTree(dir: 'libs', include: ['*.jar']) + api fileTree(dir: 'libs', include: ['*.jar', '*.aar']) + ArrayList share = getShareDir("libs") + for (String item : share) { + api fileTree(dir: "${item}", include: ['*.jar', '*.aar']) + } } diff --git a/UMLibrary/libs/SecurityEnvSDK-release-1.1.0.jar b/UMLibrary/libs/SecurityEnvSDK-release-1.1.0.jar deleted file mode 100644 index 2b80819..0000000 Binary files a/UMLibrary/libs/SecurityEnvSDK-release-1.1.0.jar and /dev/null differ diff --git a/UMLibrary/libs/SocialSDK_laiwang_1.jar b/UMLibrary/libs/SocialSDK_laiwang_1.jar deleted file mode 100644 index 0de8d25..0000000 Binary files a/UMLibrary/libs/SocialSDK_laiwang_1.jar and /dev/null differ diff --git a/UMLibrary/libs/agoo-accs-3.4.2.7.jar b/UMLibrary/libs/agoo-accs-3.4.2.7.jar deleted file mode 100644 index 72bc96e..0000000 Binary files a/UMLibrary/libs/agoo-accs-3.4.2.7.jar and /dev/null differ diff --git a/UMLibrary/libs/agoo_aranger-1.0.6.jar b/UMLibrary/libs/agoo_aranger-1.0.6.jar deleted file mode 100644 index 161dd58..0000000 Binary files a/UMLibrary/libs/agoo_aranger-1.0.6.jar and /dev/null differ diff --git a/UMLibrary/libs/agoo_networksdk-3.5.8.jar b/UMLibrary/libs/agoo_networksdk-3.5.8.jar deleted file mode 100644 index 439b643..0000000 Binary files a/UMLibrary/libs/agoo_networksdk-3.5.8.jar and /dev/null differ diff --git a/UMLibrary/libs/agoo_tnet4android-3.1.14.10.jar b/UMLibrary/libs/agoo_tnet4android-3.1.14.10.jar deleted file mode 100644 index 08fdc34..0000000 Binary files a/UMLibrary/libs/agoo_tnet4android-3.1.14.10.jar and /dev/null differ diff --git a/UMLibrary/libs/alicloud-utils-2.0.0.jar b/UMLibrary/libs/alicloud-utils-2.0.0.jar deleted file mode 100644 index 176183a..0000000 Binary files a/UMLibrary/libs/alicloud-utils-2.0.0.jar and /dev/null differ diff --git a/UMLibrary/libs/android-support-v4.jar b/UMLibrary/libs/android-support-v4.jar deleted file mode 100755 index 2ff47f4..0000000 Binary files a/UMLibrary/libs/android-support-v4.jar and /dev/null differ diff --git a/UMLibrary/libs/arm64-v8a/libcocklogic-1.1.3.so b/UMLibrary/libs/arm64-v8a/libcocklogic-1.1.3.so deleted file mode 100755 index 2f58430..0000000 Binary files a/UMLibrary/libs/arm64-v8a/libcocklogic-1.1.3.so and /dev/null differ diff --git a/UMLibrary/libs/arm64-v8a/libtnet-3.1.14.so b/UMLibrary/libs/arm64-v8a/libtnet-3.1.14.so deleted file mode 100644 index 1ce75ae..0000000 Binary files a/UMLibrary/libs/arm64-v8a/libtnet-3.1.14.so and /dev/null differ diff --git a/UMLibrary/libs/armeabi-v7a/libcocklogic-1.1.3.so b/UMLibrary/libs/armeabi-v7a/libcocklogic-1.1.3.so deleted file mode 100755 index 8b22f71..0000000 Binary files a/UMLibrary/libs/armeabi-v7a/libcocklogic-1.1.3.so and /dev/null differ diff --git a/UMLibrary/libs/armeabi-v7a/libtnet-3.1.14.so b/UMLibrary/libs/armeabi-v7a/libtnet-3.1.14.so deleted file mode 100644 index 73044aa..0000000 Binary files a/UMLibrary/libs/armeabi-v7a/libtnet-3.1.14.so and /dev/null differ diff --git a/UMLibrary/libs/armeabi/libcocklogic-1.1.3.so b/UMLibrary/libs/armeabi/libcocklogic-1.1.3.so deleted file mode 100755 index 0f5fdf7..0000000 Binary files a/UMLibrary/libs/armeabi/libcocklogic-1.1.3.so and /dev/null differ diff --git a/UMLibrary/libs/armeabi/libtnet-3.1.14.so b/UMLibrary/libs/armeabi/libtnet-3.1.14.so deleted file mode 100644 index bb1824e..0000000 Binary files a/UMLibrary/libs/armeabi/libtnet-3.1.14.so and /dev/null differ diff --git a/UMLibrary/libs/libddshare.jar b/UMLibrary/libs/libddshare.jar deleted file mode 100644 index 55481af..0000000 Binary files a/UMLibrary/libs/libddshare.jar and /dev/null differ diff --git a/UMLibrary/libs/libwwsdk.jar b/UMLibrary/libs/libwwsdk.jar deleted file mode 100644 index 7380272..0000000 Binary files a/UMLibrary/libs/libwwsdk.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-agoo-accs-3.4.2.7.12.jar b/UMLibrary/libs/umeng-agoo-accs-3.4.2.7.12.jar new file mode 100644 index 0000000..eb75695 Binary files /dev/null and b/UMLibrary/libs/umeng-agoo-accs-3.4.2.7.12.jar differ diff --git a/UMLibrary/libs/umeng-agoo_networksdk-3.5.8.10.jar b/UMLibrary/libs/umeng-agoo_networksdk-3.5.8.10.jar new file mode 100644 index 0000000..fc345bd Binary files /dev/null and b/UMLibrary/libs/umeng-agoo_networksdk-3.5.8.10.jar differ diff --git a/UMLibrary/libs/umeng-agoo_tnet4android-3.1.14.10.2.aar b/UMLibrary/libs/umeng-agoo_tnet4android-3.1.14.10.2.aar new file mode 100644 index 0000000..8b56f70 Binary files /dev/null and b/UMLibrary/libs/umeng-agoo_tnet4android-3.1.14.10.2.aar differ diff --git a/UMLibrary/libs/alicloud-httpdns-1.3.2.3.jar b/UMLibrary/libs/umeng-alicloud-httpdns-1.3.2.3.1.jar similarity index 59% rename from UMLibrary/libs/alicloud-httpdns-1.3.2.3.jar rename to UMLibrary/libs/umeng-alicloud-httpdns-1.3.2.3.1.jar index e2fe5b9..0d00aa3 100644 Binary files a/UMLibrary/libs/alicloud-httpdns-1.3.2.3.jar and b/UMLibrary/libs/umeng-alicloud-httpdns-1.3.2.3.1.jar differ diff --git a/UMLibrary/libs/umeng-alicloud-utils-2.0.0.1.jar b/UMLibrary/libs/umeng-alicloud-utils-2.0.0.1.jar new file mode 100644 index 0000000..4128736 Binary files /dev/null and b/UMLibrary/libs/umeng-alicloud-utils-2.0.0.1.jar differ diff --git a/UMLibrary/libs/alicloud_beacon-1.0.5.jar b/UMLibrary/libs/umeng-alicloud_beacon-1.0.5.jar similarity index 100% rename from UMLibrary/libs/alicloud_beacon-1.0.5.jar rename to UMLibrary/libs/umeng-alicloud_beacon-1.0.5.jar diff --git a/UMLibrary/libs/umeng-common-9.3.8.jar b/UMLibrary/libs/umeng-common-9.3.8.jar deleted file mode 100644 index 31f3244..0000000 Binary files a/UMLibrary/libs/umeng-common-9.3.8.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-common-9.8.8.aar b/UMLibrary/libs/umeng-common-9.8.8.aar new file mode 100644 index 0000000..7f372b5 Binary files /dev/null and b/UMLibrary/libs/umeng-common-9.8.8.aar differ diff --git a/UMLibrary/libs/umeng-push-6.3.3.jar b/UMLibrary/libs/umeng-push-6.3.3.jar deleted file mode 100644 index 9c9d329..0000000 Binary files a/UMLibrary/libs/umeng-push-6.3.3.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-push-6.7.2.aar b/UMLibrary/libs/umeng-push-6.7.2.aar new file mode 100644 index 0000000..4916965 Binary files /dev/null and b/UMLibrary/libs/umeng-push-6.7.2.aar differ diff --git a/UMLibrary/libs/umeng-share-Ding-7.1.4.jar b/UMLibrary/libs/umeng-share-Ding-7.1.4.jar deleted file mode 100644 index f6b82b2..0000000 Binary files a/UMLibrary/libs/umeng-share-Ding-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-QQ-full-7.1.4.jar b/UMLibrary/libs/umeng-share-QQ-full-7.1.4.jar deleted file mode 100644 index 7f52825..0000000 Binary files a/UMLibrary/libs/umeng-share-QQ-full-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-alipay-7.1.4.jar b/UMLibrary/libs/umeng-share-alipay-7.1.4.jar deleted file mode 100644 index 6406a7a..0000000 Binary files a/UMLibrary/libs/umeng-share-alipay-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-core-7.1.4.jar b/UMLibrary/libs/umeng-share-core-7.1.4.jar deleted file mode 100644 index f007e6e..0000000 Binary files a/UMLibrary/libs/umeng-share-core-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-douban-7.1.4.jar b/UMLibrary/libs/umeng-share-douban-7.1.4.jar deleted file mode 100644 index 240866d..0000000 Binary files a/UMLibrary/libs/umeng-share-douban-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-dropbox-7.1.4.jar b/UMLibrary/libs/umeng-share-dropbox-7.1.4.jar deleted file mode 100644 index b448a17..0000000 Binary files a/UMLibrary/libs/umeng-share-dropbox-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-email-7.1.4.jar b/UMLibrary/libs/umeng-share-email-7.1.4.jar deleted file mode 100644 index d1e3bd8..0000000 Binary files a/UMLibrary/libs/umeng-share-email-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-evernote-7.1.4.jar b/UMLibrary/libs/umeng-share-evernote-7.1.4.jar deleted file mode 100644 index 214c1bf..0000000 Binary files a/UMLibrary/libs/umeng-share-evernote-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-facebook-7.1.4.jar b/UMLibrary/libs/umeng-share-facebook-7.1.4.jar deleted file mode 100644 index cd9ed55..0000000 Binary files a/UMLibrary/libs/umeng-share-facebook-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-flickr-7.1.4.jar b/UMLibrary/libs/umeng-share-flickr-7.1.4.jar deleted file mode 100644 index b85b3ee..0000000 Binary files a/UMLibrary/libs/umeng-share-flickr-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-foursquare-7.1.4.jar b/UMLibrary/libs/umeng-share-foursquare-7.1.4.jar deleted file mode 100644 index 42ff213..0000000 Binary files a/UMLibrary/libs/umeng-share-foursquare-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-gplus-7.1.4.jar b/UMLibrary/libs/umeng-share-gplus-7.1.4.jar deleted file mode 100644 index 1ff7cba..0000000 Binary files a/UMLibrary/libs/umeng-share-gplus-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-instagram-7.1.4.jar b/UMLibrary/libs/umeng-share-instagram-7.1.4.jar deleted file mode 100644 index cf7ff22..0000000 Binary files a/UMLibrary/libs/umeng-share-instagram-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-kakao-7.1.4.jar b/UMLibrary/libs/umeng-share-kakao-7.1.4.jar deleted file mode 100644 index dc0ad4d..0000000 Binary files a/UMLibrary/libs/umeng-share-kakao-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-laiwang-7.1.4.jar b/UMLibrary/libs/umeng-share-laiwang-7.1.4.jar deleted file mode 100644 index eb5b596..0000000 Binary files a/UMLibrary/libs/umeng-share-laiwang-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-line-7.1.4.jar b/UMLibrary/libs/umeng-share-line-7.1.4.jar deleted file mode 100644 index c442092..0000000 Binary files a/UMLibrary/libs/umeng-share-line-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-linkedin-7.1.4.jar b/UMLibrary/libs/umeng-share-linkedin-7.1.4.jar deleted file mode 100644 index 8a53c30..0000000 Binary files a/UMLibrary/libs/umeng-share-linkedin-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-pinterest-7.1.4.jar b/UMLibrary/libs/umeng-share-pinterest-7.1.4.jar deleted file mode 100644 index c2ceda5..0000000 Binary files a/UMLibrary/libs/umeng-share-pinterest-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-pocket-7.1.4.jar b/UMLibrary/libs/umeng-share-pocket-7.1.4.jar deleted file mode 100644 index f22580b..0000000 Binary files a/UMLibrary/libs/umeng-share-pocket-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-renren-7.1.4.jar b/UMLibrary/libs/umeng-share-renren-7.1.4.jar deleted file mode 100644 index 9ec249f..0000000 Binary files a/UMLibrary/libs/umeng-share-renren-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-sina-full-7.1.4.jar b/UMLibrary/libs/umeng-share-sina-full-7.1.4.jar deleted file mode 100644 index bd458c6..0000000 Binary files a/UMLibrary/libs/umeng-share-sina-full-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-sms-7.1.4.jar b/UMLibrary/libs/umeng-share-sms-7.1.4.jar deleted file mode 100644 index c0d6c5b..0000000 Binary files a/UMLibrary/libs/umeng-share-sms-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-tencentWB-7.1.4.jar b/UMLibrary/libs/umeng-share-tencentWB-7.1.4.jar deleted file mode 100644 index e62ada2..0000000 Binary files a/UMLibrary/libs/umeng-share-tencentWB-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-tumblr-7.1.4.jar b/UMLibrary/libs/umeng-share-tumblr-7.1.4.jar deleted file mode 100644 index e3678b4..0000000 Binary files a/UMLibrary/libs/umeng-share-tumblr-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-twitter-7.1.4.jar b/UMLibrary/libs/umeng-share-twitter-7.1.4.jar deleted file mode 100644 index 50d634e..0000000 Binary files a/UMLibrary/libs/umeng-share-twitter-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-vkontakte-7.1.4.jar b/UMLibrary/libs/umeng-share-vkontakte-7.1.4.jar deleted file mode 100644 index 2ee9568..0000000 Binary files a/UMLibrary/libs/umeng-share-vkontakte-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-wechat-full-7.1.4.jar b/UMLibrary/libs/umeng-share-wechat-full-7.1.4.jar deleted file mode 100644 index d64d699..0000000 Binary files a/UMLibrary/libs/umeng-share-wechat-full-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-whatsapp-7.1.4.jar b/UMLibrary/libs/umeng-share-whatsapp-7.1.4.jar deleted file mode 100644 index d712162..0000000 Binary files a/UMLibrary/libs/umeng-share-whatsapp-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-wxwork-7.1.4.jar b/UMLibrary/libs/umeng-share-wxwork-7.1.4.jar deleted file mode 100644 index a4367c7..0000000 Binary files a/UMLibrary/libs/umeng-share-wxwork-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-yinxin-7.1.4.jar b/UMLibrary/libs/umeng-share-yinxin-7.1.4.jar deleted file mode 100644 index bcab8c3..0000000 Binary files a/UMLibrary/libs/umeng-share-yinxin-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-share-ynote-7.1.4.jar b/UMLibrary/libs/umeng-share-ynote-7.1.4.jar deleted file mode 100644 index f7a9545..0000000 Binary files a/UMLibrary/libs/umeng-share-ynote-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-shareboard-widget-7.1.4.jar b/UMLibrary/libs/umeng-shareboard-widget-7.1.4.jar deleted file mode 100644 index 23f7a0f..0000000 Binary files a/UMLibrary/libs/umeng-shareboard-widget-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-sharetool-7.1.4.jar b/UMLibrary/libs/umeng-sharetool-7.1.4.jar deleted file mode 100644 index f5e8c25..0000000 Binary files a/UMLibrary/libs/umeng-sharetool-7.1.4.jar and /dev/null differ diff --git a/UMLibrary/libs/umeng-umdid-1.1.0.jar b/UMLibrary/libs/umeng-umdid-1.1.0.jar new file mode 100644 index 0000000..e7c32a0 Binary files /dev/null and b/UMLibrary/libs/umeng-umdid-1.1.0.jar differ diff --git a/UMLibrary/libs/utdid-1.5.2.1.jar b/UMLibrary/libs/utdid-1.5.2.1.jar deleted file mode 100644 index 3360670..0000000 Binary files a/UMLibrary/libs/utdid-1.5.2.1.jar and /dev/null differ diff --git a/UMLibrary/libs/uyumao-1.1.4.aar b/UMLibrary/libs/uyumao-1.1.4.aar new file mode 100644 index 0000000..8b4f6cb Binary files /dev/null and b/UMLibrary/libs/uyumao-1.1.4.aar differ diff --git a/UMLibrary/libs/x86/libcocklogic-1.1.3.so b/UMLibrary/libs/x86/libcocklogic-1.1.3.so deleted file mode 100755 index 4800df9..0000000 Binary files a/UMLibrary/libs/x86/libcocklogic-1.1.3.so and /dev/null differ diff --git a/UMLibrary/libs/x86/libtnet-3.1.14.so b/UMLibrary/libs/x86/libtnet-3.1.14.so deleted file mode 100644 index 4da3eea..0000000 Binary files a/UMLibrary/libs/x86/libtnet-3.1.14.so and /dev/null differ diff --git a/UMLibrary/res/drawable/umeng_socialize_google.png b/UMLibrary/res/drawable/umeng_socialize_google.png deleted file mode 100644 index cf960b6..0000000 Binary files a/UMLibrary/res/drawable/umeng_socialize_google.png and /dev/null differ diff --git a/UMLibrary/res/drawable/umeng_socialize_laiwang.png b/UMLibrary/res/drawable/umeng_socialize_laiwang.png deleted file mode 100644 index 04d245e..0000000 Binary files a/UMLibrary/res/drawable/umeng_socialize_laiwang.png and /dev/null differ diff --git a/UMLibrary/res/drawable/umeng_socialize_laiwang_dynamic.png b/UMLibrary/res/drawable/umeng_socialize_laiwang_dynamic.png deleted file mode 100644 index f95a2e7..0000000 Binary files a/UMLibrary/res/drawable/umeng_socialize_laiwang_dynamic.png and /dev/null differ diff --git a/UMLibrary/res/drawable/umeng_socialize_renren.png b/UMLibrary/res/drawable/umeng_socialize_renren.png deleted file mode 100644 index 41aa69a..0000000 Binary files a/UMLibrary/res/drawable/umeng_socialize_renren.png and /dev/null differ diff --git a/UMLibrary/res/values/string.xml b/UMLibrary/res/values/string.xml deleted file mode 100644 index 045e125..0000000 --- a/UMLibrary/res/values/string.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/UMLibrary/res/values/umeng_socialize_style.xml b/UMLibrary/res/values/umeng_socialize_style.xml deleted file mode 100644 index ab0f01f..0000000 --- a/UMLibrary/res/values/umeng_socialize_style.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UMLibrary/src/main/AndroidManifest.xml b/UMLibrary/src/main/AndroidManifest.xml new file mode 100644 index 0000000..326b75d --- /dev/null +++ b/UMLibrary/src/main/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UMLibrary/assets/geo_global_ca.cer b/UMLibrary/src/main/assets/geo_global_ca.cer similarity index 100% rename from UMLibrary/assets/geo_global_ca.cer rename to UMLibrary/src/main/assets/geo_global_ca.cer diff --git a/UMLibrary/res/drawable/umeng_socialize_back_icon.png b/UMLibrary/src/main/res/drawable/umeng_socialize_back_icon.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_back_icon.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_back_icon.png diff --git a/UMLibrary/res/drawable/umeng_socialize_btn_bg.xml b/UMLibrary/src/main/res/drawable/umeng_socialize_btn_bg.xml similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_btn_bg.xml rename to UMLibrary/src/main/res/drawable/umeng_socialize_btn_bg.xml diff --git a/UMLibrary/res/drawable/umeng_socialize_copy.png b/UMLibrary/src/main/res/drawable/umeng_socialize_copy.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_copy.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_copy.png diff --git a/UMLibrary/res/drawable/umeng_socialize_copyurl.png b/UMLibrary/src/main/res/drawable/umeng_socialize_copyurl.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_copyurl.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_copyurl.png diff --git a/UMLibrary/res/drawable/umeng_socialize_delete.png b/UMLibrary/src/main/res/drawable/umeng_socialize_delete.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_delete.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_delete.png diff --git a/UMLibrary/res/drawable/umeng_socialize_edit_bg.xml b/UMLibrary/src/main/res/drawable/umeng_socialize_edit_bg.xml similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_edit_bg.xml rename to UMLibrary/src/main/res/drawable/umeng_socialize_edit_bg.xml diff --git a/UMLibrary/res/drawable/umeng_socialize_menu_default.png b/UMLibrary/src/main/res/drawable/umeng_socialize_menu_default.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_menu_default.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_menu_default.png diff --git a/UMLibrary/res/drawable/umeng_socialize_more.png b/UMLibrary/src/main/res/drawable/umeng_socialize_more.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_more.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_more.png diff --git a/UMLibrary/res/drawable/umeng_socialize_share_music.png b/UMLibrary/src/main/res/drawable/umeng_socialize_share_music.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_share_music.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_share_music.png diff --git a/UMLibrary/res/drawable/umeng_socialize_share_video.png b/UMLibrary/src/main/res/drawable/umeng_socialize_share_video.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_share_video.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_share_video.png diff --git a/UMLibrary/res/drawable/umeng_socialize_share_web.png b/UMLibrary/src/main/res/drawable/umeng_socialize_share_web.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_share_web.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_share_web.png diff --git a/UMLibrary/res/drawable/umeng_socialize_tx.png b/UMLibrary/src/main/res/drawable/umeng_socialize_tx.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_tx.png rename to UMLibrary/src/main/res/drawable/umeng_socialize_tx.png diff --git a/UMLibrary/res/layout/socialize_share_menu_item.xml b/UMLibrary/src/main/res/layout/socialize_share_menu_item.xml similarity index 100% rename from UMLibrary/res/layout/socialize_share_menu_item.xml rename to UMLibrary/src/main/res/layout/socialize_share_menu_item.xml diff --git a/UMLibrary/res/layout/umeng_socialize_oauth_dialog.xml b/UMLibrary/src/main/res/layout/umeng_socialize_oauth_dialog.xml similarity index 100% rename from UMLibrary/res/layout/umeng_socialize_oauth_dialog.xml rename to UMLibrary/src/main/res/layout/umeng_socialize_oauth_dialog.xml diff --git a/UMLibrary/res/layout/umeng_socialize_share.xml b/UMLibrary/src/main/res/layout/umeng_socialize_share.xml similarity index 100% rename from UMLibrary/res/layout/umeng_socialize_share.xml rename to UMLibrary/src/main/res/layout/umeng_socialize_share.xml diff --git a/UMLibrary/res/layout/upush_bar_image_notification.xml b/UMLibrary/src/main/res/layout/upush_bar_image_notification.xml similarity index 100% rename from UMLibrary/res/layout/upush_bar_image_notification.xml rename to UMLibrary/src/main/res/layout/upush_bar_image_notification.xml diff --git a/UMLibrary/res/layout/upush_notification.xml b/UMLibrary/src/main/res/layout/upush_notification.xml similarity index 100% rename from UMLibrary/res/layout/upush_notification.xml rename to UMLibrary/src/main/res/layout/upush_notification.xml diff --git a/UMLibrary/res/values/umeng_socialize_shareview_strings.xml b/UMLibrary/src/main/res/values/umeng_socialize_shareview_strings.xml similarity index 100% rename from UMLibrary/res/values/umeng_socialize_shareview_strings.xml rename to UMLibrary/src/main/res/values/umeng_socialize_shareview_strings.xml diff --git a/UMLibrary/src/main/res/values/umeng_socialize_style.xml b/UMLibrary/src/main/res/values/umeng_socialize_style.xml new file mode 100644 index 0000000..785505c --- /dev/null +++ b/UMLibrary/src/main/res/values/umeng_socialize_style.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 568f4ff..f5ee06b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,35 +1,30 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { google() - jcenter() - - maven { url "https://dl.bintray.com/thelasterstar/maven/" } - maven { url 'https://dl.bintray.com/umsdk/release' } - + mavenCentral() + maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://artifact.bytedance.com/repository/AwemeOpenSDK' } + maven { + url 'http://www.idescout.com/maven/repo/' + } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:4.1.3' } } allprojects { repositories { google() - jcenter() - - maven { url "https://dl.bintray.com/thelasterstar/maven/" } - maven { url 'https://dl.bintray.com/umsdk/release' } + mavenCentral() + maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://artifact.bytedance.com/repository/AwemeOpenSDK' } } - tasks.withType(JavaCompile) { - sourceCompatibility = 1.7 - targetCompatibility = 1.7 - } +// tasks.withType(JavaCompile) { +// sourceCompatibility = 1.8 +// targetCompatibility = 1.8 +// } } task clean(type: Delete) { diff --git a/gradle.properties b/gradle.properties index d81f57b..4025efa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.injected.testOnly = false +android.injected.testOnly=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70ae57f..227b9e4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:51:03 CST 2020 +#Thu Aug 04 16:40:02 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/share/main/libs/umeng-share-core-7.3.7.jar b/share/main/libs/umeng-share-core-7.3.7.jar new file mode 100644 index 0000000..4f6f5e8 Binary files /dev/null and b/share/main/libs/umeng-share-core-7.3.7.jar differ diff --git "a/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/open_sdk_3.5.16.4_r8c01346_lite.jar" "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/open_sdk_3.5.16.4_r8c01346_lite.jar" new file mode 100644 index 0000000..0cde6d6 Binary files /dev/null and "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/open_sdk_3.5.16.4_r8c01346_lite.jar" differ diff --git "a/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/umeng-share-QQ-full-7.3.7.jar" "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/umeng-share-QQ-full-7.3.7.jar" new file mode 100644 index 0000000..e22e46d Binary files /dev/null and "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/libs/umeng-share-QQ-full-7.3.7.jar" differ diff --git a/UMLibrary/res/drawable/umeng_socialize_qq.png "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_qq.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_qq.png rename to "share/platforms/QQ\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_qq.png" diff --git a/UMLibrary/res/drawable/umeng_socialize_qzone.png "b/share/platforms/QQ\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_qzone.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_qzone.png rename to "share/platforms/QQ\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_qzone.png" diff --git a/UMLibrary/libs/libapshare20161108.jar b/share/platforms/alipay/libs/libapshare20161108.jar old mode 100644 new mode 100755 similarity index 100% rename from UMLibrary/libs/libapshare20161108.jar rename to share/platforms/alipay/libs/libapshare20161108.jar diff --git a/share/platforms/alipay/libs/umeng-share-alipay-7.3.7.jar b/share/platforms/alipay/libs/umeng-share-alipay-7.3.7.jar new file mode 100644 index 0000000..3ce4002 Binary files /dev/null and b/share/platforms/alipay/libs/umeng-share-alipay-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_alipay.png b/share/platforms/alipay/res/drawable/umeng_socialize_alipay.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_alipay.png rename to share/platforms/alipay/res/drawable/umeng_socialize_alipay.png diff --git a/share/platforms/alipay/src/apshare/ShareEntryActivity.java b/share/platforms/alipay/src/apshare/ShareEntryActivity.java new file mode 100644 index 0000000..5d016c5 --- /dev/null +++ b/share/platforms/alipay/src/apshare/ShareEntryActivity.java @@ -0,0 +1,6 @@ +package com.umeng.soexample.apshare; + +import com.umeng.socialize.media.ShareCallbackActivity; + +public class ShareEntryActivity extends ShareCallbackActivity { +} \ No newline at end of file diff --git a/share/platforms/bytedance/libs/umeng-share-bytedance-7.3.7.jar b/share/platforms/bytedance/libs/umeng-share-bytedance-7.3.7.jar new file mode 100644 index 0000000..a4d0336 Binary files /dev/null and b/share/platforms/bytedance/libs/umeng-share-bytedance-7.3.7.jar differ diff --git a/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance.png b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance.png new file mode 100644 index 0000000..80918b8 Binary files /dev/null and b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance.png differ diff --git a/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_friends.png b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_friends.png new file mode 100644 index 0000000..80918b8 Binary files /dev/null and b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_friends.png differ diff --git a/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_publish.png b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_publish.png new file mode 100644 index 0000000..80918b8 Binary files /dev/null and b/share/platforms/bytedance/res/drawable/umeng_socialize_bytedance_publish.png differ diff --git a/share/platforms/bytedance/src/douyinapi/DouYinEntryActivity.java b/share/platforms/bytedance/src/douyinapi/DouYinEntryActivity.java new file mode 100644 index 0000000..c6e7950 --- /dev/null +++ b/share/platforms/bytedance/src/douyinapi/DouYinEntryActivity.java @@ -0,0 +1,6 @@ +package com.umeng.soexample.douyinapi; + +import com.umeng.socialize.douyin.DYCallbackActivity; + +public class DouYinEntryActivity extends DYCallbackActivity { +} \ No newline at end of file diff --git a/share/platforms/dingding/libs/umeng-share-Ding-7.3.7.jar b/share/platforms/dingding/libs/umeng-share-Ding-7.3.7.jar new file mode 100644 index 0000000..bba4b11 Binary files /dev/null and b/share/platforms/dingding/libs/umeng-share-Ding-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_ding.png b/share/platforms/dingding/res/drawable/umeng_socialize_ding.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_ding.png rename to share/platforms/dingding/res/drawable/umeng_socialize_ding.png diff --git a/share/platforms/dingding/src/ddshare/DDShareActivity.java b/share/platforms/dingding/src/ddshare/DDShareActivity.java new file mode 100644 index 0000000..b02c950 --- /dev/null +++ b/share/platforms/dingding/src/ddshare/DDShareActivity.java @@ -0,0 +1,6 @@ +package com.umeng.soexample.ddshare; + +import com.umeng.socialize.media.DingCallBack; + +public class DDShareActivity extends DingCallBack { +} \ No newline at end of file diff --git a/share/platforms/douban/libs/umeng-share-douban-7.3.7.jar b/share/platforms/douban/libs/umeng-share-douban-7.3.7.jar new file mode 100644 index 0000000..2c36ea1 Binary files /dev/null and b/share/platforms/douban/libs/umeng-share-douban-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_douban.png b/share/platforms/douban/res/drawable/umeng_socialize_douban.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_douban.png rename to share/platforms/douban/res/drawable/umeng_socialize_douban.png diff --git a/UMLibrary/libs/json_simple-1.1.jar b/share/platforms/dropbox/libs/json_simple-1.1.jar similarity index 100% rename from UMLibrary/libs/json_simple-1.1.jar rename to share/platforms/dropbox/libs/json_simple-1.1.jar diff --git a/share/platforms/dropbox/libs/umeng-share-dropbox-7.3.7.jar b/share/platforms/dropbox/libs/umeng-share-dropbox-7.3.7.jar new file mode 100644 index 0000000..8aaacab Binary files /dev/null and b/share/platforms/dropbox/libs/umeng-share-dropbox-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_dropbox.png b/share/platforms/dropbox/res/drawable/umeng_socialize_dropbox.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_dropbox.png rename to share/platforms/dropbox/res/drawable/umeng_socialize_dropbox.png diff --git a/share/platforms/email/libs/umeng-share-email-7.3.7.jar b/share/platforms/email/libs/umeng-share-email-7.3.7.jar new file mode 100644 index 0000000..a490fa4 Binary files /dev/null and b/share/platforms/email/libs/umeng-share-email-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_gmail.png b/share/platforms/email/res/drawable/umeng_socialize_gmail.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_gmail.png rename to share/platforms/email/res/drawable/umeng_socialize_gmail.png diff --git a/share/platforms/evernote/libs/umeng-share-evernote-7.3.7.jar b/share/platforms/evernote/libs/umeng-share-evernote-7.3.7.jar new file mode 100644 index 0000000..02bb414 Binary files /dev/null and b/share/platforms/evernote/libs/umeng-share-evernote-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_evernote.png b/share/platforms/evernote/res/drawable/umeng_socialize_evernote.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_evernote.png rename to share/platforms/evernote/res/drawable/umeng_socialize_evernote.png diff --git a/share/platforms/facebook/libs/umeng-share-facebook-7.3.7.jar b/share/platforms/facebook/libs/umeng-share-facebook-7.3.7.jar new file mode 100644 index 0000000..e4dc83c Binary files /dev/null and b/share/platforms/facebook/libs/umeng-share-facebook-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/com_facebook_close.png b/share/platforms/facebook/res/drawable/com_facebook_close.png old mode 100644 new mode 100755 similarity index 100% rename from UMLibrary/res/drawable/com_facebook_close.png rename to share/platforms/facebook/res/drawable/com_facebook_close.png diff --git a/UMLibrary/res/drawable/umeng_socialize_facebook.png b/share/platforms/facebook/res/drawable/umeng_socialize_facebook.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_facebook.png rename to share/platforms/facebook/res/drawable/umeng_socialize_facebook.png diff --git a/UMLibrary/res/drawable/umeng_socialize_fbmessage.png b/share/platforms/facebook/res/drawable/umeng_socialize_fbmessage.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_fbmessage.png rename to share/platforms/facebook/res/drawable/umeng_socialize_fbmessage.png diff --git a/UMLibrary/res/layout/com_facebook_activity_layout.xml b/share/platforms/facebook/res/layout/com_facebook_activity_layout.xml similarity index 100% rename from UMLibrary/res/layout/com_facebook_activity_layout.xml rename to share/platforms/facebook/res/layout/com_facebook_activity_layout.xml diff --git a/UMLibrary/res/layout/com_facebook_login_fragment.xml b/share/platforms/facebook/res/layout/com_facebook_login_fragment.xml similarity index 100% rename from UMLibrary/res/layout/com_facebook_login_fragment.xml rename to share/platforms/facebook/res/layout/com_facebook_login_fragment.xml diff --git a/UMLibrary/res/values/facebook_strings.xml b/share/platforms/facebook/res/values/facebook_strings.xml similarity index 100% rename from UMLibrary/res/values/facebook_strings.xml rename to share/platforms/facebook/res/values/facebook_strings.xml diff --git a/UMLibrary/res/values/messenger_button_strings.xml b/share/platforms/facebook/res/values/messenger_button_strings.xml similarity index 100% rename from UMLibrary/res/values/messenger_button_strings.xml rename to share/platforms/facebook/res/values/messenger_button_strings.xml diff --git a/UMLibrary/res/values/umeng_socialize_facebook_strings.xml b/share/platforms/facebook/res/values/umeng_socialize_facebook_strings.xml similarity index 100% rename from UMLibrary/res/values/umeng_socialize_facebook_strings.xml rename to share/platforms/facebook/res/values/umeng_socialize_facebook_strings.xml diff --git a/share/platforms/flickr/libs/umeng-share-flickr-7.3.7.jar b/share/platforms/flickr/libs/umeng-share-flickr-7.3.7.jar new file mode 100644 index 0000000..9d1c734 Binary files /dev/null and b/share/platforms/flickr/libs/umeng-share-flickr-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_flickr.png b/share/platforms/flickr/res/drawable/umeng_socialize_flickr.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_flickr.png rename to share/platforms/flickr/res/drawable/umeng_socialize_flickr.png diff --git a/share/platforms/foursquare/libs/umeng-share-foursquare-7.3.7.jar b/share/platforms/foursquare/libs/umeng-share-foursquare-7.3.7.jar new file mode 100644 index 0000000..bdea13b Binary files /dev/null and b/share/platforms/foursquare/libs/umeng-share-foursquare-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_foursquare.png b/share/platforms/foursquare/res/drawable/umeng_socialize_foursquare.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_foursquare.png rename to share/platforms/foursquare/res/drawable/umeng_socialize_foursquare.png diff --git a/UMLibrary/res/values/umeng_socialize_foursquare_strings.xml b/share/platforms/foursquare/res/values/umeng_socialize_foursquare_strings.xml similarity index 100% rename from UMLibrary/res/values/umeng_socialize_foursquare_strings.xml rename to share/platforms/foursquare/res/values/umeng_socialize_foursquare_strings.xml diff --git a/share/platforms/honor/libs/Honor-openSDK-6.0.3.004.aar b/share/platforms/honor/libs/Honor-openSDK-6.0.3.004.aar new file mode 100644 index 0000000..8f86d27 Binary files /dev/null and b/share/platforms/honor/libs/Honor-openSDK-6.0.3.004.aar differ diff --git a/share/platforms/honor/libs/umeng-share-honor-7.3.7.jar b/share/platforms/honor/libs/umeng-share-honor-7.3.7.jar new file mode 100644 index 0000000..7482bb7 Binary files /dev/null and b/share/platforms/honor/libs/umeng-share-honor-7.3.7.jar differ diff --git a/share/platforms/honor/res/drawable/umeng_socialize_honor.png b/share/platforms/honor/res/drawable/umeng_socialize_honor.png new file mode 100644 index 0000000..238fdcb Binary files /dev/null and b/share/platforms/honor/res/drawable/umeng_socialize_honor.png differ diff --git a/share/platforms/instagram/libs/umeng-share-instagram-7.3.7.jar b/share/platforms/instagram/libs/umeng-share-instagram-7.3.7.jar new file mode 100644 index 0000000..6f4f104 Binary files /dev/null and b/share/platforms/instagram/libs/umeng-share-instagram-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_instagram.png b/share/platforms/instagram/res/drawable/umeng_socialize_instagram.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_instagram.png rename to share/platforms/instagram/res/drawable/umeng_socialize_instagram.png diff --git a/share/platforms/kakao/libs/umeng-share-kakao-7.3.7.jar b/share/platforms/kakao/libs/umeng-share-kakao-7.3.7.jar new file mode 100644 index 0000000..bc9c1f0 Binary files /dev/null and b/share/platforms/kakao/libs/umeng-share-kakao-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_kakao.png b/share/platforms/kakao/res/drawable/umeng_socialize_kakao.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_kakao.png rename to share/platforms/kakao/res/drawable/umeng_socialize_kakao.png diff --git a/UMLibrary/res/layout/umeng_socialize_activity_kakao_webview.xml b/share/platforms/kakao/res/layout/umeng_socialize_activity_kakao_webview.xml similarity index 100% rename from UMLibrary/res/layout/umeng_socialize_activity_kakao_webview.xml rename to share/platforms/kakao/res/layout/umeng_socialize_activity_kakao_webview.xml diff --git a/UMLibrary/res/values/umeng_socialize_kakao_strings.xml b/share/platforms/kakao/res/values/umeng_socialize_kakao_strings.xml similarity index 100% rename from UMLibrary/res/values/umeng_socialize_kakao_strings.xml rename to share/platforms/kakao/res/values/umeng_socialize_kakao_strings.xml diff --git a/share/platforms/line/libs/umeng-share-line-7.3.7.jar b/share/platforms/line/libs/umeng-share-line-7.3.7.jar new file mode 100644 index 0000000..094531a Binary files /dev/null and b/share/platforms/line/libs/umeng-share-line-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_line.png b/share/platforms/line/res/drawable/umeng_socialize_line.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_line.png rename to share/platforms/line/res/drawable/umeng_socialize_line.png diff --git a/share/platforms/linkedin/libs/umeng-share-linkedin-7.3.7.jar b/share/platforms/linkedin/libs/umeng-share-linkedin-7.3.7.jar new file mode 100644 index 0000000..d977706 Binary files /dev/null and b/share/platforms/linkedin/libs/umeng-share-linkedin-7.3.7.jar differ diff --git a/UMLibrary/libs/volley.jar b/share/platforms/linkedin/libs/volley.jar similarity index 100% rename from UMLibrary/libs/volley.jar rename to share/platforms/linkedin/libs/volley.jar diff --git a/UMLibrary/res/drawable/umeng_socialize_linkedin.png b/share/platforms/linkedin/res/drawable/umeng_socialize_linkedin.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_linkedin.png rename to share/platforms/linkedin/res/drawable/umeng_socialize_linkedin.png diff --git a/share/platforms/pinterest/libs/umeng-share-pinterest-7.3.7.jar b/share/platforms/pinterest/libs/umeng-share-pinterest-7.3.7.jar new file mode 100644 index 0000000..e14d06b Binary files /dev/null and b/share/platforms/pinterest/libs/umeng-share-pinterest-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_pinterest.png b/share/platforms/pinterest/res/drawable/umeng_socialize_pinterest.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_pinterest.png rename to share/platforms/pinterest/res/drawable/umeng_socialize_pinterest.png diff --git a/share/platforms/pocket/libs/umeng-share-pocket-7.3.7.jar b/share/platforms/pocket/libs/umeng-share-pocket-7.3.7.jar new file mode 100644 index 0000000..8e99079 Binary files /dev/null and b/share/platforms/pocket/libs/umeng-share-pocket-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_pocket.png b/share/platforms/pocket/res/drawable/umeng_socialize_pocket.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_pocket.png rename to share/platforms/pocket/res/drawable/umeng_socialize_pocket.png diff --git a/share/platforms/sms/libs/umeng-share-sms-7.3.7.jar b/share/platforms/sms/libs/umeng-share-sms-7.3.7.jar new file mode 100644 index 0000000..cd1db13 Binary files /dev/null and b/share/platforms/sms/libs/umeng-share-sms-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_sms.png b/share/platforms/sms/res/drawable/umeng_socialize_sms.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_sms.png rename to share/platforms/sms/res/drawable/umeng_socialize_sms.png diff --git a/share/platforms/tumblr/libs/umeng-share-tumblr-7.3.7.jar b/share/platforms/tumblr/libs/umeng-share-tumblr-7.3.7.jar new file mode 100644 index 0000000..8cd0262 Binary files /dev/null and b/share/platforms/tumblr/libs/umeng-share-tumblr-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_tumblr.png b/share/platforms/tumblr/res/drawable/umeng_socialize_tumblr.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_tumblr.png rename to share/platforms/tumblr/res/drawable/umeng_socialize_tumblr.png diff --git a/share/platforms/twitter/libs/umeng-share-twitter-7.3.7.jar b/share/platforms/twitter/libs/umeng-share-twitter-7.3.7.jar new file mode 100644 index 0000000..ecc8023 Binary files /dev/null and b/share/platforms/twitter/libs/umeng-share-twitter-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_twitter.png b/share/platforms/twitter/res/drawable/umeng_socialize_twitter.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_twitter.png rename to share/platforms/twitter/res/drawable/umeng_socialize_twitter.png diff --git a/share/platforms/twitter/src/twitterapi/TwitterShareReceiver.java b/share/platforms/twitter/src/twitterapi/TwitterShareReceiver.java new file mode 100644 index 0000000..8c1681a --- /dev/null +++ b/share/platforms/twitter/src/twitterapi/TwitterShareReceiver.java @@ -0,0 +1,6 @@ +package com.umeng.soexample.twitterapi; + +import com.umeng.socialize.handler.UMTwitterReceiver; + +public class TwitterShareReceiver extends UMTwitterReceiver { +} \ No newline at end of file diff --git a/share/platforms/vkontakte/libs/umeng-share-vkontakte-7.3.7.jar b/share/platforms/vkontakte/libs/umeng-share-vkontakte-7.3.7.jar new file mode 100644 index 0000000..11e8bef Binary files /dev/null and b/share/platforms/vkontakte/libs/umeng-share-vkontakte-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/ic_ab_app.png b/share/platforms/vkontakte/res/drawable/ic_ab_app.png similarity index 100% rename from UMLibrary/res/drawable/ic_ab_app.png rename to share/platforms/vkontakte/res/drawable/ic_ab_app.png diff --git a/UMLibrary/res/drawable/ic_ab_done.png b/share/platforms/vkontakte/res/drawable/ic_ab_done.png similarity index 100% rename from UMLibrary/res/drawable/ic_ab_done.png rename to share/platforms/vkontakte/res/drawable/ic_ab_done.png diff --git a/UMLibrary/res/drawable/vk_clear_shape.xml b/share/platforms/vkontakte/res/drawable/vk_clear_shape.xml similarity index 100% rename from UMLibrary/res/drawable/vk_clear_shape.xml rename to share/platforms/vkontakte/res/drawable/vk_clear_shape.xml diff --git a/UMLibrary/res/drawable/vk_gray_transparent_shape.xml b/share/platforms/vkontakte/res/drawable/vk_gray_transparent_shape.xml similarity index 100% rename from UMLibrary/res/drawable/vk_gray_transparent_shape.xml rename to share/platforms/vkontakte/res/drawable/vk_gray_transparent_shape.xml diff --git a/UMLibrary/res/drawable/vk_icon.png b/share/platforms/vkontakte/res/drawable/vk_icon.png similarity index 100% rename from UMLibrary/res/drawable/vk_icon.png rename to share/platforms/vkontakte/res/drawable/vk_icon.png diff --git a/UMLibrary/res/drawable/vk_share_send_button_background.xml b/share/platforms/vkontakte/res/drawable/vk_share_send_button_background.xml similarity index 100% rename from UMLibrary/res/drawable/vk_share_send_button_background.xml rename to share/platforms/vkontakte/res/drawable/vk_share_send_button_background.xml diff --git a/UMLibrary/res/layout/vk_captcha_dialog.xml b/share/platforms/vkontakte/res/layout/vk_captcha_dialog.xml similarity index 100% rename from UMLibrary/res/layout/vk_captcha_dialog.xml rename to share/platforms/vkontakte/res/layout/vk_captcha_dialog.xml diff --git a/UMLibrary/res/layout/vk_open_auth_dialog.xml b/share/platforms/vkontakte/res/layout/vk_open_auth_dialog.xml similarity index 100% rename from UMLibrary/res/layout/vk_open_auth_dialog.xml rename to share/platforms/vkontakte/res/layout/vk_open_auth_dialog.xml diff --git a/UMLibrary/res/layout/vk_share_dialog.xml b/share/platforms/vkontakte/res/layout/vk_share_dialog.xml similarity index 100% rename from UMLibrary/res/layout/vk_share_dialog.xml rename to share/platforms/vkontakte/res/layout/vk_share_dialog.xml diff --git a/UMLibrary/res/values/vk_color.xml b/share/platforms/vkontakte/res/values/vk_color.xml similarity index 100% rename from UMLibrary/res/values/vk_color.xml rename to share/platforms/vkontakte/res/values/vk_color.xml diff --git a/UMLibrary/res/values/vk_dimen.xml b/share/platforms/vkontakte/res/values/vk_dimen.xml similarity index 100% rename from UMLibrary/res/values/vk_dimen.xml rename to share/platforms/vkontakte/res/values/vk_dimen.xml diff --git a/UMLibrary/res/values/vk_strings.xml b/share/platforms/vkontakte/res/values/vk_strings.xml similarity index 100% rename from UMLibrary/res/values/vk_strings.xml rename to share/platforms/vkontakte/res/values/vk_strings.xml diff --git a/UMLibrary/res/values/vk_styles.xml b/share/platforms/vkontakte/res/values/vk_styles.xml similarity index 99% rename from UMLibrary/res/values/vk_styles.xml rename to share/platforms/vkontakte/res/values/vk_styles.xml index 70af7c0..c905bbf 100644 --- a/UMLibrary/res/values/vk_styles.xml +++ b/share/platforms/vkontakte/res/values/vk_styles.xml @@ -13,4 +13,7 @@ @android:color/transparent @null + + + \ No newline at end of file diff --git a/share/platforms/whatsapp/libs/umeng-share-whatsapp-7.3.7.jar b/share/platforms/whatsapp/libs/umeng-share-whatsapp-7.3.7.jar new file mode 100644 index 0000000..98565e9 Binary files /dev/null and b/share/platforms/whatsapp/libs/umeng-share-whatsapp-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_whatsapp.png b/share/platforms/whatsapp/res/drawable/umeng_socialize_whatsapp.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_whatsapp.png rename to share/platforms/whatsapp/res/drawable/umeng_socialize_whatsapp.png diff --git a/UMLibrary/libs/SocialSDK_yixin_1.jar b/share/platforms/yixin/libs/SocialSDK_yixin_1.jar similarity index 100% rename from UMLibrary/libs/SocialSDK_yixin_1.jar rename to share/platforms/yixin/libs/SocialSDK_yixin_1.jar diff --git a/share/platforms/yixin/libs/umeng-share-yixin-7.3.7.jar b/share/platforms/yixin/libs/umeng-share-yixin-7.3.7.jar new file mode 100644 index 0000000..8751679 Binary files /dev/null and b/share/platforms/yixin/libs/umeng-share-yixin-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_yixin.png b/share/platforms/yixin/res/drawable/umeng_socialize_yixin.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_yixin.png rename to share/platforms/yixin/res/drawable/umeng_socialize_yixin.png diff --git a/UMLibrary/res/drawable/umeng_socialize_yixin_circle.png b/share/platforms/yixin/res/drawable/umeng_socialize_yixin_circle.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_yixin_circle.png rename to share/platforms/yixin/res/drawable/umeng_socialize_yixin_circle.png diff --git a/share/platforms/yixin/src/yxapi/YXEntryActivity.java b/share/platforms/yixin/src/yxapi/YXEntryActivity.java new file mode 100644 index 0000000..51caabd --- /dev/null +++ b/share/platforms/yixin/src/yxapi/YXEntryActivity.java @@ -0,0 +1,6 @@ +package com.umeng.soexample.yxapi; + +import com.umeng.socialize.activity.YXCallbackActivity; + +public class YXEntryActivity extends YXCallbackActivity { +} \ No newline at end of file diff --git a/share/platforms/ynote/libs/umeng-share-ynote-7.3.7.jar b/share/platforms/ynote/libs/umeng-share-ynote-7.3.7.jar new file mode 100644 index 0000000..a8cdc2c Binary files /dev/null and b/share/platforms/ynote/libs/umeng-share-ynote-7.3.7.jar differ diff --git a/UMLibrary/res/drawable/umeng_socialize_ynote.png b/share/platforms/ynote/res/drawable/umeng_socialize_ynote.png similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_ynote.png rename to share/platforms/ynote/res/drawable/umeng_socialize_ynote.png diff --git "a/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/lib_wwapi-2.0.12.11.aar" "b/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/lib_wwapi-2.0.12.11.aar" new file mode 100644 index 0000000..5f9a9cc Binary files /dev/null and "b/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/lib_wwapi-2.0.12.11.aar" differ diff --git "a/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/umeng-share-wxwork-7.3.7.jar" "b/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/umeng-share-wxwork-7.3.7.jar" new file mode 100644 index 0000000..9f8fbac Binary files /dev/null and "b/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/libs/umeng-share-wxwork-7.3.7.jar" differ diff --git a/UMLibrary/res/drawable/umeng_socialize_wxwork.png "b/share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/res/drawable/umeng_socialize_wxwork.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_wxwork.png rename to "share/platforms/\344\274\201\344\270\232\345\276\256\344\277\241/res/drawable/umeng_socialize_wxwork.png" diff --git "a/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/libs/umeng-share-wechat-full-7.3.7.jar" "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/libs/umeng-share-wechat-full-7.3.7.jar" new file mode 100644 index 0000000..7df15e0 Binary files /dev/null and "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/libs/umeng-share-wechat-full-7.3.7.jar" differ diff --git a/UMLibrary/res/drawable/umeng_socialize_fav.png "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_fav.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_fav.png rename to "share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_fav.png" diff --git a/UMLibrary/res/drawable/umeng_socialize_wechat.png "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_wechat.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_wechat.png rename to "share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_wechat.png" diff --git a/UMLibrary/res/drawable/umeng_socialize_wxcircle.png "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_wxcircle.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_wxcircle.png rename to "share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_wxcircle.png" diff --git "a/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/src/wxapi/WXEntryActivity.java" "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/src/wxapi/WXEntryActivity.java" new file mode 100644 index 0000000..95ac946 --- /dev/null +++ "b/share/platforms/\345\276\256\344\277\241\345\256\214\346\225\264\347\211\210/src/wxapi/WXEntryActivity.java" @@ -0,0 +1,6 @@ +package com.umeng.soexample.wxapi; + +import com.umeng.socialize.weixin.view.WXCallbackActivity; + +public class WXEntryActivity extends WXCallbackActivity { +} \ No newline at end of file diff --git "a/share/platforms/\346\226\260\346\265\252\345\256\214\346\225\264\347\211\210/libs/umeng-share-sina-full-7.3.7.jar" "b/share/platforms/\346\226\260\346\265\252\345\256\214\346\225\264\347\211\210/libs/umeng-share-sina-full-7.3.7.jar" new file mode 100644 index 0000000..a18190b Binary files /dev/null and "b/share/platforms/\346\226\260\346\265\252\345\256\214\346\225\264\347\211\210/libs/umeng-share-sina-full-7.3.7.jar" differ diff --git a/UMLibrary/res/drawable/umeng_socialize_sina.png "b/share/platforms/\346\226\260\346\265\252\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_sina.png" similarity index 100% rename from UMLibrary/res/drawable/umeng_socialize_sina.png rename to "share/platforms/\346\226\260\346\265\252\345\256\214\346\225\264\347\211\210/res/drawable/umeng_socialize_sina.png" diff --git a/share/shareback/libs/umeng-link-2.0.0.aar b/share/shareback/libs/umeng-link-2.0.0.aar new file mode 100644 index 0000000..2c58d8f Binary files /dev/null and b/share/shareback/libs/umeng-link-2.0.0.aar differ