Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 7eae2a4

Browse files
raeeraee
committed
更新友盟分享SDK至6.9.2
1 parent e10d8e8 commit 7eae2a4

File tree

29 files changed

+223
-937
lines changed

29 files changed

+223
-937
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ captures/
3434

3535
# Intellij
3636
*.iml
37+
.idea/
3738
.idea/workspace.xml
3839
.idea/tasks.xml
3940
.idea/gradle.xml

‎.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.idea/dbnavigator.xml

Lines changed: 0 additions & 453 deletions
This file was deleted.

‎.idea/kotlinc.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ android {
2121
arguments = [moduleName: project.getName()]
2222
}
2323
}
24+
manifestPlaceholders = [
25+
"qqappid": rootProject.ext.account.qqAppId
26+
]
2427
}
2528
dexOptions {
2629
javaMaxHeapSize "2g"
@@ -38,7 +41,7 @@ android {
3841
debug {
3942
minifyEnabled false
4043
debuggable true
41-
applicationIdSuffix '.debug'
44+
// applicationIdSuffix '.debug'
4245
signingConfig signingConfigs.release
4346
}
4447
release {

‎app/src/main/java/com/rae/cnblogs/MainActivity.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public void onTabReselected(RaeTabLayout.Tab tab) {
140140

141141
private void requestPermissions() {
142142
// 检查权限
143+
143144
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
144145

145146
new DefaultDialogFragment
@@ -151,7 +152,19 @@ private void requestPermissions() {
151152
@Override
152153
public void onClick(DialogInterface dialog, int which) {
153154
dialog.dismiss();
154-
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, 100);
155+
String[] permissionList = new String[]{
156+
Manifest.permission.WRITE_EXTERNAL_STORAGE,
157+
Manifest.permission.ACCESS_FINE_LOCATION,
158+
Manifest.permission.CALL_PHONE,
159+
Manifest.permission.READ_LOGS,
160+
Manifest.permission.READ_PHONE_STATE,
161+
Manifest.permission.READ_EXTERNAL_STORAGE,
162+
Manifest.permission.SET_DEBUG_APP,
163+
Manifest.permission.SYSTEM_ALERT_WINDOW,
164+
Manifest.permission.GET_ACCOUNTS,
165+
Manifest.permission.WRITE_APN_SETTINGS
166+
};
167+
ActivityCompat.requestPermissions(MainActivity.this, permissionList, 100);
155168
}
156169
})
157170
.show(getSupportFragmentManager(), "permissionDialog");

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
jcenter()
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:3.1.2'
14+
classpath 'com.android.tools.build:gradle:3.1.3'
1515
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
1616
// 热更新插件
1717
// classpath "com.tencent.bugly:tinker-support:1.0.8"

‎dependencies.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ext {
1111
]
1212

1313
// 依赖配置
14+
1415
dependencies = [
1516
appcompat : 'com.android.support:appcompat-v7:' + ext.android.supportVersion,
1617
design : 'com.android.support:design:' + ext.android.supportVersion,
@@ -40,10 +41,16 @@ ext {
4041
roundedImage : 'com.makeramen:roundedimageview:2.3.0',
4142
multidex : 'com.android.support:multidex:1.0.2',
4243
glide : 'com.github.bumptech.glide:glide:4.0.0',
44+
4345
// 友盟统计-公共库
44-
umengCommon : 'com.umeng.sdk:common:1.4.1',
46+
umengCommon : 'com.umeng.sdk:common:1.5.1',
4547
// 友盟统计-APP分析库
46-
umengAnalytics : 'com.umeng.sdk:analytics:7.4.1',
48+
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',
53+
4754
greendao : 'org.greenrobot:greendao:3.2.2',
4855
// 美团渠道包库
4956
walle : 'com.meituan.android.walle:library:1.1.6',
@@ -57,7 +64,6 @@ ext {
5764
swipebacklayout : 'me.imid.swipebacklayout.lib:library:1.1.0',
5865
photoView : 'com.github.chrisbanes:PhotoView:2.1.2',
5966
]
60-
6167
// 注解配置
6268
annotationProcessors = [
6369
butterknife: 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT',

‎module-basic/build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,17 @@ dependencies {
2727
implementation rootProject.ext.dependencies.butterknife
2828
implementation rootProject.ext.dependencies.rxlifecycle
2929
implementation rootProject.ext.dependencies.multidex
30-
implementation rootProject.ext.dependencies.umengCommon
31-
implementation rootProject.ext.dependencies.umengAnalytics
3230
implementation rootProject.ext.dependencies.walle
3331
api rootProject.ext.dependencies.glide
32+
// 友盟
33+
api rootProject.ext.dependencies.umengCommon
34+
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
39+
40+
3441
api(rootProject.ext.dependencies.recyclerview, {
3542
exclude group: 'com.android.support'
3643
})

‎module-home/src/main/res/layout/fm_mine.xml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:background="@color/background_divider"
7-
android:fitsSystemWindows="true">
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:background="@color/background_divider">
87

98
<LinearLayout
109
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
10+
android:layout_height="match_parent"
1211
android:orientation="vertical"
1312
android:paddingBottom="36dp">
1413

14+
<View
15+
android:background="@color/white"
16+
android:layout_width="match_parent"
17+
android:layout_height="@dimen/default_padding_top"/>
18+
1519
<!--头部-->
1620
<RelativeLayout
1721
android:layout_width="match_parent"
@@ -28,7 +32,7 @@
2832
android:layout_height="72dp"
2933
android:scaleType="centerCrop"
3034
android:src="@drawable/boy"
31-
app:riv_corner_radius="72dp" />
35+
app:riv_corner_radius="72dp"/>
3236

3337
<LinearLayout
3438
android:layout_width="wrap_content"
@@ -46,7 +50,7 @@
4650
android:layout_height="wrap_content"
4751
android:text="@string/please_login"
4852
android:textColor="@color/black"
49-
android:textSize="20sp" />
53+
android:textSize="20sp"/>
5054

5155
<TextView
5256
android:id="@+id/tv_introduction"
@@ -55,7 +59,7 @@
5559
android:layout_marginTop="2dp"
5660
android:text="@string/introduction"
5761
android:textColor="@color/ph3"
58-
android:textSize="14sp" />
62+
android:textSize="14sp"/>
5963

6064

6165
</LinearLayout>
@@ -89,15 +93,15 @@
8993
android:text="0"
9094
android:textColor="@color/black"
9195
android:textSize="@dimen/h1"
92-
android:textStyle="bold" />
96+
android:textStyle="bold"/>
9397

9498
<TextView
9599
android:layout_width="wrap_content"
96100
android:layout_height="wrap_content"
97101
android:layout_marginTop="6dp"
98102
android:text="关注"
99103
android:textColor="@color/black"
100-
android:textSize="@dimen/h3" />
104+
android:textSize="@dimen/h3"/>
101105

102106
</LinearLayout>
103107

@@ -116,15 +120,15 @@
116120
android:text="0"
117121
android:textColor="@color/black"
118122
android:textSize="@dimen/h1"
119-
android:textStyle="bold" />
123+
android:textStyle="bold"/>
120124

121125
<TextView
122126
android:layout_width="wrap_content"
123127
android:layout_height="wrap_content"
124128
android:layout_marginTop="6dp"
125129
android:text="粉丝"
126130
android:textColor="@color/black"
127-
android:textSize="@dimen/h3" />
131+
android:textSize="@dimen/h3"/>
128132

129133

130134
</LinearLayout>
@@ -156,7 +160,7 @@
156160
android:gravity="center"
157161
android:text="@string/my_favorites"
158162
android:textColor="#FF555555"
159-
android:textSize="@dimen/h3" />
163+
android:textSize="@dimen/h3"/>
160164

161165
<TextView
162166
android:id="@+id/tv_history"
@@ -168,7 +172,7 @@
168172
android:gravity="center"
169173
android:text="@string/history"
170174
android:textColor="#FF555555"
171-
android:textSize="@dimen/h3" />
175+
android:textSize="@dimen/h3"/>
172176

173177
<FrameLayout
174178
android:id="@+id/ll_system_message"
@@ -187,7 +191,7 @@
187191
android:layout_height="8dp"
188192
android:layout_gravity="end"
189193
android:layout_marginLeft="10dp"
190-
android:background="@drawable/bg_badge" />
194+
android:background="@drawable/bg_badge"/>
191195

192196
<TextView
193197
android:id="@+id/tv_system_message"
@@ -199,7 +203,7 @@
199203
android:gravity="center"
200204
android:text="@string/message_center"
201205
android:textColor="#FF555555"
202-
android:textSize="@dimen/h3" />
206+
android:textSize="@dimen/h3"/>
203207
</FrameLayout>
204208
</FrameLayout>
205209

@@ -213,7 +217,7 @@
213217
android:gravity="center"
214218
android:text="@string/night_mode"
215219
android:textColor="#FF555555"
216-
android:textSize="@dimen/h3" />
220+
android:textSize="@dimen/h3"/>
217221

218222
</LinearLayout>
219223

@@ -234,13 +238,13 @@
234238
android:gravity="center"
235239
android:text="@string/font_setting"
236240
android:textColor="@color/black"
237-
android:textSize="14sp" />
241+
android:textSize="14sp"/>
238242

239243
<TextView
240244
android:layout_width="match_parent"
241245
android:layout_height="wrap_content"
242246
android:layout_marginEnd="12dp"
243-
android:drawableEnd="@drawable/default_right_arrow" />
247+
android:drawableEnd="@drawable/default_right_arrow"/>
244248
</LinearLayout>
245249

246250
<!--意见反馈-->
@@ -259,7 +263,7 @@
259263
android:gravity="center"
260264
android:text="@string/feedback"
261265
android:textColor="@color/black"
262-
android:textSize="14sp" />
266+
android:textSize="14sp"/>
263267

264268
<ImageView
265269
android:id="@+id/img_feedback_badge"
@@ -268,13 +272,13 @@
268272
android:layout_gravity="center"
269273
android:layout_marginStart="10dp"
270274
android:background="@drawable/bg_badge"
271-
android:visibility="invisible" />
275+
android:visibility="invisible"/>
272276

273277
<TextView
274278
android:layout_width="match_parent"
275279
android:layout_height="wrap_content"
276280
android:layout_marginEnd="12dp"
277-
android:drawableEnd="@drawable/default_right_arrow" />
281+
android:drawableEnd="@drawable/default_right_arrow"/>
278282
</LinearLayout>
279283

280284
<!--推荐分享-->
@@ -294,13 +298,13 @@
294298
android:gravity="center"
295299
android:text="@string/share_app"
296300
android:textColor="@color/black"
297-
android:textSize="14sp" />
301+
android:textSize="14sp"/>
298302

299303
<TextView
300304
android:layout_width="match_parent"
301305
android:layout_height="wrap_content"
302306
android:layout_marginEnd="12dp"
303-
android:drawableEnd="@drawable/default_right_arrow" />
307+
android:drawableEnd="@drawable/default_right_arrow"/>
304308
</LinearLayout>
305309
<!--给个好评-->
306310
<LinearLayout
@@ -318,13 +322,13 @@
318322
android:gravity="center"
319323
android:text="@string/praises"
320324
android:textColor="@color/black"
321-
android:textSize="14sp" />
325+
android:textSize="14sp"/>
322326

323327
<TextView
324328
android:layout_width="match_parent"
325329
android:layout_height="wrap_content"
326330
android:layout_marginEnd="12dp"
327-
android:drawableEnd="@drawable/default_right_arrow" />
331+
android:drawableEnd="@drawable/default_right_arrow"/>
328332
</LinearLayout>
329333

330334
<!--更多设置-->
@@ -344,13 +348,13 @@
344348
android:gravity="center"
345349
android:text="@string/setting"
346350
android:textColor="@color/black"
347-
android:textSize="14sp" />
351+
android:textSize="14sp"/>
348352

349353
<TextView
350354
android:layout_width="match_parent"
351355
android:layout_height="wrap_content"
352356
android:layout_marginEnd="12dp"
353-
android:drawableEnd="@drawable/default_right_arrow" />
357+
android:drawableEnd="@drawable/default_right_arrow"/>
354358
</LinearLayout>
355359

356360

‎module-middleware/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dependencies {
4141
implementation rootProject.ext.dependencies.butterknife
4242
implementation rootProject.ext.dependencies.avoscloudSdk
4343
implementation rootProject.ext.dependencies.avoscloudFeedback
44+
4445
api(rootProject.ext.dependencies.swipebacklayout, {
4546
exclude group: 'com.android.support'
4647
})

‎module-middleware/libs/SocialSDK_QQ_Simplify.jar

-52.3 KB
Binary file not shown.

‎module-middleware/libs/SocialSDK_Sina_Simplify.jar

-73.9 KB
Binary file not shown.

‎module-middleware/libs/SocialSDK_WeChat_Simplify.jar

-29.8 KB
Binary file not shown.

‎module-middleware/libs/umeng_social_api.jar

-65.7 KB
Binary file not shown.

‎module-middleware/libs/umeng_social_net.jar

-178 KB
Binary file not shown.

‎module-middleware/libs/umeng_social_tool.jar

-9.59 KB
Binary file not shown.

0 commit comments

Comments
 (0)