|
@@ -73,6 +73,7 @@ import org.telegram.cricdit.base.BaseActivity;
|
|
import org.telegram.cricdit.base.BaseObserver;
|
|
import org.telegram.cricdit.base.BaseObserver;
|
|
import org.telegram.cricdit.bean.ChildCommendBean;
|
|
import org.telegram.cricdit.bean.ChildCommendBean;
|
|
import org.telegram.cricdit.bean.ChildCommendListBean;
|
|
import org.telegram.cricdit.bean.ChildCommendListBean;
|
|
|
|
+import org.telegram.cricdit.bean.CrcmaBean;
|
|
import org.telegram.cricdit.bean.MainCommendBean;
|
|
import org.telegram.cricdit.bean.MainCommendBean;
|
|
import org.telegram.cricdit.bean.MainCommendListBean;
|
|
import org.telegram.cricdit.bean.MainCommendListBean;
|
|
import org.telegram.cricdit.bean.MoreCommendBean;
|
|
import org.telegram.cricdit.bean.MoreCommendBean;
|
|
@@ -112,6 +113,7 @@ import org.telegram.cricdit.view.floatwindow.MoveType;
|
|
import org.telegram.cricdit.view.floatwindow.Screen;
|
|
import org.telegram.cricdit.view.floatwindow.Screen;
|
|
import org.telegram.cricdit.view.floatwindow.Util;
|
|
import org.telegram.cricdit.view.floatwindow.Util;
|
|
import org.telegram.messenger.AndroidUtilities;
|
|
import org.telegram.messenger.AndroidUtilities;
|
|
|
|
+import org.telegram.messenger.ApplicationLoader;
|
|
import org.telegram.messenger.ChatObject;
|
|
import org.telegram.messenger.ChatObject;
|
|
import org.telegram.messenger.LocaleController;
|
|
import org.telegram.messenger.LocaleController;
|
|
import org.telegram.messenger.MessagesController;
|
|
import org.telegram.messenger.MessagesController;
|
|
@@ -169,7 +171,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
|
|
|
|
private NestedScrollView nestedScrollview;
|
|
private NestedScrollView nestedScrollview;
|
|
private TextView tvTitle;
|
|
private TextView tvTitle;
|
|
-// private LinearLayout llHead;
|
|
|
|
|
|
+ // private LinearLayout llHead;
|
|
private ImageView ivHead;
|
|
private ImageView ivHead;
|
|
private TextView tvUserName;
|
|
private TextView tvUserName;
|
|
private TextView tvPublicTime;
|
|
private TextView tvPublicTime;
|
|
@@ -482,7 +484,20 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void recallCommentSuccess(Object o, MultiItemEntity multiItem) {
|
|
public void recallCommentSuccess(Object o, MultiItemEntity multiItem) {
|
|
- ToastUtil.show(getParentActivity(), getString(R.string.recall_comment_on_success));
|
|
|
|
|
|
+
|
|
|
|
+ if (o.toString().contains("num")) {
|
|
|
|
+ try {
|
|
|
|
+ CrcmaBean crcmaBean = GsonHel.fromJson(o.toString(), CrcmaBean.class);
|
|
|
|
+ if (crcmaBean!=null && !TextUtils.isEmpty(crcmaBean.num)) {
|
|
|
|
+ ToastUtil.show(ApplicationLoader.applicationContext, LocaleController.getString(R.string.CdCrcma) + crcmaBean.num);
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e){
|
|
|
|
+ System.out.println(e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ ToastUtil.show(getParentActivity(), getString(R.string.recall_comment_on_success));
|
|
|
|
+ }
|
|
|
|
+
|
|
if (multiItem instanceof MainCommendBean) {//删除的是主评论
|
|
if (multiItem instanceof MainCommendBean) {//删除的是主评论
|
|
List<MultiItemEntity> data = adapter.getData();
|
|
List<MultiItemEntity> data = adapter.getData();
|
|
// if (((MainCommendBean) multiItem).getMoreCommendBean() != null) {
|
|
// if (((MainCommendBean) multiItem).getMoreCommendBean() != null) {
|
|
@@ -565,6 +580,17 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void oplikeSuccess(Object o, MultiItemEntity multiItem) {
|
|
public void oplikeSuccess(Object o, MultiItemEntity multiItem) {
|
|
|
|
+ if (o.toString().contains("num")) {
|
|
|
|
+ try {
|
|
|
|
+ CrcmaBean crcmaBean = GsonHel.fromJson(o.toString(), CrcmaBean.class);
|
|
|
|
+ if (crcmaBean!=null && !TextUtils.isEmpty(crcmaBean.num)) {
|
|
|
|
+ ToastUtil.show(ApplicationLoader.applicationContext, LocaleController.getString(R.string.CdCrcma) + crcmaBean.num);
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e){
|
|
|
|
+ System.out.println(e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
int index = adapter.getData().indexOf(multiItem);
|
|
int index = adapter.getData().indexOf(multiItem);
|
|
if (multiItem instanceof MainCommendBean) {
|
|
if (multiItem instanceof MainCommendBean) {
|
|
MainCommendBean mainCommendBean = (MainCommendBean) multiItem;
|
|
MainCommendBean mainCommendBean = (MainCommendBean) multiItem;
|
|
@@ -1073,7 +1099,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
ll_head_feed.setVisibility(View.GONE);
|
|
ll_head_feed.setVisibility(View.GONE);
|
|
llFollow.setVisibility(View.GONE);
|
|
llFollow.setVisibility(View.GONE);
|
|
|
|
|
|
- if("feed".equals(newsType)){
|
|
|
|
|
|
+ if ("feed".equals(newsType)) {
|
|
ll_head_feed.setVisibility(View.VISIBLE);
|
|
ll_head_feed.setVisibility(View.VISIBLE);
|
|
tv_user_name_feed.setText(!TextUtils.isEmpty(nickname) ? nickname : TextUtils.isEmpty(newsBean.getUserName()) ? "" : newsBean.getUserName());
|
|
tv_user_name_feed.setText(!TextUtils.isEmpty(nickname) ? nickname : TextUtils.isEmpty(newsBean.getUserName()) ? "" : newsBean.getUserName());
|
|
tv_public_time_feed.setText(TimeUtils.timeEngMonthStr(getContext(), Long.parseLong(newsBean.getPublishTime() + "000")));
|
|
tv_public_time_feed.setText(TimeUtils.timeEngMonthStr(getContext(), Long.parseLong(newsBean.getPublishTime() + "000")));
|
|
@@ -1097,12 +1123,12 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
ll_head_news.setVisibility(View.VISIBLE);
|
|
ll_head_news.setVisibility(View.VISIBLE);
|
|
tvUserName.setText(" " + (!TextUtils.isEmpty(nickname) ? nickname : TextUtils.isEmpty(newsBean.getUserName()) ? "" : newsBean.getUserName()));
|
|
tvUserName.setText(" " + (!TextUtils.isEmpty(nickname) ? nickname : TextUtils.isEmpty(newsBean.getUserName()) ? "" : newsBean.getUserName()));
|
|
tvPublicTime.setText(" " + getString(R.string.news_updated_on) + " " + TimeUtils.timeEngMonthStr(getContext(), Long.parseLong(newsBean.getPublishTime() + "000")));
|
|
tvPublicTime.setText(" " + getString(R.string.news_updated_on) + " " + TimeUtils.timeEngMonthStr(getContext(), Long.parseLong(newsBean.getPublishTime() + "000")));
|
|
tvContentDown.setText(Html.fromHtml(newsBean.getContent()));
|
|
tvContentDown.setText(Html.fromHtml(newsBean.getContent()));
|
|
- showRankGroup(itemBean.getGroup1(),itemBean.getGroup2());
|
|
|
|
|
|
+ showRankGroup(itemBean.getGroup1(), itemBean.getGroup2());
|
|
}
|
|
}
|
|
|
|
|
|
if (TextUtils.isEmpty(newsBean.getTitle())) {
|
|
if (TextUtils.isEmpty(newsBean.getTitle())) {
|
|
@@ -1231,6 +1257,11 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
presenter.like(clientUserId + "", Integer.parseInt(newsId + ""), new BaseObserver<Object>() {
|
|
presenter.like(clientUserId + "", Integer.parseInt(newsId + ""), new BaseObserver<Object>() {
|
|
@Override
|
|
@Override
|
|
protected void onSuccess(Object data) {
|
|
protected void onSuccess(Object data) {
|
|
|
|
+
|
|
|
|
+ if (data instanceof String && !TextUtils.isEmpty((String) data)) {
|
|
|
|
+ ToastUtil.show(getContext(), LocaleController.getString(R.string.CdCrcma) + data);
|
|
|
|
+ }
|
|
|
|
+
|
|
bean.setIsLike(!bean.getIsLike());
|
|
bean.setIsLike(!bean.getIsLike());
|
|
if (!bean.getIsLike()) {
|
|
if (!bean.getIsLike()) {
|
|
bean.setLikeNum(bean.getLikeNum() - 1);
|
|
bean.setLikeNum(bean.getLikeNum() - 1);
|
|
@@ -1263,9 +1294,9 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
}
|
|
}
|
|
|
|
|
|
private void showRankGroup(RankDetailBean.GroupBean group1, RankDetailBean.GroupBean group2) {
|
|
private void showRankGroup(RankDetailBean.GroupBean group1, RankDetailBean.GroupBean group2) {
|
|
- if(group1 == null || TextUtils.isEmpty(group1.getGroup_id())){
|
|
|
|
|
|
+ if (group1 == null || TextUtils.isEmpty(group1.getGroup_id())) {
|
|
rl_group.setVisibility(View.GONE);
|
|
rl_group.setVisibility(View.GONE);
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
rl_group.setVisibility(View.VISIBLE);
|
|
rl_group.setVisibility(View.VISIBLE);
|
|
tv_join_info.setText(LocaleController.getString(R.string.join_live_discussion_groups));
|
|
tv_join_info.setText(LocaleController.getString(R.string.join_live_discussion_groups));
|
|
tv_join_group_name.setText(group1.getGroup_name());
|
|
tv_join_group_name.setText(group1.getGroup_name());
|
|
@@ -1277,9 +1308,9 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
.into(iv_group);
|
|
.into(iv_group);
|
|
}
|
|
}
|
|
|
|
|
|
- if(group2 == null || TextUtils.isEmpty(group2.getGroup_id())){
|
|
|
|
|
|
+ if (group2 == null || TextUtils.isEmpty(group2.getGroup_id())) {
|
|
rl_group2.setVisibility(View.GONE);
|
|
rl_group2.setVisibility(View.GONE);
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
rl_group2.setVisibility(View.VISIBLE);
|
|
rl_group2.setVisibility(View.VISIBLE);
|
|
tv_join_info2.setText(LocaleController.getString(R.string.join_live_discussion_groups));
|
|
tv_join_info2.setText(LocaleController.getString(R.string.join_live_discussion_groups));
|
|
tv_join_group_name2.setText(group2.getGroup_name());
|
|
tv_join_group_name2.setText(group2.getGroup_name());
|
|
@@ -1295,7 +1326,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
|
|
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
|
|
presentFragment(new LoginActivity());
|
|
presentFragment(new LoginActivity());
|
|
} else {
|
|
} else {
|
|
- if(group1 == null || TextUtils.isEmpty(group1.getGroup_id())){
|
|
|
|
|
|
+ if (group1 == null || TextUtils.isEmpty(group1.getGroup_id())) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
long chatID = Long.parseLong(group1.getGroup_id());
|
|
long chatID = Long.parseLong(group1.getGroup_id());
|
|
@@ -1329,7 +1360,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
|
|
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
|
|
presentFragment(new LoginActivity());
|
|
presentFragment(new LoginActivity());
|
|
} else {
|
|
} else {
|
|
- if(group2 == null || TextUtils.isEmpty(group2.getGroup_id())){
|
|
|
|
|
|
+ if (group2 == null || TextUtils.isEmpty(group2.getGroup_id())) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
long chatID = Long.parseLong(group2.getGroup_id());
|
|
long chatID = Long.parseLong(group2.getGroup_id());
|
|
@@ -1361,6 +1392,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
});
|
|
});
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
public void newSkipUrl(String finalWorkingText) {
|
|
public void newSkipUrl(String finalWorkingText) {
|
|
if (finalWorkingText.contains("https://t.me/")) {
|
|
if (finalWorkingText.contains("https://t.me/")) {
|
|
int index = finalWorkingText.indexOf("https://t.me/");
|
|
int index = finalWorkingText.indexOf("https://t.me/");
|
|
@@ -1496,17 +1528,17 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
orientationUtils.backToProtVideo();
|
|
orientationUtils.backToProtVideo();
|
|
}
|
|
}
|
|
|
|
|
|
- boolean isFirstRePermission = SPUtils.getInstance().get("is_first_request_window",true);
|
|
|
|
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
|
|
|
|
- if(!Util.hasPermission(getContext()) && !isFirstRePermission){//非第一次而且没权限 pass
|
|
|
|
|
|
+ boolean isFirstRePermission = SPUtils.getInstance().get("is_first_request_window", true);
|
|
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
|
|
|
+ if (!Util.hasPermission(getContext()) && !isFirstRePermission) {//非第一次而且没权限 pass
|
|
getCurPlay().onVideoPause();
|
|
getCurPlay().onVideoPause();
|
|
//GSYVideoManager.releaseAllVideos();
|
|
//GSYVideoManager.releaseAllVideos();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if(isFirstRePermission){
|
|
|
|
- SPUtils.getInstance().save("is_first_request_window",false);
|
|
|
|
|
|
+ if (isFirstRePermission) {
|
|
|
|
+ SPUtils.getInstance().save("is_first_request_window", false);
|
|
}
|
|
}
|
|
|
|
|
|
if (!GSYVideoManager.backFromWindowFull(getContext())) {
|
|
if (!GSYVideoManager.backFromWindowFull(getContext())) {
|
|
@@ -1523,14 +1555,14 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
float ratio = 0.55f;
|
|
float ratio = 0.55f;
|
|
FloatingVideo floatingVideo = floatPlayerView.getVideoPlayer();
|
|
FloatingVideo floatingVideo = floatPlayerView.getVideoPlayer();
|
|
floatingVideo.setAutoFullWithSize(true);
|
|
floatingVideo.setAutoFullWithSize(true);
|
|
- if(floatingVideo.isVerticalFullByVideoSize()){
|
|
|
|
|
|
+ if (floatingVideo.isVerticalFullByVideoSize()) {
|
|
ratio = 0.3f;
|
|
ratio = 0.3f;
|
|
}
|
|
}
|
|
FloatWindow
|
|
FloatWindow
|
|
.with(getParentActivity().getApplicationContext())
|
|
.with(getParentActivity().getApplicationContext())
|
|
.setView(floatPlayerView)
|
|
.setView(floatPlayerView)
|
|
.setWidth(Screen.width, ratio)
|
|
.setWidth(Screen.width, ratio)
|
|
- .setHeight(Screen.width, (float)floatingVideo.getCurrentVideoHeight()/(float)floatingVideo.getCurrentVideoWidth() * ratio)
|
|
|
|
|
|
+ .setHeight(Screen.width, (float) floatingVideo.getCurrentVideoHeight() / (float) floatingVideo.getCurrentVideoWidth() * ratio)
|
|
.setX(Screen.width, 0.8f)
|
|
.setX(Screen.width, 0.8f)
|
|
.setY(Screen.height, 0.3f)
|
|
.setY(Screen.height, 0.3f)
|
|
.setMoveType(MoveType.slide)
|
|
.setMoveType(MoveType.slide)
|
|
@@ -1545,7 +1577,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void onUserLeaveHint() {
|
|
public void onUserLeaveHint() {
|
|
- if (!TextUtils.isEmpty(newsBean.getVideo())){
|
|
|
|
|
|
+ if (!TextUtils.isEmpty(newsBean.getVideo())) {
|
|
if (getCurPlay().getCurrentPlayer().getCurrentState() == CURRENT_STATE_PLAYING) {
|
|
if (getCurPlay().getCurrentPlayer().getCurrentState() == CURRENT_STATE_PLAYING) {
|
|
openFloatVideo();
|
|
openFloatVideo();
|
|
}
|
|
}
|
|
@@ -1555,7 +1587,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public boolean onBackPressed() {
|
|
public boolean onBackPressed() {
|
|
- if (!TextUtils.isEmpty(newsBean.getVideo())){
|
|
|
|
|
|
+ if (!TextUtils.isEmpty(newsBean.getVideo())) {
|
|
openFloatVideo();
|
|
openFloatVideo();
|
|
}
|
|
}
|
|
return super.onBackPressed();
|
|
return super.onBackPressed();
|
|
@@ -1564,10 +1596,10 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
@Override
|
|
@Override
|
|
public void onPause() {
|
|
public void onPause() {
|
|
//非息屏且在播放 -> 悬浮窗
|
|
//非息屏且在播放 -> 悬浮窗
|
|
- if (newsBean!=null && !TextUtils.isEmpty(newsBean.getVideo())){
|
|
|
|
|
|
+ if (newsBean != null && !TextUtils.isEmpty(newsBean.getVideo())) {
|
|
if (getScreenState(getContext()) && getCurPlay().getCurrentPlayer().getCurrentState() == CURRENT_STATE_PLAYING) {
|
|
if (getScreenState(getContext()) && getCurPlay().getCurrentPlayer().getCurrentState() == CURRENT_STATE_PLAYING) {
|
|
openFloatVideo();
|
|
openFloatVideo();
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
getCurPlay().onVideoPause();
|
|
getCurPlay().onVideoPause();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1580,7 +1612,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
|
|
if (newsBean == null) {
|
|
if (newsBean == null) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (!TextUtils.isEmpty(newsBean.getVideo())){
|
|
|
|
|
|
+ if (!TextUtils.isEmpty(newsBean.getVideo())) {
|
|
getCurPlay().onVideoResume();
|
|
getCurPlay().onVideoResume();
|
|
}
|
|
}
|
|
}
|
|
}
|