|
11 | 11 | import zuo.biao.library.ui.AlertDialog.OnDialogButtonClickListener; |
12 | 12 | import zuo.biao.library.ui.GridAdapter; |
13 | 13 | import zuo.biao.library.ui.WebViewActivity; |
| 14 | +import zuo.biao.library.util.CommonUtil; |
14 | 15 | import zuo.biao.library.util.ImageLoaderUtil; |
15 | 16 | import zuo.biao.library.util.Log; |
16 | 17 | import zuo.biao.library.util.ScreenUtil; |
|
22 | 23 | import android.view.LayoutInflater; |
23 | 24 | import android.view.View; |
24 | 25 | import android.view.View.OnClickListener; |
| 26 | +import android.view.View.OnLongClickListener; |
25 | 27 | import android.view.ViewGroup; |
26 | 28 | import android.widget.AdapterView; |
27 | 29 | import android.widget.AdapterView.OnItemClickListener; |
|
30 | 32 | import android.widget.LinearLayout.LayoutParams; |
31 | 33 | import android.widget.TextView; |
32 | 34 | import apijson.demo.client.R; |
| 35 | +import apijson.demo.client.activity_fragment.LoginActivity; |
33 | 36 | import apijson.demo.client.activity_fragment.MomentActivity; |
34 | 37 | import apijson.demo.client.activity_fragment.UserActivity; |
35 | 38 | import apijson.demo.client.application.APIJSONApplication; |
@@ -320,9 +323,6 @@ private void toCommentActivity(boolean isToComment) { |
320 | 323 | * @param isToComment comment有效时为true |
321 | 324 | */ |
322 | 325 | private void toCommentActivity(CommentItem comment, boolean isToComment) { |
323 | | - if (isLoggedIn() == false) { |
324 | | - return; |
325 | | - } |
326 | 326 | long userId = comment == null ? 0 : comment.getUser().getId(); |
327 | 327 | if (userId <= 0 || APIJSONApplication.getInstance().isCurrentUser(userId)) { |
328 | 328 | toActivity(MomentActivity.createIntent(context, momentId, isToComment, comment == null ? 0 : comment.getId())); |
@@ -359,7 +359,12 @@ public List<String> getPictureList() { |
359 | 359 | * @return |
360 | 360 | */ |
361 | 361 | private boolean isLoggedIn() { |
362 | | - return APIJSONApplication.getInstance().isLoggedIn(); |
| 362 | + boolean isLoggedIn = APIJSONApplication.getInstance().isLoggedIn(); |
| 363 | + if (isLoggedIn == false) { |
| 364 | + context.startActivity(LoginActivity.createIntent(context)); |
| 365 | + context.overridePendingTransition(R.anim.bottom_push_in, R.anim.hold); |
| 366 | + } |
| 367 | + return isLoggedIn; |
363 | 368 | } |
364 | 369 |
|
365 | 370 |
|
@@ -454,10 +459,7 @@ public void onClick(View v) { |
454 | 459 | } |
455 | 460 | break; |
456 | 461 | case R.id.tvMomentViewContent: |
457 | | - // toActivity(TextActivity.createIntent(context, moment == null ? null : moment.getContent())); |
458 | | - break; |
459 | | - case R.id.tvMomentViewPraise: |
460 | | - // toActivity(PraiseListActivity.createIntent(context, PraiseListActivity.TYPE_WORK, momentId)); |
| 462 | + toCommentActivity(false); |
461 | 463 | break; |
462 | 464 | default: |
463 | 465 | if (isLoggedIn() == false) { |
|
0 commit comments