coding
diff --git a/‎app/src/main/java/net/coding/program/maopao/MaopaoDetailActivity.java‎
Lines changed: 10 additions & 0 deletions b/‎app/src/main/java/net/coding/program/maopao/MaopaoDetailActivity.java‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎app/src/main/java/net/coding/program/project/ProjectHomeActivity.java‎
Lines changed: 3 additions & 1 deletion b/‎app/src/main/java/net/coding/program/project/ProjectHomeActivity.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎app/src/main/res/values/strings.xml‎
Lines changed: 1 addition & 0 deletions b/‎app/src/main/res/values/strings.xml‎
Lines changed: 1 addition & 0 deletions
@@ -61,6 +61,8 @@ public class MaopaoDetailActivity extends CustomMoreActivity implements StartAct
     final String URI_COMMENT_DELETE = Global.HOST_API + "/tweet/%s/comment/%s";
     @Extra
     Maopao.MaopaoObject mMaopaoObject;
+    Maopao.MaopaoObject mMaopaoObjectOld;
+
     @Extra
     ClickParam mClickParam;
     @ViewById
@@ -198,10 +200,12 @@ protected final void initMaopaoDetailActivity() {
         loadData();
     }
 
+
     @Override
     public void onRefresh() {
         if (mMaopaoObject != null) {
             mClickParam = new ClickParam(mMaopaoObject.owner.global_key, String.valueOf(mMaopaoObject.id));
+            mMaopaoObjectOld = mMaopaoObject;
             mMaopaoObject = null;
         }
 
@@ -308,6 +312,11 @@ public void onClick(View v) {
         likeBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (mMaopaoObject == null) {
+                    showMiddleToast(R.string.maopao_load_fail_like);
+                    return;
+                }
+
                 String type = ((CheckBox) v).isChecked() ? "like" : "unlike";
                 String uri = String.format(HOST_GOOD, mMaopaoObject.id, type);
 
@@ -444,6 +453,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
                 mMaopaoObject = new Maopao.MaopaoObject(respanse.getJSONObject("data"));
                 initData();
             } else {
+                mMaopaoObject = mMaopaoObjectOld;
                 swipeRefreshLayout.setRefreshing(false);
                 showErrorMsg(code, respanse);
             }
 
@@ -48,9 +48,11 @@ protected void init() {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         if (mProjectObject != null) {
             initFragment();
-        } else {
+        } else if (mJumpParam != null) {
             mProjectUrl = String.format(FileUrlActivity.HOST_PROJECT, mJumpParam.mUser, mJumpParam.mProject);
             getNetwork(mProjectUrl, mProjectUrl);
+        } else {
+            finish();
         }
     }
 
 
@@ -102,6 +102,7 @@
     <string name="title_activity_user_active">用户激活</string>
     <string name="maopao_load_fail">冒泡载入失败</string>
     <string name="maopao_load_fail_comment">冒泡载入失败，不能发送评论</string>
+    <string name="maopao_load_fail_like">冒泡载入失败，不能点赞</string>
     <string name="title_activity_project_create">创建项目</string>
     <string name="title_activity_project_type">项目类型</string>
     <string name="title_activity_project_set">项目设置</string>
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,11 @@ protected void init() {`
`48`	`48`	`getSupportActionBar().setDisplayHomeAsUpEnabled(true);`
`49`	`49`	`if (mProjectObject != null) {`
`50`	`50`	`initFragment();`
`51`		`- } else {`
	`51`	`+ } else if (mJumpParam != null) {`
`52`	`52`	`mProjectUrl = String.format(FileUrlActivity.HOST_PROJECT, mJumpParam.mUser, mJumpParam.mProject);`
`53`	`53`	`getNetwork(mProjectUrl, mProjectUrl);`
	`54`	`+ } else {`
	`55`	`+ finish();`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`