Skip to content

Commit 0e77209

Browse files
raedevraedev
committed
添加关于我们、解决dialog dismiss 覆盖问题，最小版本号改为19
1 parent 165cfdb commit 0e77209

File tree

19 files changed

+181
-248
lines changed

19 files changed

+181
-248
lines changed

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.rae.cnblogs.basic.AppFragmentAdapter;
2323
import com.rae.cnblogs.basic.BasicActivity;
2424
import com.rae.cnblogs.basic.rx.AndroidObservable;
25-
import com.rae.cnblogs.basic.rx.DefaultEmptyObserver;
2625
import com.rae.cnblogs.blog.CnblogsService;
2726
import com.rae.cnblogs.dialog.DefaultDialogFragment;
2827
import com.rae.cnblogs.dialog.VersionDialogFragment;
@@ -40,8 +39,6 @@
4039

4140
import org.greenrobot.eventbus.EventBus;
4241

43-
import java.util.concurrent.TimeUnit;
44-
4542
import butterknife.BindView;
4643

4744
@Route(path = AppRoute.PATH_APP_HOME)
@@ -66,12 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
6663
initTab();
6764

6865
// 请求权限
69-
AndroidObservable.create(io.reactivex.Observable.timer(3, TimeUnit.SECONDS)).with(this).subscribe(new DefaultEmptyObserver<Long>() {
70-
@Override
71-
public void onNext(Long aLong) {
72-
requestPermissions();
73-
}
74-
});
66+
requestPermissions();
67+
7568
// 启动服务
7669
startService(new Intent(this, CnblogsService.class));
7770
if (BuildConfig.DEBUG) {
@@ -187,9 +180,7 @@ public void onTabReselected(RaeTabLayout.Tab tab) {
187180

188181
private void requestPermissions() {
189182
// 检查权限
190-
191183
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
192-
193184
new DefaultDialogFragment
194185
.Builder()
195186
.message(getString(R.string.permission_request_message))
@@ -200,7 +191,9 @@ private void requestPermissions() {
200191
String[] permissionList = new String[]{
201192
Manifest.permission.WRITE_EXTERNAL_STORAGE,
202193
Manifest.permission.ACCESS_FINE_LOCATION,
203-
Manifest.permission.CALL_PHONE,
194+
Manifest.permission.ACCESS_NETWORK_STATE,
195+
Manifest.permission.CAMERA,
196+
// Manifest.permission.CALL_PHONE,
204197
Manifest.permission.READ_LOGS,
205198
Manifest.permission.READ_PHONE_STATE,
206199
Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -211,7 +204,7 @@ private void requestPermissions() {
211204
};
212205
ActivityCompat.requestPermissions(MainActivity.this, permissionList, 100);
213206
})
214-
.show(getSupportFragmentManager(), "permissionDialog");
207+
.show(getSupportFragmentManager());
215208

216209
}
217210
}

‎dependencies.gradle

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

‎module-blog/src/main/res/layout/fm_blog_home.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:id="@+id/img_actionbar_logo"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
32-
android:layout_marginStart="24dp"
32+
android:layout_marginStart="12dp"
3333
android:layout_marginEnd="24dp"
3434
android:scaleType="fitCenter"
3535
android:src="@drawable/ic_logo_small"

‎module-home/src/main/java/com/rae/cnblogs/home/AboutMeActivity.java

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,53 @@
11
package com.rae.cnblogs.home;
22

3+
import android.content.DialogInterface;
4+
import android.content.Intent;
5+
import android.net.Uri;
36
import android.os.Bundle;
47
import android.support.annotation.Nullable;
8+
import android.widget.TextView;
59

610
import com.alibaba.android.arouter.facade.annotation.Route;
711
import com.rae.cnblogs.AppRoute;
12+
import com.rae.cnblogs.activity.SwipeBackBasicActivity;
13+
import com.rae.cnblogs.basic.ApplicationCompat;
14+
import com.rae.cnblogs.dialog.DefaultDialogFragment;
815

9-
import me.imid.swipebacklayout.lib.app.SwipeBackActivity;
16+
import butterknife.BindView;
17+
import butterknife.OnClick;
1018

1119
/**
1220
* Created by rae on 2018/12/17.
1321
* Copyright (c) https://github.com/raedev All rights reserved.
1422
*/
1523
@Route(path = AppRoute.PATH_ABOUT_ME)
16-
public class AboutMeActivity extends SwipeBackActivity {
24+
public class AboutMeActivity extends SwipeBackBasicActivity {
25+
26+
@BindView(R2.id.tv_version_code)
27+
TextView mVersionName;
1728

1829
@Override
1930
protected void onCreate(@Nullable Bundle savedInstanceState) {
2031
super.onCreate(savedInstanceState);
2132
setContentView(R.layout.activity_about_me);
33+
String version = "v" + ApplicationCompat.getVersionName(this);
34+
mVersionName.setText(version);
35+
}
36+
37+
@OnClick(R2.id.tv_mine_name)
38+
public void onMeClick() {
39+
new DefaultDialogFragment.Builder()
40+
.message("感谢大佬关注！")
41+
.confirmText("FIND ME IN GITHUB")
42+
.confirm(new DialogInterface.OnClickListener() {
43+
@Override
44+
public void onClick(DialogInterface dialog, int which) {
45+
dialog.dismiss();
46+
Intent intent = new Intent(Intent.ACTION_VIEW);
47+
intent.setData(Uri.parse("https://github.com/raedev"));
48+
startActivity(intent);
49+
}
50+
})
51+
.show(getSupportFragmentManager(), "aboutMe");
2252
}
2353
}

‎module-home/src/main/java/com/rae/cnblogs/home/LauncherActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
4949
setContentView(R.layout.activity_launcher);
5050
mPresenter = new LauncherPresenterImpl(this);
5151

52-
if (BuildConfig.DEBUG) {
53-
onRouteToHome();
54-
}
52+
// if (BuildConfig.DEBUG) {
53+
// onRouteToHome();
54+
// }
5555
}
5656

5757

‎module-home/src/main/java/com/rae/cnblogs/home/MineFragment.java

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525

2626
import butterknife.BindView;
2727
import butterknife.OnClick;
28+
import skin.support.SkinCompatManager;
29+
import skin.support.observe.SkinObservable;
30+
import skin.support.observe.SkinObserver;
2831

2932
/**
3033
* 我的
@@ -34,6 +37,8 @@
3437
public class MineFragment extends BasicFragment implements MineContract.View {
3538

3639

40+
private SkinObserver mSkinObserver;
41+
3742
public static MineFragment newInstance() {
3843
return new MineFragment();
3944
}
@@ -77,19 +82,41 @@ protected int getLayoutId() {
7782
public void onCreate(@Nullable Bundle savedInstanceState) {
7883
super.onCreate(savedInstanceState);
7984
mPresenter = new MinePresenterImpl(this);
85+
mSkinObserver = new SkinObserver() {
86+
@Override
87+
public void updateSkin(SkinObservable observable, Object o) {
88+
onThemeChanged();
89+
}
90+
};
91+
SkinCompatManager.getInstance().addObserver(mSkinObserver);
8092
}
8193

8294
@Override
8395
public void onDestroy() {
8496
super.onDestroy();
97+
if (mSkinObserver != null) {
98+
SkinCompatManager.getInstance().deleteObserver(mSkinObserver);
99+
}
85100
mPresenter.destroy();
86101
}
87102

88103
@Override
89104
public void onStart() {
90105
super.onStart();
91106
// 夜间模式处理
92-
mNightModeView.setSelected(ThemeCompat.isNight());
107+
onThemeChanged();
108+
109+
}
110+
111+
// 夜间模式处理
112+
private void onThemeChanged() {
113+
if (ThemeCompat.isNight()) {
114+
mNightModeView.setSelected(true);
115+
mNightModeView.setText("日间模式");
116+
} else {
117+
mNightModeView.setSelected(false);
118+
mNightModeView.setText("夜间模式");
119+
}
93120
}
94121

95122

‎module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.rae.cnblogs.home.fragment.HotSearchFragment;
2525
import com.rae.cnblogs.home.fragment.SearchResultFragment;
2626
import com.rae.cnblogs.home.fragment.SearchSuggestFragment;
27+
import com.rae.cnblogs.sdk.CnblogsApiFactory;
2728
import com.rae.cnblogs.sdk.event.SearchEvent;
2829
import com.rae.cnblogs.user.R2;
2930
import com.rae.cnblogs.user.friends.ISearchListener;
@@ -145,8 +146,8 @@ private void performSearch(String text) {
145146

146147
// 埋点
147148
AppMobclickAgent.onSearchEvent(this, text);
148-
// 保存搜索记录
149-
// saveHistory(text);
149+
// raedev.io 记录热搜
150+
CnblogsApiFactory.getInstance(this).getRaeServerApi().search(text).subscribe();
150151
}
151152

152153
@OnClick(R2.id.img_edit_delete)

‎module-home/src/main/res/drawable-v24/ic_launcher_foreground.xml

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

0 commit comments

Comments
 (0)