修改页面bug

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/activity/MediaActivity.kt

@@ -19,6 +19,7 @@ import com.xm.test.myfilemaster.adapter.MediaAdapter2
 import com.xm.test.myfilemaster.databinding.ActivityMediaBinding
 import com.xm.test.myfilemaster.model.FileBean
 import com.xm.test.myfilemaster.util.FileUtil
+import com.xm.test.myfilemaster.util.PermissionUtil
 
 class MediaActivity : AppCompatActivity() {
     private lateinit var mGridView: GridView
@@ -33,6 +34,7 @@ class MediaActivity : AppCompatActivity() {
     private lateinit var mCheckedBtn: CheckBox
     private lateinit var mSelectTv: TextView
     private lateinit var mTitleTv: TextView
+    private lateinit var mNotPermissionView: View
 
     lateinit var mItemCheckedArray: SparseBooleanArray
     private var mItemDataList = ArrayList<FileBean>()
@@ -73,6 +75,7 @@ class MediaActivity : AppCompatActivity() {
         mGridView = findViewById(R.id.image_item_grid)
         mTitleBar = findViewById(R.id.title_bar)
         mSelectBar = findViewById(R.id.switch_and_select_layout)
+        mNotPermissionView = findViewById(R.id.not_file_Permission_view)
 //        mScrollView = findViewById(R.id.grid_view_scroll)
 
         mQuitBtn = mTitleBar.findViewById<ImageView>(R.id.btn_quit)
@@ -92,9 +95,31 @@ class MediaActivity : AppCompatActivity() {
         mItemCheckedArray = SparseBooleanArray()
         mFileType = intent.getStringExtra("fileType").toString() ?: ""
         mItemAdapter = MediaAdapter(mItemDataList, this, mItemCheckedArray, mFileType!!, 115)
-//        mItemAdapter = MediaAdapter2()
         mGridView.adapter = mItemAdapter
-//        binding.imageItemGrid.adapter = mItemAdapter
+
+        if (HomeActivity.isPermission){
+            getListData()
+        }else{
+            mGridView.visibility = View.GONE
+            mEditBtn.visibility = View.GONE
+            mNotPermissionView.visibility = View.VISIBLE
+        }
+
+
+        mTitleTv.text = mFileType!!
+
+        mModel = ViewModelProvider(this)[BaseActivityViewModel::class.java]
+        mModel.setNumber(0)
+        mModel.myInt.observe(this) {
+            mSelectTv.text = String.format(getString(R.string.select_0, mCheckedNumber.toString()))
+        }
+        setOnclickListener()
+    }
+
+    private fun getListData() {
+        mGridView.visibility = View.VISIBLE
+        mEditBtn.visibility = View.VISIBLE
+        mNotPermissionView.visibility = View.GONE
         Thread(Runnable {
             WaitDialog.show("please wait..")
             mItemDataList = FileUtil.getMediaFiles(this, mFileType!!, 30)
@@ -106,16 +131,6 @@ class MediaActivity : AppCompatActivity() {
                 mItemAdapter?.setData(mItemDataList)
             }
         }).start()
-
-
-        mTitleTv.text = mFileType!!
-
-        mModel = ViewModelProvider(this)[BaseActivityViewModel::class.java]
-        mModel.setNumber(0)
-        mModel.myInt.observe(this) {
-            mSelectTv.text = String.format(getString(R.string.select_0, mCheckedNumber.toString()))
-        }
-        setOnclickListener()
     }
 
 
@@ -153,12 +168,9 @@ class MediaActivity : AppCompatActivity() {
 //                startActivity(intent)
             }
         }
-    }
-
-    private fun setOnGridViewItemClickListener() {
-//        mGridView.setOnItemClickListener { parent, view, position, id ->
-
-//        }
+        findViewById<View>(R.id.go_to_setting_btn).setOnClickListener {
+            PermissionUtil.requestPermission(this)
+        }
     }
 
     private fun setStateCheckedMap(isChecked: Boolean) {

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/fragment/InternalStorageFragment.kt

@@ -153,6 +153,10 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
 
     private fun requestDataList() {
         println("yanglin start getData")
+        mNewBtn.visibility = View.VISIBLE
+        mShareBtn.visibility = View.VISIBLE
+        mCurrantFilePathTv.visibility = View.VISIBLE
+
         if (mItemDataList.size == 0){
             WaitDialog.show("please wait..")
             Thread(Runnable {
@@ -539,6 +543,10 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
         if (PermissionUtil.checkGrantedPermission(requireActivity())){
             requestDataList()
         }else {
+            mNewBtn.visibility = View.GONE
+            mShareBtn.visibility = View.GONE
+            mEditBtn.visibility = View.GONE
+            mCurrantFilePathTv.visibility = View.GONE
             mNotPermissionLayout.visibility = View.VISIBLE
         }
     }

MyDemo3/app/src/main/res/layout/activity_media.xml

@@ -47,5 +47,13 @@
 
     <!--    </ScrollView>-->
 
+    <FrameLayout
+        android:id="@+id/not_file_Permission_view"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:layout_height="match_parent">
+        <include layout="@layout/not_permission_layout"/>
+    </FrameLayout>
+
 
 </LinearLayout>
\ No newline at end of file

MyDemo3/app/src/main/res/layout/notification_install_bar.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@drawable/bg_ad_shape"
+    android:layout_height="58dp">
+
+    <ImageView
+        android:layout_centerVertical="true"
+        android:id="@+id/notification_icon"
+        android:src="@mipmap/notification_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_toRightOf="@id/notification_icon"
+        android:layout_width="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Install successfully"
+            android:textColor="@color/black"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear unnecessary installation packages"
+            android:textColor="#999999"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/clean_btn"
+        android:layout_width="49dp"
+        android:layout_height="24dp"
+        android:text="Clean"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="12dp"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:background="@drawable/bg_btn_sure_shape"/>
+
+</RelativeLayout>
\ No newline at end of file

MyDemo3/app/src/main/res/layout/notification_uninstall_bar.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@drawable/bg_ad_shape"
+    android:layout_height="58dp">
+
+    <ImageView
+        android:layout_centerVertical="true"
+        android:id="@+id/notification_icon"
+        android:src="@mipmap/notification_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_toRightOf="@id/notification_icon"
+        android:layout_width="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Uninstall successfully"
+            android:textColor="@color/black"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Uninstall successfully. Clean residual fles"
+            android:textColor="#999999"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/clean_btn"
+        android:layout_width="49dp"
+        android:layout_height="24dp"
+        android:text="Clean"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="12dp"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:background="@drawable/bg_btn_sure_shape"/>
+
+</RelativeLayout>
\ No newline at end of file