From 7d2860145932402b6bd180c87da4094e8c063247 Mon Sep 17 00:00:00 2001 From: yuqian Date: Wed, 3 Sep 2025 10:21:40 +0800 Subject: [PATCH] add camera --- .idea/render.experimental.xml | 6 + .../devcheck/dashboard/CameraFragment.kt | 35 +-- .../devcheck/dashboard/NetworkFragment.kt | 2 +- .../device/devcheck/main/MainActivity.kt | 3 +- app/src/main/res/layout/fragment_battery.xml | 30 +- app/src/main/res/layout/fragment_camera.xml | 294 +++++++++++++++++- app/src/main/res/layout/fragment_network.xml | 135 ++++---- .../main/res/layout/fragment_system_show.xml | 241 +++++++------- app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/strings.xml | 12 +- app/src/main/res/values/styles.xml | 83 ++++- 11 files changed, 615 insertions(+), 230 deletions(-) create mode 100644 .idea/render.experimental.xml diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml new file mode 100644 index 0000000..8ec256a --- /dev/null +++ b/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt index 8e79c7b..9f05549 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt @@ -6,27 +6,16 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.FragmentCameraBinding -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [CameraFragment.newInstance] factory method to - * create an instance of this fragment. - */ class CameraFragment : Fragment() { + private lateinit var binding:FragmentCameraBinding; // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) + } } @@ -35,25 +24,17 @@ class CameraFragment : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_camera, container, false) + binding = FragmentCameraBinding.inflate(inflater, container, false) + return binding.root } companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment CameraFragment. - */ - // TODO: Rename and change types and number of parameters + @JvmStatic - fun newInstance(param1: String, param2: String) = + fun newInstance() = CameraFragment().apply { arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) + } } } diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/NetworkFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/NetworkFragment.kt index c905612..c7f131b 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/NetworkFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/NetworkFragment.kt @@ -24,7 +24,7 @@ private lateinit var binding:FragmentNetworkBinding ): View { // Inflate the layout for this fragment binding = FragmentNetworkBinding.inflate(inflater, container, false) - binding.signalStrength.setStrength(4) +// binding.signalStrength.setStrength(4) return binding.root } diff --git a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt index 224a309..4502992 100644 --- a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt @@ -8,6 +8,7 @@ import com.google.android.material.tabs.TabLayoutMediator import com.tools.device.devcheck.base.BaseActivity import com.tools.device.devcheck.R import com.tools.device.devcheck.dashboard.BatteryFragment +import com.tools.device.devcheck.dashboard.CameraFragment import com.tools.device.devcheck.dashboard.DashboardFragment import com.tools.device.devcheck.dashboard.NetworkFragment import com.tools.device.devcheck.dashboard.SystemShowFragment @@ -31,7 +32,7 @@ class MainActivity : BaseActivity() { BatteryFragment.newInstance(), NetworkFragment.newInstance(), DashboardFragment.newInstance(), - DashboardFragment.newInstance(), + CameraFragment.newInstance(), DashboardFragment.newInstance() ) ) diff --git a/app/src/main/res/layout/fragment_battery.xml b/app/src/main/res/layout/fragment_battery.xml index 2dc615e..fde3081 100644 --- a/app/src/main/res/layout/fragment_battery.xml +++ b/app/src/main/res/layout/fragment_battery.xml @@ -32,7 +32,7 @@ + android:src="@drawable/setting" /> - - - + android:layout_height="wrap_content"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_network.xml b/app/src/main/res/layout/fragment_network.xml index f70960a..3551348 100644 --- a/app/src/main/res/layout/fragment_network.xml +++ b/app/src/main/res/layout/fragment_network.xml @@ -32,7 +32,7 @@ + android:src="@drawable/setting" /> - + + android:src="@drawable/setting" /> + android:src="@drawable/check_false" /> + android:src="@drawable/check_false" /> + android:src="@drawable/check_false" /> + android:src="@drawable/check_false" /> + android:src="@drawable/check_false" /> + android:src="@drawable/check_false" /> + android:src="@drawable/setting" /> + + android:orientation="vertical" + android:paddingHorizontal="16dp" + android:paddingVertical="22dp" + android:visibility="visible"> + + - + + + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="OPPO" + tools:ignore="RelativeOverlap" /> + + + android:layout_height="wrap_content" + android:layout_marginTop="42dp" + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/model" + android:textStyle="bold" /> + + + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/product" + android:textStyle="bold" /> + + + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/device" + android:textStyle="bold" /> + + + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/motherboard" + android:textStyle="bold" /> + + + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/manufacturer" + android:textStyle="bold" /> + + + android:orientation="horizontal"> + + android:src="@mipmap/ic_launcher" + android:text="@string/baseband" + android:textStyle="bold" /> + @@ -200,7 +225,8 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="15dp" - android:padding="15dp" + android:paddingHorizontal="16dp" + android:paddingVertical="22dp" android:visibility="visible" android:background="@drawable/dashboard_model_background" > @@ -210,7 +236,7 @@ android:orientation="horizontal"> @@ -237,11 +263,12 @@ android:layout_width="90dp" android:scaleType="fitXY" android:layout_height="90dp" - android:src="@mipmap/ic_launcher" + android:src="@drawable/subtract" android:layout_marginEnd="60dp"/> @@ -748,7 +775,7 @@ android:text="@string/device_id" android:textStyle="bold" android:layout_height="wrap_content" - style="@style/TextContent" + style="@style/TextContentLeft" android:src="@mipmap/ic_launcher"/> @@ -781,7 +808,7 @@ android:text="Google Play Services version" android:textStyle="bold" android:layout_height="wrap_content" - style="@style/TextContent" + style="@style/TextContentLeft" android:src="@mipmap/ic_launcher"/> + style="@style/TextContentLeft" /> + style="@style/TextContentLeft" /> #1E8C29 #FFFFFF #EDEDED - #1E8C29 + #3B948A #444544 + #626262 + #757575 #666666 #757575 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 747dd42..63e8849 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,8 +120,8 @@ Mobile Data Dual SIM dual standby eSIM - SIM card 1 - SIM card 2 + SIM 1 + SIM 2 Default value Nation Data @@ -135,6 +135,14 @@ Health Status Maximum Output Capacity (system feedback) + The full megapixel countand number of camerasmay not be available due to limitations of the Android camera APl. + Sensor size + Pixel size + 35mm equivalent focal length + Shutter speed + lSO sensitivity range + Optical image stabilization + Flash \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 63ec1b9..8de697b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,6 +23,7 @@ @@ -31,6 +32,7 @@ @@ -39,51 +41,128 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file