Merge branch 'dev-ranklist'

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsActivity.java

@@ -113,7 +113,10 @@ public class NewsActivity extends BaseTabActivity<NewsPresenter> {
             if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
                 presentFragment(new LoginActivity());
             }else{
-                presentFragment(new SendAnFeedActivity());
+                int actionBarHeight = getActionBar().getHeight();
+                Bundle bundle = new Bundle();
+                bundle.putInt("actionbar_height",actionBarHeight);
+                presentFragment(new SendAnFeedActivity(bundle));
             }
         });
         menu.getItem(1).setVisibility(View.GONE);

TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsDetailCommentFragment.java

@@ -18,6 +18,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.os.PowerManager;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
@@ -1081,8 +1082,8 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
                 String[] splitList = url.split(",");
                 if (splitList.length <= 1) {
                     ivSinger.setVisibility(View.VISIBLE);
-                    Glide.with(getContext()).load(url).fitCenter()
-                            .into(ivSinger);
+                    Glide.with(getContext()).load(url)
+                            .into(ivSinger);//.fitCenter()
                     ivSinger.setOnClickListener(view -> {
                         Bundle bundle = new Bundle();
                         bundle.putStringArrayList(ImagePreviewActivity.IMAGE_INFO, new ArrayList<String>() {{
@@ -1097,13 +1098,10 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
                     for (int i = 0; i < splitList.length; i++) {
                         ImageView iv = new ImageView(getContext());
                         iv.setTag(i);
-                        iv.setLayoutParams(new LinearLayout.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
-                        iv.setPadding(0, 0, 0, UIUtil.dip2px(getContext(), 10));
                         Glide.with(iv)
                                 .load(splitList[i])
-                                .fitCenter()
-                                .into(iv);
-                        iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                                .into(iv);//.fitCenter()
+//                        iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
                         iv.setLayoutParams(new LinearLayout.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
                         iv.setPadding(0, 0, 0, UIUtil.dip2px(getContext(), 10));
                         llMoreImg.addView(iv);
@@ -1282,7 +1280,6 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
         }
 
         if (!GSYVideoManager.backFromWindowFull(getContext())) {
-            //播放状态不为： 暂停 自动播放结束 错误状态
             if (FloatWindow.get() == null && isPlay == true && !TextUtils.isEmpty(newsBean.getVideo())) {
                 FloatWindow.newsId = newsId;
                 long position = videoPlayer.getGSYVideoManager().getCurrentPosition();
@@ -1321,23 +1318,28 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
 
     @Override
     public void onPause() {
-        //视频播放完、暂停
-        switch (videoPlayer.getCurrentPlayer().getCurrentState()) {
-            case CURRENT_STATE_PLAYING:
-                isPlay = true;
-                openFloatVideo();
-                break;
-            case CURRENT_STATE_PAUSE:
-            case CURRENT_STATE_AUTO_COMPLETE:
-            case CURRENT_STATE_ERROR:
-                isPlay = false;
-                getCurPlay().onVideoPause();
-                break;
+        //非息屏且播放状态不为： 暂停、播放结束、错误状态
+        if(getScreenState() && videoPlayer.getCurrentPlayer().getCurrentState() == CURRENT_STATE_PLAYING){
+            isPlay = true;
+            openFloatVideo();
+        }else{
+            isPlay = false;
+            getCurPlay().onVideoPause();
         }
         super.onPause();
         isPause = true;
     }
 
+
+    /**
+     * 得到屏幕状态
+     * @return false表示锁屏
+     */
+    public boolean getScreenState(){
+        PowerManager manager = (PowerManager) getContext().getSystemService(Activity. POWER_SERVICE);
+        return manager.isScreenOn();
+    }
+
     @Override
     public void onResume() {
         getCurPlay().onVideoResume(false);

TMessagesProj/src/main/java/org/telegram/cricdit/ui/SendAnFeedActivity.java

@@ -12,6 +12,7 @@ import android.content.Intent;
 import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
@@ -122,6 +123,7 @@ public class SendAnFeedActivity extends BaseActivity<SendAnFeedPresenter> implem
     private int maxSelectNum = 9,maxSelectVideoNum = 1;
     private static final int CHOOSE_REQUEST = 1000;
     private int pageSize = 10,page = 1,offset=0;
+    private int actionBarHeight;
     private final Handler mHandler = new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message msg) {
@@ -152,6 +154,10 @@ public class SendAnFeedActivity extends BaseActivity<SendAnFeedPresenter> implem
         }
     });
 
+    public SendAnFeedActivity(Bundle bundle){
+        actionBarHeight = bundle.getInt("actionbar_height");
+    }
+
     @Override
     protected void initView(View v) {
         mContext = getContext();
@@ -178,8 +184,7 @@ public class SendAnFeedActivity extends BaseActivity<SendAnFeedPresenter> implem
         mRecyclerView.setBackgroundColor(ColorUtil.COLOR_WHITE);
         llCheck.setBackgroundColor(ColorUtil.COLOR_GRAY);
 
-        //fixme ltt 获取真实的actionBar高度
-        scrollView.setPadding(0,UIUtil.dip2px(mContext,80),0,0);
+        scrollView.setPadding(0,actionBarHeight>0 ? actionBarHeight : UIUtil.dip2px(mContext,80),0,0);
         mImages = new ArrayList<>();
         showTags = new ArrayList<>();
         selectTags = new ArrayList<>();

TMessagesProj/src/main/java/org/telegram/cricdit/view/floatwindow/FloatPhone.java

@@ -22,6 +22,7 @@ class FloatPhone extends FloatView {
     private final WindowManager.LayoutParams mLayoutParams;
     private View mView;
     private int mX, mY;
+    public static boolean isRefuse = false;//记录权限是否被拒绝 之后不去申请只做判断
 
     FloatPhone(Context applicationContext) {
         mContext = applicationContext;
@@ -65,24 +66,28 @@ class FloatPhone extends FloatView {
             mLayoutParams.format = PixelFormat.RGBA_8888;
             mWindowManager.addView(mView, mLayoutParams);
         } else {
-            FloatVideoActivity.request(mContext, new PermissionListener() {
-                @Override
-                public void onSuccess() {
-                    mLayoutParams.format = PixelFormat.RGBA_8888;
-                    mWindowManager.addView(mView, mLayoutParams);
-                }
-
-                @Override
-                public void onFail() {
-
-                }
-            });
+            if(!isRefuse){
+                FloatVideoActivity.request(mContext, new PermissionListener() {
+                    @Override
+                    public void onSuccess() {
+                        mLayoutParams.format = PixelFormat.RGBA_8888;
+                        mWindowManager.addView(mView, mLayoutParams);
+                    }
+
+                    @Override
+                    public void onFail() {
+                        isRefuse = true;
+                    }
+                });
+            }
         }
     }
 
     @Override
     public void dismiss() {
-        mWindowManager.removeView(mView);
+        if(!isRefuse){
+            mWindowManager.removeView(mView);
+        }
     }
 
     @Override

TMessagesProj/src/main/res/layout/activity_news_detail_comment.xml

@@ -107,6 +107,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginRight="15dp"
+                android:scaleType="fitCenter"
                 android:visibility="gone" />
 
             <LinearLayout

TMessagesProj/src/main/res/layout/item_news_singer_img.xml

@@ -42,8 +42,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/video_play1"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"/>
+            android:layout_centerVertical="true"
+            android:layout_alignLeft="@id/iv_video"
+            android:layout_alignRight="@id/iv_video"/>
 
     </RelativeLayout>
 

TMessagesProj/src/main/res/layout/item_news_top.xml

@@ -6,14 +6,6 @@
 
     <include layout="@layout/item_news_head"/>
 
-    <com.zhy.view.flowlayout.TagFlowLayout
-        android:id="@+id/flowlayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="13dp"
-        android:paddingRight="13dp"
-        android:layout_marginBottom="3dp"/>
-
     <RelativeLayout
         android:id="@+id/rl_video"
         android:layout_width="match_parent"
@@ -33,8 +25,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/video_play1"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"/>
+            android:layout_centerVertical="true"
+            android:layout_alignLeft="@id/iv_video"
+            android:layout_alignRight="@id/iv_video"/>
 
     </RelativeLayout>
 
@@ -47,24 +40,32 @@
         android:paddingLeft="13dp"
         android:paddingRight="13dp"/>
 
-    <TextView
-        android:id="@+id/tv_content"
+    <com.lzy.ninegrid.NineGridView
+        android:id="@+id/nine_grid_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:lineSpacingExtra="3dp"
-        android:textSize="16sp"
         android:layout_marginTop="9.5dp"
         android:paddingLeft="13dp"
-        android:paddingRight="13dp" />
+        android:paddingRight="13dp"
+        android:visibility="gone"/>
 
-    <com.lzy.ninegrid.NineGridView
-        android:id="@+id/nine_grid_view"
+    <com.zhy.view.flowlayout.TagFlowLayout
+        android:id="@+id/flowlayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="9.5dp"
         android:paddingLeft="13dp"
         android:paddingRight="13dp"
-        android:visibility="gone"/>
+        android:layout_marginBottom="3dp"/>
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:lineSpacingExtra="3dp"
+        android:textSize="16sp"
+        android:layout_marginTop="9.5dp"
+        android:paddingLeft="13dp"
+        android:paddingRight="13dp" />
 
     <LinearLayout
         android:layout_width="match_parent"