Skip to content

Commit 8134a69

Browse files
raeeraee
committed
完成字体设置功能
支持mathjax插件显示数学公式 个人信息中增加园龄字段
1 parent a153c57 commit 8134a69

File tree

18 files changed

+241
-79
lines changed

18 files changed

+241
-79
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
android:name=".activity.MainActivity"
4040
android:screenOrientation="portrait"
4141
android:theme="@style/AppTheme.Dark">
42-
<!-- <intent-filter>
42+
<intent-filter>
4343
<action android:name="android.intent.action.MAIN"/>
4444

4545
<category android:name="android.intent.category.LAUNCHER"/>
46-
</intent-filter>-->
46+
</intent-filter>
4747
</activity>
4848

4949
<activity
@@ -131,13 +131,7 @@
131131
<activity
132132
android:name=".activity.FontSettingActivity"
133133
android:label="@string/font_setting"
134-
android:screenOrientation="portrait">
135-
<intent-filter>
136-
<action android:name="android.intent.action.MAIN"/>
137-
138-
<category android:name="android.intent.category.LAUNCHER"/>
139-
</intent-filter>
140-
</activity>
134+
android:screenOrientation="portrait"/>
141135

142136
<service
143137
android:name=".service.CnblogsService"
@@ -200,6 +194,10 @@
200194
</intent-filter>
201195

202196
</activity>
197+
<activity
198+
android:name=".activity.CommentActivity"
199+
android:label="@string/label_comment"
200+
android:screenOrientation="portrait"/>
203201

204202
<provider
205203
android:name="android.support.v4.content.FileProvider"

‎app/src/main/assets/css/rae.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ h5{
2020
h6{
2121
font-size: 14px;
2222
}
23+
a{
24+
-webkit-tap-highlight-color:rgba(0,0,0,0);
25+
-webkit-tap-highlight-color: transparent;
26+
outline:none;
27+
background: none;
28+
text-decoration: none;
29+
}
2330
#header{
2431
padding-bottom:20px;
2532
}

‎app/src/main/assets/view.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// }
4747

4848
// };
49-
49+
var cb_enable_mathjax=true;
5050
var width = 0;
5151
// 加载主题
5252
function loadTheme(isNightMode){
@@ -176,7 +176,10 @@
176176
initImage();
177177
// 重新设置代码高亮
178178
refreshCodeTheme();
179+
180+
cb_mathjax_render();
179181
}catch(e){
182+
alert(e);
180183
console.error(e);
181184
}
182185

@@ -186,6 +189,8 @@
186189

187190

188191

192+
193+
189194
</script>
190195
</head>
191196
<body>
@@ -215,6 +220,8 @@
215220

216221

217222

223+
224+
218225
</script>
219226

220227
<h3 id="blog_title" class="clearfix">库朗等指出需要引进的点数至多为，此种点称为斯坦纳点。</h3>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import com.rae.cnblogs.activity.BlogContentActivity;
1111
import com.rae.cnblogs.activity.BloggerActivity;
1212
import com.rae.cnblogs.activity.CategoryActivity;
13+
import com.rae.cnblogs.activity.CommentActivity;
1314
import com.rae.cnblogs.activity.FavoritesActivity;
1415
import com.rae.cnblogs.activity.FeedbackActivity;
16+
import com.rae.cnblogs.activity.FontSettingActivity;
1517
import com.rae.cnblogs.activity.FriendsActivity;
1618
import com.rae.cnblogs.activity.LoginActivity;
1719
import com.rae.cnblogs.activity.MainActivity;
@@ -289,4 +291,21 @@ public static void jumpToSearchKb(Context context) {
289291
public static void jumpToSystemMessage(Context context) {
290292
startActivity(context, SystemMessageActivity.class);
291293
}
294+
295+
/**
296+
* 字体设置
297+
*/
298+
public static void jumpToFontSetting(Context context) {
299+
startActivity(context, FontSettingActivity.class);
300+
}
301+
302+
/**
303+
* 博客评论
304+
*/
305+
public static void jumpToComment(Context context, BlogBean blog, BlogType type) {
306+
Intent intent = new Intent(context, CommentActivity.class);
307+
intent.putExtra("type", type);
308+
intent.putExtra("blog", blog);
309+
startActivity(context, intent);
310+
}
292311
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ public void onActionMenuMoreClick() {
242242
// 查看评论
243243
@OnClick(R.id.layout_content_comment)
244244
public void onCommentClick() {
245-
mCommentLayout.toggleSmoothScroll();
245+
AppRoute.jumpToComment(this, mBlog, mBlogType);
246+
// mCommentLayout.toggleSmoothScroll();
246247
}
247248

248249
// 发表评论

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public class BloggerActivity extends SwipeBackBaseActivity implements IBloggerPr
6262
@BindView(R.id.tv_fans_count)
6363
TextView mFansCountView;
6464

65+
@BindView(R.id.tv_age)
66+
TextView mSnsAgeView;
67+
6568
@BindView(R.id.btn_blogger_follow)
6669
Button mFollowView;
6770

@@ -177,6 +180,9 @@ public void onLoadBloggerInfo(final FriendsInfoBean userInfo) {
177180
mFollowLayout.setClickable(true);
178181
mFollowView.setEnabled(true);
179182

183+
if (!TextUtils.isEmpty(userInfo.getSnsAge())) {
184+
mSnsAgeView.setText(userInfo.getSnsAge());
185+
}
180186

181187
// 如果是自己，则隐藏关注按钮
182188
if (UserProvider.getInstance().isLogin() && TextUtils.equals(mBlogApp, UserProvider.getInstance().getLoginUserInfo().getBlogApp())) {

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
5+
import android.util.TypedValue;
56
import android.widget.SeekBar;
67
import android.widget.TextView;
78

89
import com.rae.cnblogs.R;
10+
import com.rae.cnblogs.widget.RaeSeekBar;
911

1012
import butterknife.BindView;
1113

@@ -17,36 +19,25 @@ public class FontSettingActivity extends SwipeBackBaseActivity {
1719
@BindView(R.id.tv_message)
1820
TextView mMessage;
1921
@BindView(R.id.seekBar)
20-
SeekBar mSeekBar;
22+
RaeSeekBar mSeekBar;
2123

2224
@Override
2325
protected void onCreate(@Nullable Bundle savedInstanceState) {
2426
super.onCreate(savedInstanceState);
2527
setContentView(R.layout.activity_font_setting);
2628
showHomeAsUp();
2729

30+
int size = config().getPageTextSize();
31+
if (size > 0) {
32+
mSeekBar.setTextSize(size);
33+
mMessage.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
34+
}
2835

2936
mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
3037
@Override
3138
public void onProgressChanged(SeekBar seekBar, int value, boolean b) {
32-
switch (value) {
33-
case 0:
34-
mMessage.setTextSize(14);
35-
break;
36-
case 1:
37-
mMessage.setTextSize(16);
38-
break;
39-
case 2:
40-
mMessage.setTextSize(18);
41-
break;
42-
case 3:
43-
mMessage.setTextSize(24);
44-
break;
45-
case 4:
46-
mMessage.setTextSize(26);
47-
break;
48-
}
49-
39+
int size = mSeekBar.getRawTextSize(value);
40+
mMessage.setTextSize(size);
5041
}
5142

5243
@Override
@@ -60,4 +51,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
6051
}
6152
});
6253
}
54+
55+
@Override
56+
protected void onDestroy() {
57+
// 保存设置
58+
config().setPageTextSize(mSeekBar.getTextSize(mSeekBar.getProgress()));
59+
super.onDestroy();
60+
}
6361
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ public void onPraisesClick() {
213213
}
214214
}
215215

216+
@OnClick(R.id.ll_font_setting)
217+
public void onFontSettingClick() {
218+
AppRoute.jumpToFontSetting(this);
219+
}
220+
216221
@Override
217222
protected void onDestroy() {
218223
super.onDestroy();

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.support.annotation.Nullable;
88
import android.support.v4.content.ContextCompat;
99
import android.util.Log;
10+
import android.util.TypedValue;
1011
import android.view.View;
1112
import android.webkit.JavascriptInterface;
1213
import android.webkit.WebSettings;
@@ -92,7 +93,18 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
9293
@Override
9394
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
9495
super.onViewCreated(view, savedInstanceState);
95-
mWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
96+
// mWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
97+
mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
98+
99+
// 设置字体大小
100+
int pageTextSize = config().getPageTextSize();
101+
if (pageTextSize > 0) {
102+
// 默认字体大小
103+
int defaultTextSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 18, getResources().getDisplayMetrics());
104+
int zoom = mWebView.getSettings().getTextZoom() * pageTextSize / defaultTextSize;
105+
mWebView.getSettings().setTextZoom(zoom);
106+
}
107+
96108

97109
mPlaceholderView.setOnRetryClickListener(new View.OnClickListener() {
98110
@Override

0 commit comments

Comments
 (0)