Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化登录流程，修复２．６已知的ＢＵＧ

Browse Source
This commit is contained in:
kehaoyuan
2017-07-20 18:04:38 +08:00
parent 92d122b0a3
commit a113fc1c73
17 changed files with 232 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/gamecenter/WebActivity.java
View File

@ -32,6 +32,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import butterknife.BindView;
import butterknife.OnClick;
import rx.android.schedulers.AndroidSchedulers;
import rx.functions.Action1;
import rx.schedulers.Schedulers;
@ -39,7 +40,7 @@ import rx.schedulers.Schedulers;
/**
* Created by khy on 2016/10/18.
*/
public class WebActivity extends BaseActivity implements View.OnClickListener {
public class WebActivity extends BaseActivity {
@BindView(R.id.news_webview)
WebView webView;
@ -79,7 +80,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
// 刷新评论数
if (resultCode == 1001 && progressBar.getVisibility() == View.VISIBLE && newsId != null) {
if (resultCode == 1001 && newsId != null && data != null && data.getExtras() != null) {
webComment.setText("查看评论（" + data.getExtras().getInt("commentNum") + "）");
} else if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE
|| requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) {
@ -105,6 +106,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
}
if (mIsTools) {
mToolBoxEntity = getIntent().getParcelableExtra("ToolBoxEntity");
mShareIv.setVisibility(View.VISIBLE);
mCollectionIv.setVisibility(View.VISIBLE);
} else {
@ -184,7 +186,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
getNewsCommentNum();
}
if (mShareIv != null) {
if (mShareIv != null && mToolBoxEntity != null) {
RxView.clicks(mShareIv)
.throttleFirst(1, TimeUnit.SECONDS)
.subscribe(new Action1<Void>() {
@ -214,7 +216,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
});
}
@Override
@OnClick({R.id.web_comment, R.id.web_collection})
public void onClick(View v) {
if (v == webComment) {
Intent intent = new Intent(this, MessageDetailActivity.class);
@ -222,6 +224,8 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
intent.putExtra("commentNum", commentNum);
intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(光环浏览器)");
startActivityForResult(intent, 1001);
} else if (v == mCollectionIv) {
// TODO 收藏
}
}