Skip to content

Commit 6c371b3

Browse files
raedevraedev
committed
修复请求TAG问题
1 parent 204e0ec commit 6c371b3

File tree

9 files changed

+23
-39
lines changed

9 files changed

+23
-39
lines changed

‎app/build.gradle

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
applicationId "com.rae.cnblogs"
4646
minSdkVersion rootProject.ext.minSdkVersion
4747
targetSdkVersion rootProject.ext.targetSdkVersion
48-
versionCode 5
49-
versionName "1.1.2"
48+
versionCode 6
49+
versionName "1.1.3"
5050
multiDexEnabled true
5151
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
5252
buildConfigField 'String', 'BUGLY_APP_ID', '"' + buglyAppId + '"'
@@ -73,10 +73,6 @@ android {
7373
debug {
7474
minifyEnabled false
7575
debuggable true
76-
// applicationIdSuffix '.debug'
77-
// manifestPlaceholders = [
78-
// UMENG_CHANNEL: 'DEV'
79-
// ]
8076
signingConfig signingConfigs.release
8177
}
8278
release {
@@ -86,26 +82,6 @@ android {
8682
}
8783
}
8884
sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } }
89-
90-
// // 渠道包定义，默认定义的名称就是渠道名称
91-
// productFlavors {
92-
// Dev {} // 测试
93-
//// baidu {} // 百度手机助手
94-
// yinyongbao {} // 应用宝
95-
//// m360 {} // 360手机助手
96-
// pp {} // PP助手
97-
// meizu {} // 魅族
98-
// xiaomi {} // 小米商店
99-
// huawei {} // 华为商店
100-
// official {} // 官方版本
101-
// fir{} // fir内测平台版本
102-
// }
103-
//
104-
// // 批量渠道包值替换
105-
// productFlavors.all { flavor ->
106-
// flavor.manifestPlaceholders = [UMENG_CHANNEL: name, BUGLY_CHANNEL: name]
107-
// }
108-
10985
}
11086

11187
walle {
@@ -114,8 +90,8 @@ walle {
11490
// 定制渠道包的APK的文件名称
11591
apkFileNameFormat = '${appName}-${buildType}-v${versionName}-${channel}.apk'
11692
// 渠道配置文件
117-
// channelFile = new File("${project.getProjectDir()}/config.json")
118-
configFile = new File("${project.getProjectDir()}/config.json")
93+
channelFile = new File("${project.getProjectDir()}/channel")
94+
// configFile = new File("${project.getProjectDir()}/config.json")
11995
}
12096

12197
dependencies {

‎app/src/debug/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
android:supportsRtl="true"
2323
android:theme="@style/AppTheme">
2424

25-
<!--启动页-->
25+
<!-- &lt;!&ndash;启动页&ndash;&gt;
2626
<activity
2727
android:name=".activity.LauncherActivity"
2828
android:theme="@style/AppTheme.NoActionBar.FullScreen"
2929
tools:node="replace"/>
3030
31-
<!--主界面-->
31+
&lt;!&ndash;主界面&ndash;&gt;
3232
<activity
3333
android:name=".activity.MainActivity"
3434
android:theme="@style/AppTheme.Dark"
@@ -38,7 +38,7 @@
3838
3939
<category android:name="android.intent.category.LAUNCHER"/>
4040
</intent-filter>
41-
</activity>
41+
</activity>-->
4242

4343
<!--开始-快速开发需要移除下面的多进程-->
4444
<service

‎app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public void onLoadBloggerInfo(final FriendsInfoBean userInfo) {
251251
}
252252

253253
private void showAvatar(String blogApp, final String url) {
254-
if (TextUtils.isEmpty(url)) return;
254+
if (TextUtils.isEmpty(url) || url.endsWith("simple_avatar.gif")) return;
255255
// 封面图
256256
final String coverUrl = String.format("https://files.cnblogs.com/files/%s/app-cover.bmp", blogApp);
257257
GlideApp.with(this)
@@ -263,8 +263,8 @@ public boolean onLoadFailed(@Nullable GlideException e, Object o, Target<Drawabl
263263
GlideApp.with(getContext())
264264
.load(url)
265265
.centerCrop()
266-
.transition(DrawableTransitionOptions.withCrossFade(600))
267-
.apply(RequestOptions.bitmapTransform(new BlurTransformation(8))) // 高斯模糊
266+
.transition(DrawableTransitionOptions.withCrossFade())
267+
.apply(RequestOptions.bitmapTransform(new BlurTransformation(12))) // 高斯模糊
268268
.into(mBackgroundView);
269269
return true;
270270
}
@@ -278,9 +278,9 @@ public boolean onResourceReady(Drawable drawable, Object o, Target<Drawable> tar
278278
return false;
279279
}
280280
})
281-
.apply(RequestOptions.bitmapTransform(new BlurTransformation(8))) // 高斯模糊
281+
.apply(RequestOptions.bitmapTransform(new BlurTransformation(12))) // 高斯模糊
282282
.centerCrop()
283-
.transition(DrawableTransitionOptions.withCrossFade(600))
283+
.transition(DrawableTransitionOptions.withCrossFade())
284284
.into(mBackgroundView);
285285
}
286286

‎app/src/main/java/com/rae/cnblogs/activity/LauncherActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.support.annotation.Nullable;
55
import android.text.Html;
66
import android.text.TextUtils;
7+
import android.util.Log;
78
import android.widget.ImageView;
89
import android.widget.TextView;
910

@@ -42,6 +43,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
4243
super.onCreate(savedInstanceState);
4344
setContentView(R.layout.activity_launcher);
4445
mLauncherPresenter = CnblogsPresenterFactory.getLauncherPresenter(this, this);
46+
Log.w("rae", "渠道为：" + getChannel());
4547
}
4648

4749
@Override

‎app/src/main/java/com/rae/cnblogs/dialog/impl/MenuDialog.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public void show() {
7575

7676
@Override
7777
public void setMessage(String message) {
78+
mTitleView.setVisibility(View.VISIBLE);
7879
mTitleView.setText(message);
7980
}
8081

‎app/src/main/java/com/rae/cnblogs/presenter/impl/BasePresenter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ public abstract class BasePresenter<V> implements IAppPresenter {
2222
protected Context mApplicationContext;
2323

2424
protected V mView;
25+
private String mTag;
2526

2627

2728
public BasePresenter(Context context, V view) {
29+
mTag = this.getClass().getName();
2830
mView = view;
2931
mContext = context;
3032
mApplicationContext = context.getApplicationContext();
@@ -62,6 +64,7 @@ public void destroy() {
6264
* 释放当前请求
6365
*/
6466
public void cancelRequest() {
67+
RxObservable.dispose(mTag);
6568
RxObservable.dispose();
6669
RxObservable.dispose("thread");
6770
}
@@ -75,7 +78,7 @@ protected boolean isNotLogin() {
7578
}
7679

7780
public <T> Observable<T> createObservable(Observable<T> observable) {
78-
return RxObservable.create(observable);
81+
return RxObservable.create(observable, mTag);
7982
}
8083

8184
/**

‎app/src/main/res/layout/activity_setting.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@
144144
android:id="@+id/ll_about_me"
145145
android:layout_width="match_parent"
146146
android:layout_height="wrap_content"
147-
android:gravity="center_vertical">
147+
android:gravity="center_vertical"
148+
android:visibility="gone">
148149

149150
<TextView
150151
style="@style/ItemStyle"

‎app/src/main/res/layout/dialog_blog_menu.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:layout_height="wrap_content"
1212
android:layout_gravity="center"
1313
android:layout_margin="20dp"
14+
android:visibility="gone"
1415
android:textColor="@color/ph3"
1516
android:textSize="14sp"/>
1617

‎app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string name="tips_loading">正在加载…</string>
2121
<string name="copy_link_success">复制链接成功</string>
2222
<string name="open_browser">浏览器打开</string>
23-
<string name="copyright">Copyright © 2004–2017 cnblogs.com All Rights Reserved</string>
23+
<string name="copyright">Copyright © 2004–2018 cnblogs.com All Rights Reserved</string>
2424
<string name="loading">正在加载…</string>
2525
<string name="signing">正在登录…</string>
2626
<string name="loading_web_user_info">请稍等片刻</string>

0 commit comments

Comments
 (0)