Commit f792e50b authored by wanglei's avatar wanglei

...

parent 266fc864
...@@ -148,7 +148,37 @@ class FileFragment : BaseFragment<FragmentFileBinding>() { ...@@ -148,7 +148,37 @@ class FileFragment : BaseFragment<FragmentFileBinding>() {
} }
private fun simulateProgress() { private fun simulateProgress() {
val mainActivity = (requireActivity() as MainActivity)
val totalAngle = (mainActivity.usedBytes.toFloat() / mainActivity.totalBytes.toFloat()) * 360f
val appSize = mainActivity.usedBytes - mainActivity.usedBytes * 0.01 * 3
progressList.clear()
val appAngle = (appSize * totalAngle / mainActivity.usedBytes).toFloat()
val appBean = ProgressBean(0f, appAngle, "#FD412F")
progressList.add(appBean)
val videoAngle = (mainActivity.usedBytes * 0.01 * totalAngle / mainActivity.usedBytes)
val videoBean = ProgressBean(appBean.sweepAngle, (appBean.sweepAngle + videoAngle).toFloat(), "#FDC734")
progressList.add(videoBean)
val photoAngle = (mainActivity.usedBytes * 0.01 * totalAngle / mainActivity.usedBytes)
val photoBean = ProgressBean(videoBean.sweepAngle, (videoBean.sweepAngle + photoAngle).toFloat(), "#00BE78")
progressList.add(photoBean)
val audioAngle = (mainActivity.usedBytes * 0.01 * totalAngle / mainActivity.usedBytes)
val audioBean = ProgressBean(photoBean.sweepAngle, (photoBean.sweepAngle + audioAngle).toFloat(), "#8238FD")
progressList.add(audioBean)
progressList.reverse()
binding.colorProgress.animateProgress(
// listOf(
// ProgressBean(155f, 180f, "#8238FD"),//music
// ProgressBean(108f, 155f, "#00BE78"),//photo
// ProgressBean(65f, 108f, "#FDC734"),//vide
// ProgressBean(0f, 65f, "#FD412F"),//app
// )
progressList
)
} }
private fun initData() = lifecycleScope.launch(Dispatchers.IO) { private fun initData() = lifecycleScope.launch(Dispatchers.IO) {
......
...@@ -144,8 +144,8 @@ ...@@ -144,8 +144,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:includeFontPadding="false"
android:paddingHorizontal="20dp" android:paddingHorizontal="20dp"
android:paddingVertical="4dp"
android:text="My" android:text="My"
android:textColor="@color/color_tab_text" android:textColor="@color/color_tab_text"
android:textSize="12sp" android:textSize="12sp"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<com.angcyo.tablayout.DslTabLayout <com.angcyo.tablayout.DslTabLayout
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="40dp"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginVertical="5dp" android:layout_marginVertical="5dp"
app:tab_deselect_color="@color/black" app:tab_deselect_color="@color/black"
......
...@@ -192,10 +192,11 @@ ...@@ -192,10 +192,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="21dp" android:layout_marginTop="21dp"
android:layout_marginBottom="35dp" android:layout_marginBottom="16dp"
android:gravity="center" android:gravity="center"
android:text="Later" android:text="Later"
android:textColor="#999999" android:textColor="#999999"
android:textSize="18sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tv" android:id="@+id/tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="34dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@drawable/bg_tab_selector_webstore" android:background="@drawable/bg_tab_selector_webstore"
android:gravity="center" android:gravity="center"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tv" android:id="@+id/tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="34dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@drawable/bg_tab_selector_webstore" android:background="@drawable/bg_tab_selector_webstore"
android:gravity="center" android:gravity="center"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment