Skip to content

Commit c5148ea

Browse files
author
ChenRui
committed
添加闪存详情，查看闪存评论页面
1 parent 935cfd1 commit c5148ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1189
-56
lines changed

‎app/build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ android {
6666
]
6767
}
6868
buildTypes {
69-
release {
70-
minifyEnabled false
71-
signingConfig signingConfigs.release
72-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
73-
}
7469
debug {
7570
minifyEnabled false
7671
debuggable true
@@ -80,12 +75,21 @@ android {
8075
]
8176
signingConfig signingConfigs.release
8277
}
78+
release {
79+
minifyEnabled false
80+
signingConfig signingConfigs.release
81+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
82+
}
83+
beta {
84+
initWith release
85+
versionNameSuffix rootProject.hasProperty("buildNum") ? '.beta-' + rootProject.property("buildNum") : ''
86+
}
8387
}
8488
sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } }
8589

8690
// 渠道包定义，默认定义的名称就是渠道名称
8791
productFlavors {
88-
DEV {} // 测试
92+
Dev {} // 测试
8993
baidu {} // 百度手机助手
9094
yinyongbao {} // 应用宝
9195
m360 {} // 360手机助手
@@ -113,6 +117,7 @@ dependencies {
113117
compile "com.android.support:cardview-v7:${rootProject.ext.supportVersion}"
114118
compile 'com.android.support:multidex:1.0.1'
115119
debugCompile project(path: ':sdk', configuration: 'debug')
120+
betaCompile project(path: ':sdk', configuration: 'release')
116121
releaseCompile project(path: ':sdk', configuration: 'release')
117122
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
118123
compile 'com.jakewharton:butterknife:8.8.1'

‎app/src/main/AndroidManifest.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
android:name=".activity.LauncherActivity"
3030
android:screenOrientation="portrait"
3131
android:theme="@style/AppTheme.NoActionBar.FullScreen">
32-
<intent-filter>
33-
<action android:name="android.intent.action.MAIN"/>
32+
<!-- <intent-filter>
33+
<action android:name="android.intent.action.MAIN"/>
3434
35-
<category android:name="android.intent.category.LAUNCHER"/>
36-
</intent-filter>
35+
<category android:name="android.intent.category.LAUNCHER"/>
36+
</intent-filter>-->
3737
</activity>
3838

3939
<!--主界面-->
4040
<activity
4141
android:name=".activity.MainActivity"
4242
android:screenOrientation="portrait"
4343
android:theme="@style/AppTheme.Dark">
44-
<!-- <intent-filter>
45-
<action android:name="android.intent.action.MAIN"/>
44+
<intent-filter>
45+
<action android:name="android.intent.action.MAIN"/>
4646

47-
<category android:name="android.intent.category.LAUNCHER"/>
48-
</intent-filter>-->
47+
<category android:name="android.intent.category.LAUNCHER"/>
48+
</intent-filter>
4949
</activity>
5050

5151
<activity
@@ -149,6 +149,10 @@
149149
android:screenOrientation="portrait">
150150

151151
</activity>
152+
<activity
153+
android:name=".activity.MomentDetailActivity"
154+
android:label="@string/label_moment_detail"
155+
android:screenOrientation="portrait"/>
152156

153157
<service
154158
android:name=".service.CnblogsService"

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.rae.cnblogs.activity.ImageSelectionActivity;
1919
import com.rae.cnblogs.activity.LoginActivity;
2020
import com.rae.cnblogs.activity.MainActivity;
21+
import com.rae.cnblogs.activity.MomentDetailActivity;
2122
import com.rae.cnblogs.activity.PostMomentActivity;
2223
import com.rae.cnblogs.activity.SearchActivity;
2324
import com.rae.cnblogs.activity.SettingActivity;
@@ -27,6 +28,7 @@
2728
import com.rae.cnblogs.image.ImagePreviewActivity;
2829
import com.rae.cnblogs.sdk.bean.BlogBean;
2930
import com.rae.cnblogs.sdk.bean.BlogType;
31+
import com.rae.cnblogs.sdk.bean.MomentBean;
3032

3133
import java.util.ArrayList;
3234

@@ -352,6 +354,15 @@ public static void jumpToPostMoment(Activity context) {
352354
startActivityForResult(context, intent, REQ_POST_MOMENT);
353355
}
354356

357+
/**
358+
* 闪存详情
359+
*/
360+
public static void jumpToMomentDetail(Context context, MomentBean data) {
361+
Intent intent = new Intent(context, MomentDetailActivity.class);
362+
intent.putExtra("data", data);
363+
startActivity(context, intent);
364+
}
365+
355366
/**
356367
* 跳转到图片选择
357368
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.rae.cnblogs.AppMobclickAgent;
2121
import com.rae.cnblogs.AppStatusBar;
2222
import com.rae.cnblogs.AppUI;
23+
import com.rae.cnblogs.BuildConfig;
2324
import com.rae.cnblogs.R;
2425
import com.rae.cnblogs.RaeImageLoader;
2526
import com.rae.cnblogs.RxObservable;
@@ -126,7 +127,7 @@ public void onTabReselected(TabLayout.Tab tab) {
126127
RxObservable.create(CnblogsApiFactory
127128
.getInstance(getContext())
128129
.getRaeServerApi()
129-
.versionInfo(getVersionCode(), getChannel()), "MainActivity")
130+
.versionInfo(getVersionCode(), getChannel(), BuildConfig.BUILD_TYPE), "MainActivity")
130131
.subscribe(new ApiDefaultObserver<VersionInfo>() {
131132
@Override
132133
protected void onError(String message) {

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.rae.cnblogs.activity;
2+
3+
import android.os.Bundle;
4+
import android.support.annotation.Nullable;
5+
6+
import com.rae.cnblogs.R;
7+
import com.rae.cnblogs.fragment.MomentDetailFragment;
8+
import com.rae.cnblogs.sdk.bean.MomentBean;
9+
10+
/**
11+
* 详情
12+
* Created by ChenRui on 2017/11/2 0002 15:01.
13+
*/
14+
public class MomentDetailActivity extends SwipeBackBaseActivity {
15+
16+
@Override
17+
protected void onCreate(@Nullable Bundle savedInstanceState) {
18+
super.onCreate(savedInstanceState);
19+
setContentView(R.layout.activity_moment_detail);
20+
showHomeAsUp();
21+
getSupportFragmentManager().beginTransaction()
22+
.add(R.id.fl_content, MomentDetailFragment.newInstance((MomentBean) getIntent().getParcelableExtra("data"))).commitNow();
23+
}
24+
}

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

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

19+
import com.rae.cnblogs.AppMobclickAgent;
1920
import com.rae.cnblogs.AppRoute;
2021
import com.rae.cnblogs.AppUI;
2122
import com.rae.cnblogs.GlideApp;
@@ -171,9 +172,13 @@ public void onDismiss(DialogInterface dialog) {
171172

172173
@OnClick(R.id.tv_post)
173174
public void onPostViewClick() {
175+
// 统计发布
174176
if (mPresenter.post()) {
175177
AppUI.loading(this, "正在发布");
178+
AppMobclickAgent.onClickEvent(this, "PostMoment_Publish");
176179
mPostView.setEnabled(false);
180+
} else {
181+
AppMobclickAgent.onClickEvent(this, "PostMoment_Return");
177182
}
178183
}
179184

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.rae.cnblogs.AppMobclickAgent;
1515
import com.rae.cnblogs.AppRoute;
1616
import com.rae.cnblogs.AppUI;
17+
import com.rae.cnblogs.BuildConfig;
1718
import com.rae.cnblogs.CnblogsApplication;
1819
import com.rae.cnblogs.R;
1920
import com.rae.cnblogs.RxObservable;
@@ -71,7 +72,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
7172
}
7273

7374
// 获取版本号
74-
7575
mCheckUpdateMsgView.setText(getAppVersion());
7676

7777
}
@@ -192,7 +192,7 @@ public void onCheckUpdateClick() {
192192
mCheckUpdateMsgView.setVisibility(View.GONE);
193193
RxObservable.create(CnblogsApiFactory.getInstance(this)
194194
.getRaeServerApi()
195-
.versionInfo(getVersionCode(), getChannel()), "checkUpdate")
195+
.versionInfo(getVersionCode(), getChannel(), BuildConfig.BUILD_TYPE), "checkUpdate")
196196
.subscribe(new ApiDefaultObserver<VersionInfo>() {
197197
@Override
198198
protected void onError(String message) {

‎app/src/main/java/com/rae/cnblogs/adapter/MomentAdapter.java

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

33
import android.support.v7.widget.GridLayoutManager;
44
import android.support.v7.widget.LinearLayoutManager;
5+
import android.text.TextUtils;
56
import android.view.LayoutInflater;
67
import android.view.View;
78
import android.view.ViewGroup;
@@ -12,11 +13,27 @@
1213
import com.rae.cnblogs.sdk.bean.MomentBean;
1314
import com.rae.swift.Rx;
1415

16+
import java.lang.ref.WeakReference;
17+
1518
/**
1619
* 闪存
1720
* Created by ChenRui on 2017/10/27 0027 10:49.
1821
*/
19-
public class MomentAdapter extends BaseItemAdapter<MomentBean, MomentHolder> {
22+
public class MomentAdapter extends BaseItemAdapter<MomentBean, MomentHolder> implements View.OnClickListener {
23+
@Override
24+
public void onClick(View v) {
25+
26+
}
27+
28+
public interface OnBloggerClickListener {
29+
void onBloggerClick(String blogApp);
30+
}
31+
32+
private OnBloggerClickListener mOnBloggerClickListener;
33+
34+
public void setOnBloggerClickListener(OnBloggerClickListener onBloggerClickListener) {
35+
mOnBloggerClickListener = onBloggerClickListener;
36+
}
2037

2138
@Override
2239
public MomentHolder onCreateViewHolder(LayoutInflater inflater, ViewGroup parent, int viewType) {
@@ -37,10 +54,34 @@ public void onBindViewHolder(MomentHolder holder, int position, MomentBean m) {
3754

3855
holder.mRecyclerView.setAdapter(new MomentImageAdapter(m.getImageList()));
3956

57+
58+
View.OnClickListener onClickListener = TextUtils.isEmpty(m.getBlogApp()) ? null : new ItemBloggerClickListener(m.getBlogApp(), mOnBloggerClickListener);
59+
holder.authorView.setOnClickListener(onClickListener);
60+
holder.avatarView.setOnClickListener(onClickListener);
61+
holder.dateView.setOnClickListener(onClickListener);
62+
4063
RaeImageLoader.displayHeaderImage(m.getAvatar(), holder.avatarView);
4164
holder.authorView.setText(m.getAuthorName());
4265
holder.dateView.setText(m.getPostTime());
4366
holder.summaryView.setText(m.getContent());
4467
holder.commentView.setText(m.getCommentCount());
4568
}
69+
70+
71+
private static class ItemBloggerClickListener implements View.OnClickListener {
72+
private String blogApp;
73+
private WeakReference<OnBloggerClickListener> mOnBloggerClickListenerWeakReference;
74+
75+
public ItemBloggerClickListener(String blogApp, OnBloggerClickListener onBloggerClickListener) {
76+
this.blogApp = blogApp;
77+
mOnBloggerClickListenerWeakReference = new WeakReference<OnBloggerClickListener>(onBloggerClickListener);
78+
}
79+
80+
@Override
81+
public void onClick(View v) {
82+
if (mOnBloggerClickListenerWeakReference.get() != null) {
83+
mOnBloggerClickListenerWeakReference.get().onBloggerClick(blogApp);
84+
}
85+
}
86+
}
4687
}

0 commit comments

Comments
 (0)