From 98b2fa6e893b1f539dd63622acd22bff69529aed Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Mon, 11 Oct 2021 21:26:01 +0800 Subject: [PATCH] version: update:2021-10-11 21:25:51 fix bug: --- .../videoplayer/activity/ActivityTikTok.java | 13 ---------- .../videoplayer/activity/MainActivity.java | 25 +------------------ .../adapter/TikTokRecyclerViewAdapter.java | 1 - .../videoplayer/adapter/VideoAdapter.java | 16 +----------- .../uiui/videoplayer/base/CustomDialog.java | 5 ---- .../com/uiui/videoplayer/utils/ToastUtil.java | 14 ++--------- .../java/com/shehuan/niv/NiceImageView.java | 1 + 7 files changed, 5 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/com/uiui/videoplayer/activity/ActivityTikTok.java b/app/src/main/java/com/uiui/videoplayer/activity/ActivityTikTok.java index bd85164..a2961a8 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/ActivityTikTok.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/ActivityTikTok.java @@ -164,25 +164,12 @@ public class ActivityTikTok extends AppCompatActivity { oldOrientation = Configuration.ORIENTATION_PORTRAIT; } } - // 如果当前是横屏 -// if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) { -// // 设为竖屏 -// this.setRequestedOrientation( -// ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); -// } -// // 如果当前是竖屏 -// if (config.orientation == Configuration.ORIENTATION_PORTRAIT) { -// // 设为横屏 -// this.setRequestedOrientation( -// ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); -// } Log.e(TAG, "orientation oldOrientation:" + config.orientation); Log.e(TAG, "orientation: " + config.orientation); } private void autoPlayVideo() { -// mViewPagerLayoutManager.scrollToPositionWithOffset(postion, 0); View child = rvTiktok.getChildAt(0); if (rvTiktok == null || child == null) { return; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java b/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java index adf9f51..b42eb50 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java +++ b/app/src/main/java/com/uiui/videoplayer/activity/MainActivity.java @@ -61,8 +61,6 @@ public class MainActivity extends AppCompatActivity { setContentView(R.layout.activity_main); checkSelfPermission(); initView(); -// String rootPath = Environment.getExternalStorageDirectory().getPath() + File.separator; -// traverseFolder(rootPath); } @@ -76,19 +74,13 @@ public class MainActivity extends AppCompatActivity { public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); Configuration config = getResources().getConfiguration(); - // 如果当前是横屏 if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) { - // 设为竖屏 mManager = new RecycleGridLayoutManager(MainActivity.this, 2); recyclerView.setLayoutManager(mManager); -// MainActivity.this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } - // 如果当前是竖屏 if (config.orientation == Configuration.ORIENTATION_PORTRAIT) { - // 设为横屏 mManager = new RecycleGridLayoutManager(MainActivity.this, 3); recyclerView.setLayoutManager(mManager); -// MainActivity.this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); } } @@ -134,7 +126,6 @@ public class MainActivity extends AppCompatActivity { .setMessage("确定要删除文件 " + getFileName(path) + "吗") .setPositive("确定") .setNegtive("取消") -// .setSingle(true) .setOnClickBottomListener(new CustomDialog.OnClickBottomListener() { @Override public void onPositiveClick() { @@ -153,7 +144,6 @@ public class MainActivity extends AppCompatActivity { dialog.dismiss(); } }); -// dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); dialog.show(); } @@ -175,7 +165,6 @@ public class MainActivity extends AppCompatActivity { spannableString.setSpan(colorSpan, 0, spannableString.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); actionBar.setTitle(spannableString); } - // 系统 6.0 以上 状态栏白底黑字的实现方法 getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } @@ -191,9 +180,6 @@ public class MainActivity extends AppCompatActivity { } - // private String[] getFolder(String folderPath) { -// -// } public void traverseFolder(String path) { int fileNum = 0, folderNum = 0; File file = new File(path); @@ -291,7 +277,6 @@ public class MainActivity extends AppCompatActivity { @Override protected void onProgressUpdate(String... values) { super.onProgressUpdate(values); -// Log.e("ScanTask", "onProgressUpdate: " + values[0]); paths.add(values[0]); tv_scan.setVisibility(View.VISIBLE); tv_scan.setText("正在扫描：" + values[0]); @@ -309,7 +294,6 @@ public class MainActivity extends AppCompatActivity { tips.setVisibility(View.GONE); recyclerView.setVisibility(View.VISIBLE); adapter.setData(strings); -// recyclerView.setLayoutManager(new LinearLayoutManager(MainActivity.this)); } tv_scan.setVisibility(View.GONE); refreshLayout.setRefreshing(false); @@ -337,7 +321,6 @@ public class MainActivity extends AppCompatActivity { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (requestCode == REQUEST_PERMISSION_CODE) { - //当然权限多了，建议使用Switch，不必纠结于此 if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { ScanTask scanTask = new ScanTask(); scanTask.execute(); @@ -370,12 +353,7 @@ public class MainActivity extends AppCompatActivity { } - /** - * 监听标题栏按钮点击事件. - * - * @param item 按钮 - * @return 结果 - */ + @Override public boolean onOptionsItemSelected(MenuItem item) { //返回按钮点击事件 @@ -452,5 +430,4 @@ public class MainActivity extends AppCompatActivity { } } } - } diff --git a/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java b/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java index 4942d0f..9be9f96 100644 --- a/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java +++ b/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java @@ -92,7 +92,6 @@ public class TikTokRecyclerViewAdapter extends RecyclerView.Adapter) emitter -> { FFmpegMediaMetadataRetriever mmr = new FFmpegMediaMetadataRetriever(); mmr.setDataSource(path); diff --git a/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java b/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java index afd6e7c..b5f833b 100644 --- a/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java +++ b/app/src/main/java/com/uiui/videoplayer/adapter/VideoAdapter.java @@ -89,13 +89,6 @@ public class VideoAdapter extends RecyclerView.Adapter public void onBindViewHolder(@NonNull final VideoHolder holder, final int position) { final String path = videoPath.get(position); File file = new File(path); -// if (file.exists() && file.isFile()) { -// BitmapRetultListener bitmapRetultListener = new BitmapRetultListener() { -// @Override -// public void onScanCompleted(Bitmap bitmap) { -// Glide.with(holder.video_image).load(bitmap).into(holder.video_image); -// } -// }; Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { @@ -145,14 +138,12 @@ public class VideoAdapter extends RecyclerView.Adapter } }); -// this.listener = bitmapRetultListener; holder.title.setText(getFileName(path)); Log.e("title:", holder.title.getText().toString()); // } holder.root.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { -// ToastUtil.show(path); Intent intent = new Intent(mContext, ActivityTikTok.class); intent.putExtra("position", position); intent.putStringArrayListExtra("list", (ArrayList) videoPath); @@ -192,12 +183,7 @@ public class VideoAdapter extends RecyclerView.Adapter return position; } - /** - * 判断Activity是否Destroy - * - * @param mActivity - * @return - */ + public static boolean isDestroy(Activity mActivity) { if (mActivity == null || mActivity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && mActivity.isDestroyed())) { return true; diff --git a/app/src/main/java/com/uiui/videoplayer/base/CustomDialog.java b/app/src/main/java/com/uiui/videoplayer/base/CustomDialog.java index fc9ec61..0574208 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/CustomDialog.java +++ b/app/src/main/java/com/uiui/videoplayer/base/CustomDialog.java @@ -142,10 +142,8 @@ public class CustomDialog extends Dialog { * 只显示一个按钮的时候隐藏取消按钮，回掉只执行确定的事件 */ if (isSingle) { -// columnLineView.setVisibility(View.GONE); negtiveBn.setVisibility(View.GONE); } else { -// columnLineView.setVisibility(View.VISIBLE); negtiveBn.setVisibility(View.VISIBLE); } } @@ -252,8 +250,5 @@ public class CustomDialog extends Dialog { @Override public void dismiss() { super.dismiss(); -// Intent intent = new Intent(mContext, MainActivity.class); -// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -// mContext.startActivity(intent); } } diff --git a/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java b/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java index c25d5d8..66252af 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java +++ b/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java @@ -55,9 +55,7 @@ public class ToastUtil { private static Toast mToast = null; - //android 8.0以后限制 - //https://www.jianshu.com/p/d9813ad03d59 - //https://www.jianshu.com/p/050ce052b873 + public static void showToast(Context context, String text, int duration) { if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) { Toast.makeText(context, text, duration).show(); @@ -72,15 +70,7 @@ public class ToastUtil { } } - // public static void showInCenter(String msg) { -// mainHandler.post(() -> { -// if (toast != null) { -// toast.setGravity(Gravity.CENTER, 0, 0); -// toast.setText(msg); -// toast.show(); -// } -// }); -// } + static Handler debugHandler = new Handler(Looper.getMainLooper()); static Toast debugToast; diff --git a/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java b/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java index efd189f..2d31326 100644 --- a/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java +++ b/niceimageview/src/main/java/com/shehuan/niv/NiceImageView.java @@ -148,6 +148,7 @@ public class NiceImageView extends AppCompatImageView { paint.setAntiAlias(true); paint.setStyle(Paint.Style.FILL); paint.setXfermode(xfermode); + //9.0及以上系统图片一次圆一次方的解决办法 if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) { canvas.drawPath(path, paint); } else {