Skip to content

Commit 2bd6880

Browse files
raedevraedev
committed
更新依赖包，友盟分析SDK改成jar形式
1 parent cd37480 commit 2bd6880

38 files changed

+482
-36
lines changed

‎app/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion rootProject.ext.android.compileSdkVersion
5-
65
defaultConfig {
76
minSdkVersion rootProject.ext.android.minSdkVersion
87
targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -21,9 +20,6 @@ android {
2120
arguments = [moduleName: project.getName()]
2221
}
2322
}
24-
manifestPlaceholders = [
25-
"qqappid": rootProject.ext.account.qqAppId
26-
]
2723
}
2824
dexOptions {
2925
javaMaxHeapSize "2g"
@@ -50,10 +46,14 @@ android {
5046
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
5147
}
5248
}
49+
compileOptions {
50+
sourceCompatibility JavaVersion.VERSION_1_8
51+
targetCompatibility JavaVersion.VERSION_1_8
52+
}
5353
}
5454

5555
dependencies {
56-
implementation fileTree(dir: 'libs', include: ['*.jar'])
56+
implementation fileTree(include: ['*.jar'], dir: 'libs')
5757
annotationProcessor rootProject.ext.annotationProcessors.butterknife
5858
annotationProcessor rootProject.ext.annotationProcessors.arouter
5959
implementation rootProject.ext.dependencies.appcompat
@@ -66,7 +66,6 @@ dependencies {
6666
implementation project(':module-widget')
6767
implementation project(':module-sdk')
6868
implementation project(':module-middleware')
69-
7069
// 模块化
7170
if (!IsModule.toBoolean()) {
7271
implementation project(':module-user')

‎build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ apply from: 'properties.gradle'
55

66
buildscript {
77
repositories {
8+
maven { url 'https://maven.aliyun.com/repository/public' }
89
maven { url 'http://raedev.io:8081/repository/maven-public/' }
910
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
1011
google()
1112
jcenter()
1213
}
1314
dependencies {
14-
classpath 'com.android.tools.build:gradle:3.1.3'
15+
classpath 'com.android.tools.build:gradle:3.2.1'
1516
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
1617
// 热更新插件
1718
// classpath "com.tencent.bugly:tinker-support:1.0.8"
@@ -23,6 +24,7 @@ buildscript {
2324

2425
allprojects {
2526
repositories {
27+
maven { url 'https://maven.aliyun.com/repository/public' }
2628
maven { url 'http://raedev.io:8081/repository/maven-public/' }
2729
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
2830
maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }

‎dependencies.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ ext {
44
// Android 扩展配置
55
android = [
66
versionCode : 8, // 版本号
7-
compileSdkVersion: 27,
8-
targetSdkVersion : 27,
7+
compileSdkVersion: 28,
8+
targetSdkVersion : 28,
99
minSdkVersion : 17,
10-
supportVersion : '27.1.1'
10+
supportVersion : '28.0.0'
1111
]
1212

1313
// 依赖配置
@@ -18,6 +18,7 @@ ext {
1818
recyclerview : 'com.android.support:recyclerview-v7:' + ext.android.supportVersion,
1919
annotations : 'com.android.support:support-annotations:' + ext.android.supportVersion,
2020
cardview : 'com.android.support:cardview-v7:' + ext.android.supportVersion,
21+
supportV4 : 'com.android.support:support-v4:' + ext.android.supportVersion,
2122
rxjava : 'io.reactivex.rxjava2:rxjava:2.1.0',
2223
rxandroid : 'io.reactivex.rxjava2:rxandroid:2.0.1',
2324
butterknife : 'com.jakewharton:butterknife:9.0.0-SNAPSHOT',
@@ -35,21 +36,22 @@ ext {
3536
rxlifecycle : 'com.trello.rxlifecycle2:rxlifecycle-android-lifecycle:2.2.1',
3637
skin : 'skin.support:skin-support:3.1.0-beta',
3738
skinDesign : 'skin.support:skin-support-design:3.1.0-beta',
38-
raeDesignExt : 'com.rae.widget:design-ext:1.0.2',
39+
raeDesignExt : 'com.rae.widget:design-ext:28.0.0',
3940
ptr : 'in.srain.cube:ultra-ptr:1.0.11',
4041
xRecyclerView : 'com.github.raee:XRecyclerView:1.3.3',
4142
roundedImage : 'com.makeramen:roundedimageview:2.3.0',
4243
multidex : 'com.android.support:multidex:1.0.2',
4344
glide : 'com.github.bumptech.glide:glide:4.0.0',
4445

4546
// 友盟统计-公共库
46-
umengCommon : 'com.umeng.sdk:common:1.5.1',
47+
umengCommon : 'com.umeng.sdk:common:1.5.3',
4748
// 友盟统计-APP分析库
4849
umengAnalytics : 'com.umeng.sdk:analytics:7.5.3',
49-
umShareCore : 'com.umeng.sdk:share-core:6.9.2',
50-
umShareQQ : 'com.umeng.sdk:share-qq:6.9.2.0',
51-
umShareWechat : 'com.umeng.sdk:share-wechat:6.9.2',
52-
umengShareSina : 'com.umeng.sdk:share-sina:6.9.2',
50+
51+
// umShareCore : 'com.umeng.sdk:share-core:6.9.2',
52+
// umShareQQ : 'com.umeng.sdk:share-qq:6.9.2.0',
53+
// umShareWechat : 'com.umeng.sdk:share-wechat:6.9.2',
54+
// umengShareSina : 'com.umeng.sdk:share-sina:6.9.2',
5355

5456
greendao : 'org.greenrobot:greendao:3.2.2',
5557
// 美团渠道包库

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎module-basic/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ android {
77
targetSdkVersion rootProject.ext.android.targetSdkVersion
88
versionCode 1
99
versionName "1.0"
10+
manifestPlaceholders = [qqappid: 'abc']
1011
}
1112

1213
buildTypes {
@@ -21,6 +22,7 @@ android {
2122
/* 基础模块尽量少依赖其他项目，造成不必要的耦合 */
2223

2324
dependencies {
25+
api fileTree(include: ['*.jar'], dir: 'libs')
2426
annotationProcessor rootProject.ext.annotationProcessors.glide
2527

2628
implementation rootProject.ext.dependencies.appcompat
@@ -32,10 +34,11 @@ dependencies {
3234
// 友盟
3335
api rootProject.ext.dependencies.umengCommon
3436
api rootProject.ext.dependencies.umengAnalytics
35-
api rootProject.ext.dependencies.umShareCore
36-
api rootProject.ext.dependencies.umShareQQ
37-
api rootProject.ext.dependencies.umShareWechat
38-
api rootProject.ext.dependencies.umengShareSina
37+
38+
// api rootProject.ext.dependencies.umShareCore
39+
// api rootProject.ext.dependencies.umShareQQ
40+
// api rootProject.ext.dependencies.umShareWechat
41+
// api rootProject.ext.dependencies.umengShareSina
3942

4043

4144
api(rootProject.ext.dependencies.recyclerview, {

‎module-basic/libs/umeng-share-QQ-simplify-6.9.3.jar

77.6 KB
Binary file not shown.

‎module-basic/libs/umeng-share-core-6.9.3.jar

271 KB
Binary file not shown.

‎module-basic/libs/umeng-share-sina-simplify-6.9.3.jar

80.2 KB
Binary file not shown.

‎module-basic/libs/umeng-share-wechat-simplify-6.9.3.jar

30.4 KB
Binary file not shown.

‎module-basic/libs/umeng-sharetool-6.9.3.jar

9.56 KB
Binary file not shown.

‎module-basic/src/main/AndroidManifest.xml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,47 @@
55
<application
66
android:allowBackup="true"
77
android:label="@string/app_name"
8-
android:supportsRtl="true" />
8+
android:supportsRtl="true">
9+
<activity
10+
android:name="com.umeng.socialize.media.WBShareCallBackActivity"
11+
android:configChanges="keyboardHidden|orientation"
12+
android:exported="false"
13+
android:screenOrientation="portrait"
14+
android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
15+
<activity
16+
android:name="com.sina.weibo.sdk.web.WeiboSdkWebActivity"
17+
android:configChanges="keyboardHidden|orientation"
18+
android:exported="false"
19+
android:windowSoftInputMode="adjustResize">
20+
21+
</activity>
22+
<activity
23+
android:name="com.sina.weibo.sdk.share.WbShareTransActivity"
24+
android:launchMode="singleTask"
25+
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
26+
<intent-filter>
27+
<action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
28+
<category android:name="android.intent.category.DEFAULT" />
29+
</intent-filter>
30+
31+
</activity>
32+
<activity
33+
android:name="com.tencent.tauth.AuthActivity"
34+
android:launchMode="singleTask"
35+
android:noHistory="true" >
36+
<intent-filter>
37+
<action android:name="android.intent.action.VIEW" />
38+
39+
<category android:name="android.intent.category.DEFAULT" />
40+
<category android:name="android.intent.category.BROWSABLE" />
41+
42+
<data android:scheme="tencent100424468" />
43+
</intent-filter>
44+
</activity>
45+
<activity
46+
android:name="com.tencent.connect.common.AssistActivity"
47+
android:theme="@android:style/Theme.Translucent.NoTitleBar"
48+
android:configChanges="orientation|keyboardHidden|screenSize"/>
49+
50+
</application>
951
</manifest>

‎module-basic/src/main/res/drawable/umeng_socialize_back_icon.png

500 Bytes
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_btn_bg.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape android:shape="rectangle"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
4+
<solid android:color="@android:color/transparent" />
5+
<stroke android:width="1dp"
6+
android:color="#ffffff"
7+
8+
/>
9+
10+
11+
</shape>

‎module-basic/src/main/res/drawable/umeng_socialize_copy.png

907 Bytes
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_copyurl.png

1.52 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_delete.png

1.82 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_edit_bg.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape android:shape="rectangle"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
4+
<solid android:color="@android:color/transparent" />
5+
<stroke android:width="1dp"
6+
android:color="#C3C6C9"
7+
8+
/>
9+
10+
11+
</shape>

‎module-basic/src/main/res/drawable/umeng_socialize_fav.png

1.15 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_menu_default.png

4.1 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_more.png

1.56 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_qq.png

3.42 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_qzone.png

2.03 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_share_music.png

5.27 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_share_video.png

4.99 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_share_web.png

6.55 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_sina.png

2.52 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_wechat.png

1.59 KB
Loading

‎module-basic/src/main/res/drawable/umeng_socialize_wxcircle.png

1.47 KB
Loading

‎module-basic/src/main/res/layout/socialize_share_menu_item.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="wrap_content"
4+
android:layout_height="wrap_content"
5+
android:gravity="center"
6+
android:orientation="vertical">
7+
8+
<com.umeng.socialize.shareboard.SocializeImageView
9+
android:id="@+id/socialize_image_view"
10+
android:layout_width="50dp"
11+
android:layout_height="50dp"
12+
android:padding="5dp"
13+
android:src="@drawable/umeng_socialize_menu_default" />
14+
15+
<TextView
16+
android:id="@+id/socialize_text_view"
17+
android:layout_width="63dp"
18+
android:layout_height="wrap_content"
19+
android:layout_marginTop="6dp"
20+
android:ellipsize="end"
21+
android:singleLine="true"
22+
android:text="未知"
23+
android:textSize="12sp" />
24+
25+
</LinearLayout>

‎module-basic/src/main/res/layout/umeng_socialize_oauth_dialog.xml

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:background="#D4E0E5">
6+
7+
8+
<RelativeLayout
9+
android:id="@+id/umeng_socialize_titlebar"
10+
android:layout_width="match_parent"
11+
android:layout_height="54dp"
12+
android:background="#0086DC">
13+
14+
<TextView
15+
android:id="@+id/umeng_title"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_centerInParent="true"
19+
android:text=""
20+
android:textColor="#ffffff"
21+
android:textSize="18sp" />
22+
23+
<RelativeLayout
24+
android:id="@+id/umeng_back"
25+
android:layout_width="60dp"
26+
android:layout_height="match_parent"
27+
28+
android:onClick="onCancel"
29+
android:visibility="visible">
30+
31+
<ImageButton
32+
33+
android:layout_width="12dp"
34+
android:layout_height="20dp"
35+
android:layout_centerVertical="true"
36+
android:background="@drawable/umeng_socialize_back_icon"
37+
android:layout_marginLeft="15dp"
38+
android:scaleType="center" />
39+
</RelativeLayout>
40+
41+
<TextView
42+
android:id="@+id/umeng_share_btn"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:layout_alignParentRight="true"
46+
android:layout_centerInParent="true"
47+
android:layout_marginRight="10dp"
48+
android:background="@drawable/umeng_socialize_btn_bg"
49+
android:padding="4dp"
50+
android:text="分享"
51+
android:textColor="#ffffff" />
52+
</RelativeLayout>
53+
54+
<RelativeLayout
55+
android:id="@+id/umeng_socialize_follow"
56+
android:layout_width="fill_parent"
57+
android:layout_height="40dp"
58+
android:layout_alignParentBottom="true"
59+
android:background="#AAAAAA"
60+
android:visibility="visible">
61+
62+
<CheckBox
63+
android:id="@+id/umeng_socialize_follow_check"
64+
android:layout_width="20dp"
65+
android:layout_height="20dp"
66+
android:layout_centerVertical="true"
67+
android:layout_marginLeft="20dp"
68+
android:checked="true"
69+
android:visibility="gone" />
70+
71+
<TextView
72+
android:layout_width="wrap_content"
73+
android:layout_height="wrap_content"
74+
android:layout_centerVertical="true"
75+
android:layout_marginLeft="15dp"
76+
android:layout_toRightOf="@id/umeng_socialize_follow_check"
77+
android:text="关注官方微博"
78+
android:textColor="#f8f8f8"
79+
android:textSize="16sp"
80+
android:visibility="gone" />
81+
</RelativeLayout>
82+
83+
<!--<LinearLayout-->
84+
<!--android:id="@+id/webView_container"-->
85+
<!--android:layout_width="match_parent"-->
86+
<!--android:layout_height="match_parent"-->
87+
<!--android:layout_above="@id/umeng_socialize_follow"-->
88+
<!--android:layout_below="@id/umeng_socialize_titlebar"-->
89+
<!--android:orientation="horizontal"-->
90+
<!--android:visibility="visible" />-->
91+
92+
<WebView
93+
android:id="@+id/webView"
94+
android:layout_width="fill_parent"
95+
android:layout_height="fill_parent"
96+
android:background="#F2F5F6"
97+
android:layout_above="@id/umeng_socialize_follow"
98+
android:layout_below="@id/umeng_socialize_titlebar"
99+
android:visibility="visible" />
100+
101+
<RelativeLayout
102+
android:id="@+id/progress_bar_parent"
103+
android:layout_width="fill_parent"
104+
android:layout_height="fill_parent"
105+
android:layout_below="@id/umeng_socialize_titlebar"
106+
android:background="#F2F5F6" >
107+
108+
<LinearLayout
109+
android:layout_width="80dp"
110+
android:layout_height="80dp"
111+
android:layout_centerInParent="true"
112+
android:orientation="horizontal">
113+
114+
<ProgressBar
115+
android:layout_width="fill_parent"
116+
android:layout_height="fill_parent"
117+
android:layout_margin="10dp" />
118+
</LinearLayout>
119+
</RelativeLayout>
120+
121+
</RelativeLayout>

0 commit comments

Comments
 (0)