新增电池页面ui
This commit is contained in:
parent
d1fa83d15c
commit
4e15482b7d
@ -37,7 +37,7 @@ class HardWareFragment : Fragment() {
|
|||||||
var intent=Intent(requireContext(), AnalysisActivity::class.java)
|
var intent=Intent(requireContext(), AnalysisActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
binding.pair1.setOnClickListener {
|
binding.bluetoothLayout.pair1.setOnClickListener {
|
||||||
dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
|
dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
|
||||||
println("showBluetoothDialog"+AndInfo.instance.bluetooth.bondedDevices.size)
|
println("showBluetoothDialog"+AndInfo.instance.bluetooth.bondedDevices.size)
|
||||||
dialogBlueTooth?.show(childFragmentManager, "BlueTooth1")
|
dialogBlueTooth?.show(childFragmentManager, "BlueTooth1")
|
||||||
|
|||||||
@ -73,7 +73,9 @@ private lateinit var binding: FragmentSystemShowBinding
|
|||||||
binding.textOp17.textTitle.text=getString(R.string.ssl_version)
|
binding.textOp17.textTitle.text=getString(R.string.ssl_version)
|
||||||
binding.textOp18.textTitle.text=getString(R.string.language)
|
binding.textOp18.textTitle.text=getString(R.string.language)
|
||||||
binding.textOp19.textTitle.text=getString(R.string.usb_debugging)
|
binding.textOp19.textTitle.text=getString(R.string.usb_debugging)
|
||||||
|
//内核
|
||||||
binding.textOp20.textTitle.text=getString(R.string.kernel)
|
binding.textOp20.textTitle.text=getString(R.string.kernel)
|
||||||
|
binding.textOp20.textContent.text=AndInfo.instance.build.kernelCompleteVersion
|
||||||
|
|
||||||
|
|
||||||
binding.textclear1.textTitle.text=getString(R.string.vendor)
|
binding.textclear1.textTitle.text=getString(R.string.vendor)
|
||||||
|
|||||||
@ -59,8 +59,10 @@
|
|||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/signalStrength"
|
android:id="@+id/signalStrength"
|
||||||
style="@style/TextBatteryLogo"
|
style="@style/TextTitleBig"
|
||||||
android:layout_width="150dp"
|
android:layout_width="150dp"
|
||||||
|
android:textSize="36sp"
|
||||||
|
android:textStyle="bold"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="100%"
|
android:text="100%"
|
||||||
android:textAlignment="center" />
|
android:textAlignment="center" />
|
||||||
@ -75,11 +77,11 @@
|
|||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/conText1"
|
android:id="@+id/conText1"
|
||||||
style="@style/TextButteryRight"
|
style="@style/LeftContent"
|
||||||
|
android:textColor="@color/module_title_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/not_charged"
|
android:text="@string/not_charged"
|
||||||
android:textStyle="bold"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@ -88,20 +90,20 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
style="@style/TextButteryRight"
|
style="@style/LeftContent"
|
||||||
|
android:textColor="@color/module_title_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="current"
|
android:text="@string/current"
|
||||||
android:textStyle="bold"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/conTExt3"
|
android:id="@+id/conTExt3"
|
||||||
style="@style/TextButteryRight"
|
style="@style/LeftContent"
|
||||||
|
android:textColor="@color/module_title_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text=" 22 mA"
|
android:text=" 22 mA"
|
||||||
android:textStyle="bold"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@ -111,20 +113,20 @@
|
|||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
style="@style/TextButteryRight"
|
style="@style/LeftContent"
|
||||||
|
android:textColor="@color/module_title_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Power"
|
android:text="@string/power"
|
||||||
android:textStyle="bold"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:id="@+id/conTExt4"
|
android:id="@+id/conTExt4"
|
||||||
style="@style/TextButteryRight"
|
style="@style/LeftContent"
|
||||||
|
android:textColor="@color/module_title_color"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text=" 0.5 W"
|
android:text=" 0.5 W"
|
||||||
android:textStyle="bold"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -148,122 +150,21 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/information"
|
android:text="@string/information"
|
||||||
tools:ignore="RelativeOverlap" />
|
tools:ignore="RelativeOverlap" />
|
||||||
|
<include
|
||||||
<LinearLayout
|
android:id="@+id/info1"
|
||||||
android:layout_width="match_parent"
|
layout="@layout/common_text_style" />
|
||||||
android:layout_height="wrap_content"
|
<include
|
||||||
android:layout_marginTop="15dp"
|
android:id="@+id/info2"
|
||||||
android:orientation="horizontal">
|
layout="@layout/common_text_style" />
|
||||||
|
<include
|
||||||
<com.google.android.material.textview.MaterialTextView
|
android:id="@+id/info3"
|
||||||
android:id="@+id/informTitle1"
|
layout="@layout/common_text_style" />
|
||||||
style="@style/LeftContent"
|
<include
|
||||||
android:layout_width="150dp"
|
android:id="@+id/info4"
|
||||||
android:layout_height="wrap_content"
|
layout="@layout/common_text_style" />
|
||||||
android:text="@string/temperature"
|
<include
|
||||||
android:textStyle="bold" />
|
android:id="@+id/info5"
|
||||||
|
layout="@layout/common_text_style" />
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informDev1"
|
|
||||||
style="@style/TextContentRight"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:text="@string/apps"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="15dp"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informTitle2"
|
|
||||||
style="@style/LeftContent"
|
|
||||||
android:layout_width="150dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/technology"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informDev2"
|
|
||||||
style="@style/TextContentRight"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:text="@string/apps"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="15dp"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informTitle3"
|
|
||||||
style="@style/LeftContent"
|
|
||||||
android:layout_width="150dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/health_status"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informDev3"
|
|
||||||
style="@style/TextContentRight"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:text="@string/apps"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="15dp"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informTitle4"
|
|
||||||
style="@style/LeftContent"
|
|
||||||
android:layout_width="150dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/maximum_output"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informDev4"
|
|
||||||
style="@style/TextContentRight"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:text="@string/apps"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="15dp"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informTitle5"
|
|
||||||
style="@style/LeftContent"
|
|
||||||
android:layout_width="150dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/capacity_system_feedback"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/informDev5"
|
|
||||||
style="@style/TextContentRight"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:text="@string/apps"
|
|
||||||
tools:ignore="RelativeOverlap" />
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@ -291,4 +291,5 @@
|
|||||||
<string name="google_play_services_version">Google Play Services version</string>
|
<string name="google_play_services_version">Google Play Services version</string>
|
||||||
<string name="toybox">Toybox</string>
|
<string name="toybox">Toybox</string>
|
||||||
<string name="java_VM">Java VM</string>
|
<string name="java_VM">Java VM</string>
|
||||||
|
<string name="current">current</string>
|
||||||
</resources>
|
</resources>
|
||||||
Loading…
Reference in New Issue
Block a user