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

Merge remote-tracking branch 'origin/2.2' into 2.2

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
This commit is contained in:
khy
2016-11-30 10:39:35 +08:00
parent 68f8bee146 e35a0ffc17
commit 0fcf70a2bf
89 changed files with 539 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
View File

@ -10,6 +10,7 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.view.ViewTreeObserver;
@ -89,6 +90,12 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
private CommentDao mCommentDao;
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
AppController.put("ConcernEntity", adapter.getConcernEntity());
}
private ConcernEntity mConcernEntity;
private String newsId;
@ -139,7 +146,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
});
//检查sp是否有用户信息
if (sp.getString("user_name", null) == null || sp.getString("user_name" , null).isEmpty()) {
if (TextUtils.isEmpty(sp.getString("user_name", null))) {
new Thread(new Runnable() {
@Override
public void run() {
@ -160,7 +167,6 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
});
}
}).start();
} else {
if (sp.getString("user_icon", "res:///"+ R.drawable.user_default_icon_comment).isEmpty()) {
mMessageDetailIconDv.setImageURI("res:///" + R.drawable.user_default_icon_comment);
@ -268,11 +274,6 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
setSoftInput(true);
}
@OnClick(R.id.reuse_no_connection)
public void OnConnectionClikListener() {
showNoConnection(false);
}
@OnTouch(R.id.message_detail_rv)
public boolean OnRecyclerTouchListener() {
if (mMessageDetailCommentRl.getVisibility() == View.VISIBLE) {
@ -298,12 +299,13 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
} catch (JSONException e) {
e.printStackTrace();
}
if (newsId == null) {
newsId = mConcernEntity.getId();
}
PostCommentUtils.addCommentData(Config.COMMENT_HOST + "article/" + newsId + "/comment"
, jsonObject.toString(), MessageDetailActivity.this, new PostCommentUtils.PostCommentListener() {
final String newsId = adapter.getNewsId();
PostCommentUtils.addCommentData(MessageDetailActivity.this,
Config.COMMENT_HOST + "article/" + newsId + "/comment", jsonObject.toString(),
new PostCommentUtils.PostCommentListener() {
@Override
public void postSucced(JSONObject response) {
mSendingDialog.dismiss();