Skip to content

Commit 619ddd5

Browse files
author
ChenRui
committed
登录界面添加注册入口
博文正文优化H5复制代码功能
1 parent ce9e37e commit 619ddd5

File tree

16 files changed

+1709
-100
lines changed

16 files changed

+1709
-100
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
#blog_content{
99
line-height:26px;
1010
}
11+
img{
12+
width: 100%;
13+
}
14+
.code_img_closed, .auto_width{
15+
width: auto;
16+
}
17+
.cnblogs_code_toolbar button{
18+
margin: 10px;
19+
20+
}
1121
.container-fluid{
1222
overflow: auto;
1323
}

‎app/src/main/assets/js/blog-common.js

Lines changed: 1547 additions & 1 deletion
Large diffs are not rendered by default.

‎app/src/main/assets/js/clipboard.min.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ function initImage(){
2929
e.stopPropagation(); // 阻止事件冒泡
3030
var urls = new Array();
3131
$("img").each(function(key,obj){
32-
urls[urls.length] = $(obj).attr("src");
32+
var itemUrl = $(obj).attr("src");
33+
// 过滤图片
34+
if(itemUrl.indexOf("ExpandedBlockStart.gif")!=-1|| itemUrl.indexOf("ContractedBlock.gif")!=-1|| itemUrl.indexOf("copycode.gif")!=-1){
35+
return;
36+
}
37+
urls[urls.length] = itemUrl;
3338
});
3439
var images ="{}"
3540
if(urls.length>0){
@@ -84,4 +89,20 @@ function hex(x) {
8489
return ("0" + parseInt(x).toString(16)).slice(-2);
8590
}
8691
return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
92+
}
93+
94+
function getImageWidth(url,callback){
95+
var img = new Image();
96+
img.src = url;
97+
98+
// 如果图片被缓存，则直接返回缓存数据
99+
if(img.complete){
100+
callback(img.width, img.height);
101+
}else{
102+
// 完全加载完毕的事件
103+
img.onload = function(){
104+
callback(img.width, img.height);
105+
}
106+
}
107+
87108
}

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

Lines changed: 40 additions & 49 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.Context;
44
import android.support.annotation.NonNull;
55
import android.util.AttributeSet;
6-
import android.util.Log;
76
import android.view.View;
87

98
import com.rae.cnblogs.widget.SkinRoundedImageView;
@@ -18,14 +17,10 @@ public class CnblogsLayoutInflater implements SkinLayoutInflater {
1817

1918
@Override
2019
public View createView(@NonNull Context context, String name, @NonNull AttributeSet attrs) {
21-
22-
Log.i("rae-skin", "创建类型：" + name);
23-
2420
switch (name) {
2521
case "com.makeramen.roundedimageview.RoundedImageView":
2622
return new SkinRoundedImageView(context, attrs);
2723
}
28-
2924
return null;
3025
}
3126
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.support.annotation.NonNull;
99
import android.text.TextUtils;
1010
import android.util.AttributeSet;
11-
import android.util.Log;
1211
import android.view.View;
1312
import android.view.Window;
1413

@@ -34,7 +33,6 @@ public final class ThemeCompat {
3433
public static class CnblogsThemeHookInflater implements SkinLayoutInflater {
3534
@Override
3635
public View createView(@NonNull Context context, String name, @NonNull AttributeSet attributeSet) {
37-
Log.i("rae", "addHookInflater创建：" + name);
3836
if (TextUtils.equals("ImageView", name)) {
3937
return new RaeSkinImageView(context, attributeSet);
4038
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
5+
import android.text.Html;
56
import android.text.TextUtils;
67
import android.widget.ImageView;
78
import android.widget.TextView;
@@ -91,7 +92,7 @@ public void onLoadImage(String name, String url) {
9192
onNormalImage();
9293
return;
9394
}
94-
mNameView.setText(name);
95+
mNameView.setText(Html.fromHtml(name));
9596
showImage(url);
9697
}
9798

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import android.widget.EditText;
1717
import android.widget.ImageView;
1818

19+
import com.rae.cnblogs.AppMobclickAgent;
1920
import com.rae.cnblogs.AppRoute;
2021
import com.rae.cnblogs.AppUI;
2122
import com.rae.cnblogs.R;
@@ -35,8 +36,7 @@
3536
* 登录
3637
* Created by ChenRui on 2017/1/19 0019 9:59.
3738
*/
38-
public class LoginActivity extends BaseActivity implements ILoginPresenter.ILoginView
39-
{
39+
public class LoginActivity extends BaseActivity implements ILoginPresenter.ILoginView {
4040

4141
@BindView(com.rae.cnblogs.R.id.ll_login_container)
4242
View mLoginLayout;
@@ -170,23 +170,25 @@ public void onPasswordDeleteClick() {
170170
* 忘记密码
171171
*/
172172
@OnClick(R.id.tv_forget_password)
173-
public void onForgetPassword() {
173+
public void onForgetPasswordClick() {
174+
AppMobclickAgent.onClickEvent(this,"ForgetPassword");
174175
AppRoute.jumpToWeb(this, getString(R.string.forget_password_url));
175176
}
176177

178+
/**
179+
* 注册账号
180+
*/
181+
@OnClick(R.id.tv_reg)
182+
public void onRegClick() {
183+
AppMobclickAgent.onClickEvent(this,"Reg");
184+
AppRoute.jumpToWeb(this, getString(R.string.reg_url));
185+
}
186+
177187
/**
178188
* 登录点击
179189
*/
180190
@OnClick(R.id.btn_login)
181191
public void onLoginClick() {
182-
// if (BuildConfig.DEBUG) {
183-
// CnblogsApiFactory.getInstance(this).getUserApi();
184-
// UserProvider.getInstance().debugLogin();
185-
// finish();
186-
// return;
187-
// }
188-
189-
190192
if (config().hasLoginGuide()) {
191193
preformLogin();
192194
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ public void onShare(ShareDialog dialog) {
6565

6666
String url = mWebViewFragment.getUrl();
6767
if (!url.contains("?")) {
68-
url += "?share_from=rae_cnblogs";
68+
url += "?share_from=com.rae.cnblogs";
6969
}
7070
if (url.contains("&")) {
71-
url += "&share_from=rae_cnblogs";
71+
url += "&share_from=com.rae.cnblogs";
7272
}
7373

74-
dialog.setShareWeb(url, getTitle().toString(), String.format("%s - 来自博客园APP", getTitle()), null);
74+
dialog.setShareWeb(url, getTitle().toString(), String.format("%s - 分享自博客园APP", getTitle()), null);
7575
}
7676
});
7777
mShareDialog.setExtVisibility(View.GONE);

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
import com.rae.cnblogs.ThemeCompat;
2222
import com.rae.cnblogs.sdk.ApiDefaultObserver;
2323
import com.rae.cnblogs.sdk.CnblogsApiFactory;
24+
import com.rae.cnblogs.sdk.CnblogsReportException;
2425
import com.rae.cnblogs.sdk.UserProvider;
2526
import com.rae.cnblogs.sdk.api.IUserApi;
2627
import com.rae.cnblogs.sdk.bean.FriendsInfoBean;
2728
import com.rae.cnblogs.sdk.bean.UserInfoBean;
29+
import com.tencent.bugly.crashreport.CrashReport;
2830

2931
import java.util.List;
3032

@@ -277,17 +279,21 @@ public void onNightClick() {
277279
* 检查是否有新的意见反馈回复消息
278280
*/
279281
private void checkFeedbackMessage() {
280-
final int originalCount = FeedbackThread.getInstance().getCommentsList().size();
281-
FeedbackThread.getInstance().sync(new FeedbackThread.SyncCallback() {
282-
@Override
283-
public void onCommentsSend(List<Comment> list, AVException e) {
284-
285-
}
286-
287-
@Override
288-
public void onCommentsFetch(List<Comment> list, AVException e) {
289-
mFeedbackBadgeView.setVisibility(list.size() > originalCount ? View.VISIBLE : View.INVISIBLE);
290-
}
291-
});
282+
try {
283+
final int originalCount = FeedbackThread.getInstance().getCommentsList().size();
284+
FeedbackThread.getInstance().sync(new FeedbackThread.SyncCallback() {
285+
@Override
286+
public void onCommentsSend(List<Comment> list, AVException e) {
287+
288+
}
289+
290+
@Override
291+
public void onCommentsFetch(List<Comment> list, AVException e) {
292+
mFeedbackBadgeView.setVisibility(list.size() > originalCount ? View.VISIBLE : View.INVISIBLE);
293+
}
294+
});
295+
} catch (Exception e) {
296+
CrashReport.postCatchedException(new CnblogsReportException("意见反馈发生异常！", e));
297+
}
292298
}
293299
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,17 @@ protected void accept(AdvertBean advertBean) {
113113

114114

115115
private void onSuccess(AdvertBean data) {
116-
mAdvertBean = data;
117-
if (mAdvertBean == null || TextUtils.isEmpty(data.getImage_url())) {
116+
if (data == null || TextUtils.isEmpty(data.getImage_url())) {
118117
mView.onNormalImage();
119118
return;
120119
}
121120
// 过期检查
122-
long endTime = ApiUtils.parseDefaultDate(mAdvertBean.getAd_end_date()).getTime();
121+
long endTime = ApiUtils.parseDefaultDate(data.getAd_end_date()).getTime();
123122
if (System.currentTimeMillis() > endTime) {
124123
mView.onNormalImage();
125124
} else {
126125
// 统计
126+
mAdvertBean = data;
127127
AppMobclickAgent.onLaunchAdExposureEvent(mContext, mAdvertBean.getAd_id(), mAdvertBean.getAd_name());
128128
mView.onLoadImage(mAdvertBean.getAd_name(), mAdvertBean.getImage_url());
129129
}

‎app/src/main/java/com/rae/cnblogs/widget/RaeSkinImageView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public RaeSkinImageView(Context context, AttributeSet attrs, int defStyleAttr) {
2626

2727
private void init() {
2828
// 初始化的时候不用取反
29-
setAlpha(ThemeCompat.isNight() ? 0.5f : 1f);
29+
setAlpha(ThemeCompat.isNight() ? 0.3f : 1f);
3030
}
3131

3232
@Override
3333
public void applySkin() {
3434
super.applySkin();
35-
setAlpha(isNight() ? 0.5f : 1f);
35+
setAlpha(isNight() ? 0.3f : 1f);
3636
}
3737

3838
public boolean isNight() {

0 commit comments

Comments
 (0)