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

1、移除部分haloapp的静态变量

Browse Source 
2、整理hardcode tag
3、修复NPE
This commit is contained in:
CsHeng
2017-12-15 18:04:56 +08:00
parent 40fccea23a
commit 05be092d69
31 changed files with 287 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ import com.gh.gamecenter.retrofit.OkHttpCache;
import com.gh.gamecenter.retrofit.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
import com.google.gson.Gson;
import com.halo.assistant.HaloApp;
import com.lightgame.utils.Util_System_Keyboard;
import com.lightgame.utils.Utils;
@ -135,17 +134,17 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall
// 评论回复
public static Intent getMessageDetailIntent(Context context, CommentEntity entity, String newsId) {
HaloApp.put("CommentEntity", entity);
Intent intent = new Intent(context, MessageDetailActivity.class);
intent.putExtra("commentNum", -1);
intent.putExtra(EntranceUtils.KEY_NEWSID, newsId);
intent.putExtra("openSoftInput", true);
intent.putExtra(CommentEntity.TAG, entity);
return intent;
}
public static Intent getIntentByEntity(Context context, ConcernEntity concernEntity, String entrance) {
HaloApp.put("ConcernEntity", concernEntity);
Intent intent = new Intent(context, MessageDetailActivity.class);
intent.putExtra(ConcernEntity.TAG, concernEntity);
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
return intent;
}
@ -159,11 +158,10 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall
return intent;
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
HaloApp.put("ConcernEntity", adapter.getConcernEntity());
outState.putParcelable(CommentEntity.TAG, adapter.getConcernEntity());
}
@Override
@ -175,11 +173,10 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mConcernEntity = (ConcernEntity) HaloApp.get("ConcernEntity", true);
mCommentEntity = (CommentEntity) HaloApp.get("CommentEntity", true); // 来自新闻详情-评论回复
Intent intent = getIntent();
mConcernEntity = intent.getParcelableExtra(ConcernEntity.TAG);
mCommentEntity = intent.getParcelableExtra(CommentEntity.TAG);
newsId = intent.getExtras().getString(EntranceUtils.KEY_NEWSID);
commentNum = intent.getExtras().getInt("commentNum", -1);