Skip to content

Commit 489be63

Browse files
raeeraee
committed
解决闪存登录问题
解决登录按钮问题 优化内测版本号
1 parent e893bba commit 489be63

File tree

14 files changed

+68
-39
lines changed

14 files changed

+68
-39
lines changed

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ android {
8282
}
8383
beta {
8484
initWith release
85-
versionNameSuffix rootProject.hasProperty("buildNum") ? 'beta.' + rootProject.property("buildNum") : ''
85+
versionNameSuffix rootProject.hasProperty("buildNum") ? '.' + rootProject.property("buildNum") + '_beta' : ''
8686
}
8787
}
8888
sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } }

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,13 @@ public int getVersionCode() {
131131
}
132132
return 1;
133133
}
134+
135+
public String getVersionName() {
136+
try {
137+
return getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA).versionName;
138+
} catch (PackageManager.NameNotFoundException e) {
139+
e.printStackTrace();
140+
}
141+
return "1.0.0";
142+
}
134143
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ public int getVersionCode() {
153153
return ((CnblogsApplication) getApplication()).getVersionCode();
154154
}
155155

156+
public String getVersionName() {
157+
return ((CnblogsApplication) getApplication()).getVersionName();
158+
}
159+
156160
/**
157161
* 获取渠道包
158162
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.view.View;
88
import android.view.animation.Animation;
99
import android.view.animation.AnimationUtils;
10-
import android.widget.Button;
1110
import android.widget.ImageView;
1211
import android.widget.TextView;
1312

@@ -54,7 +53,7 @@ public class LoginActivity extends BaseActivity
5453
TextView mLoadingMsgView;
5554

5655
@BindView(R.id.btn_login)
57-
Button mLoginButton;
56+
TextView mLoginButton;
5857

5958
@BindView(R.id.img_login_logo)
6059
ImageView mLogoView;
@@ -210,6 +209,7 @@ public void onRegClick() {
210209
AppRoute.jumpToWeb(this, getString(R.string.reg_url));
211210
}
212211

212+
213213
/**
214214
* 登录点击
215215
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void onTabReselected(TabLayout.Tab tab) {
133133
RxObservable.create(CnblogsApiFactory
134134
.getInstance(getContext())
135135
.getRaeServerApi()
136-
.versionInfo(getVersionCode(), getChannel(), BuildConfig.BUILD_TYPE), "MainActivity")
136+
.versionInfo(getVersionCode(), getVersionName(), getChannel(), BuildConfig.BUILD_TYPE), "MainActivity")
137137
.subscribe(new ApiDefaultObserver<VersionInfo>() {
138138
@Override
139139
protected void onError(String message) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void onCheckUpdateClick() {
192192
mCheckUpdateMsgView.setVisibility(View.GONE);
193193
RxObservable.create(CnblogsApiFactory.getInstance(this)
194194
.getRaeServerApi()
195-
.versionInfo(getVersionCode(), getChannel(), BuildConfig.BUILD_TYPE), "checkUpdate")
195+
.versionInfo(getVersionCode(), getVersionName(), 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/MomentDetailAdapter.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class MomentDetailAdapter extends BaseItemAdapter<MomentCommentBean, Simp
4141
private int mViewTypeCount = 1;
4242
private WeakReference<ViewGroup> mViewParent;
4343
private View.OnClickListener mOnPlaceholderClickListener;
44+
private View.OnClickListener mOnFollowClickListener;
4445
private MomentAdapter.OnBloggerClickListener mOnBloggerClickListener;
4546
private MomentHolder mMomentHolder;
4647

@@ -56,6 +57,10 @@ public void setOnBloggerClickListener(MomentAdapter.OnBloggerClickListener onBlo
5657
mOnBloggerClickListener = onBloggerClickListener;
5758
}
5859

60+
public void setOnFollowClickListener(View.OnClickListener onFollowClickListener) {
61+
mOnFollowClickListener = onFollowClickListener;
62+
}
63+
5964
@Nullable
6065
public MomentHolder getMomentHolder() {
6166
return mMomentHolder;
@@ -160,6 +165,8 @@ private void onBindCommentViewHolder(MomentCommentHolder holder, MomentCommentBe
160165
* 详情
161166
*/
162167
private void onBindDetailInfoViewHolder(MomentHolder holder, MomentBean m) {
168+
169+
holder.followView.setOnClickListener(mOnFollowClickListener);
163170
holder.mRecyclerView.setVisibility(Rx.isEmpty(m.getImageList()) ? View.GONE : View.VISIBLE);
164171

165172
int imageCount = Rx.getCount(m.getImageList());

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@ public class MomentDetailFragment extends BaseFragment implements IMomentDetailC
5353
private IMomentDetailContract.Presenter mPresenter;
5454

5555
private EditCommentDialog mEditCommentDialog;
56+
private final View.OnClickListener mOnFollowClickListener = new View.OnClickListener() {
57+
@Override
58+
public void onClick(View v) {
59+
if (!UserProvider.getInstance().isLogin()) {
60+
AppRoute.jumpToLogin(v.getContext());
61+
return;
62+
}
63+
((Button) v).setText("请稍后");
64+
v.setEnabled(false);
65+
mPresenter.follow();
66+
}
67+
};
5668

5769

5870
public static MomentDetailFragment newInstance(MomentBean data) {
@@ -129,6 +141,7 @@ public void onBloggerClick(String blogApp) {
129141
AppRoute.jumpToBlogger(getContext(), blogApp);
130142
}
131143
});
144+
mAdapter.setOnFollowClickListener(mOnFollowClickListener);
132145
mAdapter.setOnItemClickListener(new BaseItemAdapter.onItemClickListener<MomentCommentBean>() {
133146
@Override
134147
public void onItemClick(MomentCommentBean item) {
@@ -234,9 +247,9 @@ public String getBlogApp() {
234247
public void onLoadBloggerInfoFailed(String msg) {
235248
MomentHolder holder = mAdapter.getMomentHolder();
236249
if (holder != null && holder.followView != null) {
237-
holder.followView.setEnabled(false);
238-
holder.followView.setText("信息异常");
239-
250+
holder.followView.setEnabled(true);
251+
if (UserProvider.getInstance().isLogin())
252+
holder.followView.setText("信息异常");
240253
}
241254
}
242255

@@ -245,19 +258,6 @@ public void onLoadBloggerInfo(FriendsInfoBean info) {
245258
MomentHolder holder = mAdapter.getMomentHolder();
246259
if (holder != null && holder.followView != null) {
247260
holder.followView.setEnabled(true);
248-
holder.followView.setOnClickListener(new View.OnClickListener() {
249-
@Override
250-
public void onClick(View v) {
251-
if (!UserProvider.getInstance().isLogin()) {
252-
AppRoute.jumpToLogin(v.getContext());
253-
return;
254-
}
255-
((Button) v).setText("请稍后");
256-
v.setEnabled(false);
257-
mPresenter.follow();
258-
}
259-
});
260-
holder.followView.setSelected(info.isFollowed());
261261
holder.followView.setText(info.isFollowed() ? "取消关注" : "加关注");
262262
}
263263
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ public void cancelRequest() {
6868
RxObservable.dispose("thread");
6969
}
7070

71+
protected boolean isLogin() {
72+
return UserProvider.getInstance().isLogin();
73+
}
74+
7175
protected boolean isNotLogin() {
7276
return !UserProvider.getInstance().isLogin();
7377
}

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,24 @@ protected void accept(List<MomentCommentBean> momentCommentBeans) {
6262
}
6363
});
6464

65+
if (isLogin()) {
66+
// 加载博主信息
67+
createObservable(mFriendApi.getFriendsInfo(mView.getBlogApp())).subscribe(new ApiDefaultObserver<FriendsInfoBean>() {
68+
@Override
69+
protected void onError(String msg) {
70+
mView.onLoadBloggerInfoFailed(msg);
71+
}
6572

66-
// 加载博主信息
67-
createObservable(mFriendApi.getFriendsInfo(mView.getBlogApp())).subscribe(new ApiDefaultObserver<FriendsInfoBean>() {
68-
@Override
69-
protected void onError(String msg) {
70-
mView.onLoadBloggerInfoFailed(msg);
71-
}
73+
@Override
74+
protected void accept(FriendsInfoBean friendsInfoBean) {
75+
mBloggerInfo = friendsInfoBean;
76+
mView.onLoadBloggerInfo(friendsInfoBean);
77+
}
78+
});
79+
} else {
80+
mView.onLoadBloggerInfoFailed(getString(R.string.login_expired));
81+
}
7282

73-
@Override
74-
protected void accept(FriendsInfoBean friendsInfoBean) {
75-
mBloggerInfo = friendsInfoBean;
76-
mView.onLoadBloggerInfo(friendsInfoBean);
77-
}
78-
});
7983
}
8084

8185
@Override

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
android:gravity="center_vertical">
2020

2121
<ImageButton
22-
android:visibility="invisible"
2322
android:id="@+id/back"
2423
android:layout_width="wrap_content"
2524
android:layout_height="wrap_content"
@@ -30,7 +29,8 @@
3029
android:paddingRight="12dp"
3130
android:paddingTop="32dp"
3231
android:scaleType="center"
33-
android:src="@drawable/login_btn_close"/>
32+
android:src="@drawable/login_btn_close"
33+
android:visibility="invisible"/>
3434

3535
</RelativeLayout>
3636

@@ -172,14 +172,16 @@
172172
android:layout_marginTop="20dp"
173173
android:background="@drawable/public_button_login">
174174

175-
<Button
175+
<TextView
176176
android:id="@+id/btn_login"
177177
android:layout_width="wrap_content"
178178
android:layout_height="wrap_content"
179179
android:layout_centerInParent="true"
180180
android:background="@android:color/transparent"
181+
android:clickable="false"
181182
android:drawableLeft="@drawable/ic_official_flag"
182183
android:drawablePadding="4dp"
184+
android:focusableInTouchMode="true"
183185
android:gravity="center"
184186
android:text="@string/login"
185187
android:textColor="@color/text_color_login_button"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
android:layout_width="62dp"
4242
android:layout_height="26dp"
4343
android:background="@drawable/bg_btn_follow_drak"
44-
android:enabled="false"
4544
android:text="加关注"
4645
android:textColor="@color/ph2"
4746
android:textSize="@dimen/h3"

‎sdk/src/androidTest/java/rae/com/cnblogs/sdk/RaeApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ public void testVersionUpdate() throws InterruptedException {
5050
e.printStackTrace();
5151
}
5252

53-
runTest("testVersionUpdate", mApi.versionInfo(1, "dev", "debug"));
53+
runTest("testVersionUpdate", mApi.versionInfo(1, "1.0.0", "dev", "debug"));
5454
}
5555
}

‎sdk/src/main/java/com/rae/cnblogs/sdk/api/IRaeServerApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ public interface IRaeServerApi {
4444
* @param env 环境，这里使用buildType
4545
*/
4646
@GET(ApiUrls.RAE_API_CHECK_VERSION)
47-
Observable<VersionInfo> versionInfo(@Path("versionCode") int versionCode, @Query("channel") String channel, @Query("env") String env);
47+
Observable<VersionInfo> versionInfo(@Path("versionCode") int versionCode, @Query("versionName") String versionName, @Query("channel") String channel, @Query("env") String env);
4848
}

0 commit comments

Comments
 (0)