Skip to content

Commit 3c4d36c

Browse files
raeeraee
committed
解决删除收藏未更新问题。
1 parent ec28433 commit 3c4d36c

File tree

10 files changed

+26
-62
lines changed

10 files changed

+26
-62
lines changed

‎app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ dependencies {
117117
implementation 'com.makeramen:roundedimageview:2.3.0'
118118
implementation 'com.github.bumptech.glide:glide:4.0.0'
119119
annotationProcessor 'com.github.bumptech.glide:compiler:4.0.0'
120-
implementation 'com.umeng.analytics:analytics:6.1.3'
120+
implementation 'com.umeng.sdk:common:1.4.1'
121+
implementation 'com.umeng.sdk:analytics:7.4.1'
121122
implementation 'org.greenrobot:eventbus:3.1.1'
122123
implementation 'me.imid.swipebacklayout.lib:library:1.1.0'
123124
implementation 'com.github.chrisbanes:PhotoView:2.1.2'

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,9 @@
146146
android:noHistory="true">
147147
<intent-filter>
148148
<action android:name="android.intent.action.VIEW"/>
149-
150149
<category android:name="android.intent.category.DEFAULT"/>
151150
<category android:name="android.intent.category.BROWSABLE"/>
152-
153-
<data android:scheme="tencent1104927843"/>
151+
<data android:scheme="tencent1105927778"/>
154152
</intent-filter>
155153
</activity>
156154

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
import com.meituan.android.walle.WalleChannelReader;
1212
import com.rae.cnblogs.sdk.UserProvider;
1313
import com.rae.cnblogs.sdk.bean.UserInfoBean;
14+
import com.rae.cnblogs.sdk.config.CnblogSdkConfig;
1415
import com.rae.cnblogs.sdk.db.DbFactory;
1516
import com.rae.swift.session.SessionManager;
1617
import com.tencent.bugly.Bugly;
1718
import com.tencent.tinker.loader.app.TinkerApplication;
1819
import com.tencent.tinker.loader.shareutil.ShareConstants;
19-
import com.umeng.analytics.MobclickAgent;
20+
import com.umeng.commonsdk.UMConfigure;
2021
import com.umeng.socialize.PlatformConfig;
2122
import com.umeng.socialize.UMShareAPI;
2223

@@ -85,16 +86,17 @@ public void clearCache() {
8586
}
8687

8788
/**
88-
* 友盟分享
89+
* 友盟
8990
*/
9091
private void initUmengConfig() {
91-
MobclickAgent.setCatchUncaughtExceptions(false);
9292
// 初始化友盟
93-
MobclickAgent.startWithConfigure(new MobclickAgent.UMAnalyticsConfig(this, BuildConfig.UMENG_APPKEY, getChannel()));
93+
UMConfigure.setLogEnabled(BuildConfig.DEBUG);
94+
UMConfigure.init(this, BuildConfig.UMENG_APPKEY, getChannel(), UMConfigure.DEVICE_TYPE_PHONE, null);
9495
UMShareAPI.get(getApplication());
9596
PlatformConfig.setWeixin(AppConstant.WECHAT_APP_ID, AppConstant.WECHAT_APP_SECRET);
9697
PlatformConfig.setSinaWeibo(AppConstant.WEIBO_APP_ID, AppConstant.WEIBO_APP_SECRET, "http://www.raeblog.com/cnblogs/index.php/share/weibo/redirect");
9798
PlatformConfig.setQQZone(AppConstant.QQ_APP_ID, AppConstant.QQ_APP_SECRET);
99+
CnblogSdkConfig.APP_CHANNEL = getChannel();
98100
}
99101

100102
public Application getApplication() {
@@ -107,7 +109,7 @@ public Application getApplication() {
107109
*/
108110
public String getChannel() {
109111
String channel = WalleChannelReader.getChannel(this.getApplicationContext());
110-
return TextUtils.isEmpty(channel) ? "UNKNOWN" : channel;
112+
return TextUtils.isEmpty(channel) ? CnblogSdkConfig.APP_CHANNEL : channel;
111113
}
112114

113115
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public void onFollowSuccess() {
331331

332332
@Override
333333
public void onNotLogin() {
334-
AppUI.toastInCenter(getContext(), getString(R.string.blogger_need_login));
334+
// AppUI.toastInCenter(getContext(), getString(R.string.blogger_need_login));
335335
AppRoute.jumpToLogin(this);
336336
finish();
337337
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ public class MainActivity extends BaseActivity {
6666
protected void onCreate(Bundle savedInstanceState) {
6767
super.onCreate(savedInstanceState);
6868
setContentView(R.layout.activity_main);
69-
// if (!BuildConfig.DEBUG) {
70-
// // 跳启动页
71-
// startActivity(new Intent(this, LauncherActivity.class));
72-
// }
73-
7469
EventBus.getDefault().register(this);
7570
mServiceConnection = new ServiceConnection() {
7671
@Override

‎app/src/main/java/com/rae/cnblogs/fragment/HomeFragment.java

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33
import android.app.Activity;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
76
import android.support.annotation.Nullable;
8-
import android.support.design.widget.AppBarLayout;
97
import android.support.design.widget.CoordinatorLayout;
108
import android.support.design.widget.DesignTabLayout;
119
import android.support.v4.view.ViewPager;
12-
import android.util.Log;
13-
import android.view.MotionEvent;
1410
import android.view.View;
1511
import android.view.animation.Animation;
1612
import android.view.animation.AnimationUtils;
@@ -84,44 +80,6 @@ public void onDestroy() {
8480
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
8581
super.onActivityCreated(savedInstanceState);
8682
mHomePresenter.start();
87-
CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) mViewPager.getLayoutParams();
88-
lp.setBehavior(new AppBarLayout.ScrollingViewBehavior() {
89-
@Override
90-
public boolean onInterceptTouchEvent(CoordinatorLayout parent, View child, MotionEvent ev) {
91-
Log.d("rae-layout", "onInterceptTouchEvent" + ev);
92-
return super.onInterceptTouchEvent(parent, child, ev);
93-
}
94-
95-
@Override
96-
public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
97-
Log.d("rae-layout", "layoutDependsOn：" + dependency);
98-
return super.layoutDependsOn(parent, child, dependency);
99-
}
100-
101-
@Override
102-
public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
103-
Log.d("rae-layout", "onDependentViewChanged：" + dependency);
104-
return super.onDependentViewChanged(parent, child, dependency);
105-
}
106-
107-
@Override
108-
public void onNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View child, @NonNull View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, int type) {
109-
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type);
110-
Log.d("rae-layout", "onNestedScroll：" + type);
111-
}
112-
113-
@Override
114-
public boolean onNestedFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View child, @NonNull View target, float velocityX, float velocityY, boolean consumed) {
115-
Log.d("rae-layout", "onNestedFling：" + velocityY);
116-
return super.onNestedFling(coordinatorLayout, child, target, velocityX, velocityY, consumed);
117-
}
118-
119-
@Override
120-
public void onNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View child, @NonNull View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
121-
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
122-
Log.d("rae-layout", "onNestedScroll：" + target);
123-
}
124-
});
12583
}
12684

12785
@OnClick(R.id.img_edit_category)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
android:textColor="@color/ph4"
6868
android:textSize="11sp"/>
6969

70-
<com.rae.cnblogs.widget.QMUISpanTouchFixTextView
70+
<com.rae.cnblogs.widget.RaeTextView
7171
android:id="@+id/tv_blog_summary"
7272
android:layout_width="wrap_content"
7373
android:layout_height="wrap_content"

‎sdk/src/main/java/com/rae/cnblogs/sdk/config/CnblogSdkConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public class CnblogSdkConfig {
1919
// public static final String API_PUB_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCp0wHYbg/NOPO3nzMD3dndwS0MccuMeXCHgVlGOoYyFwLdS24Im2e7YyhB0wrUsyYf0/nhzCzBK8ZC9eCWqd0aHbdgOQT6CuFQBMjbyGYvlVYU2ZP7kG9Ft6YV6oc9ambuO7nPZh+bvXH0zDKfi02prknrScAKC0XhadTHT3Al0QIDAQAB";
2020
public static final byte[] API_PUB_KEY_BYTE = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCp0wHYbg/NOPO3nzMD3dndwS0MccuMeXCHgVlGOoYyFwLdS24Im2e7YyhB0wrUsyYf0/nhzCzBK8ZC9eCWqd0aHbdgOQT6CuFQBMjbyGYvlVYU2ZP7kG9Ft6YV6oc9ambuO7nPZh+bvXH0zDKfi02prknrScAKC0XhadTHT3Al0QIDAQAB".getBytes();
2121

22+
/**
23+
* 渠道
24+
*/
25+
public static String APP_CHANNEL = "official";
2226

2327
private static CnblogSdkConfig sInstance;
2428
private Gson mGson = new Gson();

‎sdk/src/main/java/com/rae/cnblogs/sdk/db/DbBlog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void run() {
106106
.leftJoin(BlogBean.class).as("b")
107107
.on("a.blogId=b.blogId")
108108
.where("a.isBookmarks=?", 1)
109-
.and("b.url=?", url)
109+
.and("b.url like ?", String.format("%%%s%%", url))
110110
.executeSingle();
111111

112112

‎sdk/src/main/java/com/rae/cnblogs/sdk/interceptor/RequestInterceptor.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import android.webkit.CookieManager;
1111
import android.webkit.CookieSyncManager;
1212

13+
import com.rae.cnblogs.sdk.BuildConfig;
1314
import com.rae.cnblogs.sdk.JsonBody;
1415
import com.rae.cnblogs.sdk.UserProvider;
16+
import com.rae.cnblogs.sdk.config.CnblogSdkConfig;
1517

1618
import java.io.IOException;
1719
import java.net.URLDecoder;
@@ -70,9 +72,13 @@ public Response intercept(@NonNull Chain chain) throws IOException {
7072
Request.Builder newBuilder = request.newBuilder();
7173

7274
// 添加版本号
73-
// newBuilder.addHeader("APP-PACKAGE-NAME", this.packageName);
74-
// newBuilder.addHeader("APP-VERSION-NAME", this.versionName);
75-
// newBuilder.addHeader("APP-VERSION-CODE", String.valueOf(this.versionCode));
75+
if (request.url().host().contains("rae")) {
76+
newBuilder.addHeader("APP-PACKAGE-NAME", this.packageName);
77+
newBuilder.addHeader("APP-VERSION-NAME", this.versionName);
78+
newBuilder.addHeader("App-CHANNEL", CnblogSdkConfig.APP_CHANNEL);
79+
newBuilder.addHeader("App-ENV", BuildConfig.BUILD_TYPE);
80+
newBuilder.addHeader("APP-VERSION-CODE", String.valueOf(this.versionCode));
81+
}
7682

7783
// 使用Chrome的User-Agent
7884
newBuilder

0 commit comments

Comments
 (0)