新增蓝牙附近扫描，other模块，input devices弹框

myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt

@@ -1,5 +1,6 @@
 package com.xyzshell.myphoneinfo.dashboard
 
+import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -43,8 +44,7 @@ class HardWareFragment : Fragment() {
             refreshBluetoothInfo()
         } else {
             // 显示权限被拒绝的UI
-//            showPermissionDeniedUI()
+            Toast.makeText(requireContext(), getString(R.string.permissions_required), Toast.LENGTH_SHORT).show()
-            Toast.makeText(requireContext(), "权限被拒绝", Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -69,14 +69,6 @@ class HardWareFragment : Fragment() {
             var intent = Intent(requireContext(), AnalysisActivity::class.java)
             startActivity(intent)
         }
-//        binding.pair2.setOnClickListener {
-//            dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
-//            dialogBlueTooth?.show(childFragmentManager, "BlueTooth2")
-//        }
-        binding.othertext.setOnClickListener {
-            dialogInput = dialogInput ?: DialogInput()
-            dialogInput?.show(childFragmentManager, "Input")
-        }
         binding.extensionShow.setOnClickListener {
             dialogExtension?.show(childFragmentManager, "Extention")
         }
@@ -97,6 +89,7 @@ class HardWareFragment : Fragment() {
         setMemoryInfo()
         setBlueToothInfo()
         setAudioInfo()
+        setInputInfo()
     }
 
     /**
@@ -108,6 +101,34 @@ class HardWareFragment : Fragment() {
         binding.check3.content.text = getString(R.string.midl)
     }
 
+    /**
+     * Input信息
+     * */
+    private fun setInputInfo() {
+        val inputInfo = AndInfo.instance.input
+        binding.otherCheck1.content.text=getString(R.string.usb_host_support)
+        binding.otherCheck1.image.isSelected=inputInfo.hasUsbHostSupport()
+        binding.otherCheck2.content.text=getString(R.string.usb_accessory_support)
+        binding.otherCheck2.image.isSelected=inputInfo.hasUsbAccessorySupport()
+        binding.otherCheck3.content.text=getString(R.string.fingerprint)
+        binding.otherCheck3.image.isSelected=inputInfo.hasFingerprintSensor()
+        binding.otherCheck4.content.text=getString(R.string.infrared_transmitter)
+        binding.otherCheck4.image.isSelected=inputInfo.hasInfraredSensor()
+        binding.otherCheck5.content.text=getString(R.string.uwb_support)
+        binding.otherCheck5.image.isSelected=inputInfo.hasUwbSupport()
+        binding.otherCheck6.content.text=getString(R.string.nfc_support)
+        binding.otherCheck6.image.isSelected=inputInfo.hasNfcSupport()
+        binding.otherCheck7.content.text=getString(R.string.secure_nfc_support)
+        binding.otherCheck7.image.isSelected=inputInfo.hasSecureNfcSupport()
+        binding.otherCheck8.content.text=getString(R.string.gps)
+        binding.otherCheck8.image.isSelected=inputInfo.hasGpsSupport()
+        binding.othertext.setOnClickListener {
+            dialogInput = dialogInput ?: DialogInput()
+            dialogInput?.show(childFragmentManager, "Input")
+        }
+
+    }
+
     /**
      * memory信息
      * */
@@ -298,19 +319,35 @@ class HardWareFragment : Fragment() {
 
     /**
      * bluetooth相关信息*/
+    @SuppressLint("SuspiciousIndentation")
     private fun setBlueToothInfo() {
         val bluetoothInfo = AndInfo.instance.bluetooth//蓝牙信息
             if (!bluetoothInfo.isEnabled) return
             binding.bluetoothLayout.showLayout.setOnClickListener {
                 requestBluetoothPermissions()
             }
-            binding.bluetoothLayout.pair1.setOnClickListener {
+        //蓝牙features支持
-                showPairedDevicesDialog()
+        bluetoothInfo.getBluetoothFeatures().let { features ->
-            }
+            binding.bluetoothLayout.blueCheck1.content.text=getString(R.string.bluetooth_le)
-            // 打开弹窗开始扫描，超过15s扫描超时结束，显示扫描到的列表
+            binding.bluetoothLayout.blueCheck1.image.isSelected=features.bluetoothLe
-            binding.bluetoothLayout.pair2.setOnClickListener {
+            binding.bluetoothLayout.blueCheck2.content.text=getString(R.string.multiple_advertisement)
-                showNearByDevicesDialog()
+            binding.bluetoothLayout.blueCheck2.image.isSelected=features.multipleAdvertisement
+            binding.bluetoothLayout.blueCheck3.content.text=getString(R.string.offloaded_filtering)
+            binding.bluetoothLayout.blueCheck3.image.isSelected=features.offloadedFiltering
+            binding.bluetoothLayout.blueCheck4.content.text=getString(R.string.offloaded_scan_batching)
+            binding.bluetoothLayout.blueCheck4.image.isSelected=features.offloadedScanBatching
+            binding.bluetoothLayout.blueCheck01.content.text=getString(R.string.le_periodic_advertising)
+            binding.bluetoothLayout.blueCheck01.image.isSelected=features.lePeriodicAdvertising
+            binding.bluetoothLayout.blueCheck02.content.text=getString(R.string.le_extended_advertising)
+            binding.bluetoothLayout.blueCheck02.image.isSelected=features.leExtendedAdvertising
+            binding.bluetoothLayout.blueCheck03.content.text=getString(R.string.le_2m_phy_high_speed)
+            binding.bluetoothLayout.blueCheck03.image.isSelected=features.leCodedPhy
+            binding.bluetoothLayout.blueCheck04.content.text=getString(R.string.le_2m_phy_low_power)
+            binding.bluetoothLayout.blueCheck04.image.isSelected=features.le2MbPhy
+            binding.bluetoothLayout.blueCheck05.content.text=getString(R.string.le_audio_support)
+            binding.bluetoothLayout.blueCheck05.image.isSelected=features.leAudioSupport
         }
+
     }
     // 请求蓝牙权限的方法
     private fun requestBluetoothPermissions() {
@@ -364,7 +401,7 @@ class HardWareFragment : Fragment() {
         binding.bluetoothLayout.blueList.visibility = View.GONE
 
         // 更新UI文本
-        binding.bluetoothLayout.showText.text = "Bluetooth is not enabled."
+        binding.bluetoothLayout.showText.text = getString(R.string.bluetooth_not_enabled)
 
         // 设置打开蓝牙按钮
         binding.bluetoothLayout.show1.setOnClickListener {
@@ -406,24 +443,13 @@ class HardWareFragment : Fragment() {
      * 刷新蓝牙信息
      */
     private fun refreshBluetoothInfo() {
-        val bluetoothInfo = AndInfo.instance.bluetooth
+        binding.bluetoothLayout.pair1.setOnClickListener {
-
+            showPairedDevicesDialog()
-        // 更新基本信息
+        }
-//        binding.blueList.tvBluetoothStatus.text = bluetoothInfo.stateText
+        // 打开弹窗开始扫描，超过15s扫描超时结束，显示扫描到的列表
-//        binding.blueList.tvBluetoothStatus.setTextColor(
+        binding.bluetoothLayout.pair2.setOnClickListener {
-//            when (bluetoothInfo.state) {
+            showNearByDevicesDialog()
-//                BluetoothAdapter.STATE_ON -> ContextCompat.getColor(requireContext(), R.color.success_green)
+        }
-//                else -> ContextCompat.getColor(requireContext(), R.color.error_red)
-//            }
-//        )
-//
-//        binding.blueList.tvBluetoothAdapter.text = bluetoothInfo.adapterName ?: "未知"
-//        binding.blueList.tvBluetoothVersion.text = bluetoothInfo.getBluetoothVersionDetails()
-//        binding.blueList.tvBleSupport.text = if (bluetoothInfo.isBluetoothLeSupported) "支持" else "不支持"
-
-        // 更新已配对设备数量
-//        val pairedCount = bluetoothInfo.bondedDevices.size
-//        binding.blueList.tvPairedCount.text = "已配对: ${pairedCount}个设备"
     }
 
     /**

myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogBlueTooth.kt

@@ -1,5 +1,6 @@
 package com.xyzshell.myphoneinfo.dialog
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.compose.material3.Text
 import com.xyzshell.andinfo.AndInfo
+import com.xyzshell.andinfo.libs.DeviceInfo
 import com.xyzshell.myphoneinfo.R
 import com.xyzshell.myphoneinfo.base.BaseDialogFragment
 import com.xyzshell.myphoneinfo.databinding.DialogBlueToothBinding
@@ -16,6 +18,7 @@ import com.xyzshell.myphoneinfo.databinding.DialogBlueToothBinding
 class DialogBlueTooth(val type:Int) :BaseDialogFragment<DialogBlueToothBinding>(DialogBlueToothBinding::inflate){
     private var isScanning = false
     private var scanTimer: CountDownTimer? = null
+    private val SCAN_DURATION = 15000 // 15秒
     override fun getTitle(): String  = resources.getString(R.string.bluetooth)
 
     override fun getIconRes(): Int=5
@@ -34,12 +37,13 @@ class DialogBlueTooth(val type:Int) :BaseDialogFragment<DialogBlueToothBinding>(
 //            list.add(deviceMap)
 //        }
         if(type==0){// 显示已配对设备列表
+            binding.progressbar.visibility=View.GONE
             val container = binding.view as? ViewGroup
             container?.let {
                 // 遍历 list，为每个设备创建 item view
                 if(list.isEmpty()){
                     it.addView(TextView(requireContext()).apply {
-                        text = "No devices"
+                        text = getString(R.string.no_devices)
                     })
                 }else{
                     list.forEach { deviceMap ->
@@ -60,115 +64,154 @@ class DialogBlueTooth(val type:Int) :BaseDialogFragment<DialogBlueToothBinding>(
 
             }
         }else{// 显示扫描设备列表
-//            startScanning()
+            startScanning()
         }
 
 
     }
-//    /**
+    /**
-//     * 开始扫描设备
+     * 开始扫描设备
-//     */
+     */
-//    private fun startScanning() {
+    @SuppressLint("SuspiciousIndentation")
-//        if (isScanning) return
+    private fun startScanning() {
-//
+        if (isScanning) return
-//        val bluetoothInfo = AndInfo.instance.bluetooth
+
-//
+        val bluetoothInfo = AndInfo.instance.bluetooth
-//        // 显示扫描UI
+
-//        isScanning = true
+        // 显示扫描UI
-//        binding.view.visibility=View.GONE
+        isScanning = true
-//        binding.progressbar.visibility=View.VISIBLE
+        binding.view.visibility = View.GONE
-//
+        binding.progressbar.visibility = View.VISIBLE
-//        // 启动15秒倒计时
+
-//        startScanTimer(scanDialog)
+        // 设置进度条为15秒倒计时
-//
+        binding.progressItem.max = SCAN_DURATION / 1000  // 最大值为15（秒）
-//        // 开始扫描
+        binding.progressItem.progress = SCAN_DURATION / 1000  // 初始进度为15（秒）
-//        try {
+
-//            // 同时扫描经典蓝牙和BLE设备
+        // 启动15秒进度条倒计时
-//            bluetoothInfo.scanNearbyDevices(
+        startProgressCountdown()
-//                onDeviceFound = { device ->
+
-//                    requireActivity().runOnUiThread {
+        // 开始扫描
-//                        scanDialog.addDevice(device)
+        try {
-//                    }
+            val container = binding.view as? ViewGroup
-//                },
+            container?.let {
-//                onScanFinished = {
+                var list:List<DeviceInfo> = arrayListOf()
-//                    requireActivity().runOnUiThread {
+                // 遍历 list，为每个设备创建 item view
-//                        stopScanning()
+                // 同时扫描经典蓝牙和BLE设备
-//                        scanDialog.scanFinished()
+                bluetoothInfo.scanNearbyDevices(
-//                    }
+                    onDeviceFound = { device ->
-//                }
+                        if (!isAdded || context == null) return@scanNearbyDevices
-//            )
+                        requireActivity().runOnUiThread {
-//
+                            if (!isAdded || context == null) return@runOnUiThread
-//            // 扫描BLE设备
+                            // 加载 item 布局
-//            if (bluetoothInfo.isBluetoothLeSupported) {
+                            val itemView = LayoutInflater.from(requireContext())
-//                bluetoothInfo.scanLeDevices(
+                                .inflate(R.layout.item_blue_tooth, it, false)
-//                    onDeviceFound = { device ->
+
-//                        requireActivity().runOnUiThread {
+                            // 设置设备信息
-//                            scanDialog.addDevice(device)
+                            val tvName = itemView.findViewById<TextView>(R.id.textTitle)
-//                        }
+                            val tvAddress = itemView.findViewById<TextView>(R.id.textContent)
-//                    },
+
-//                    durationMillis = SCAN_DURATION
+                            tvName.text = device.name
-//                )
+                            tvAddress.text = device.address
-//            }
+                            // 添加到容器
-//
+                            it.addView(itemView)
-//        } catch (e: SecurityException) {
+                            binding.view.visibility = View.VISIBLE
-//            Toast.makeText(requireContext(), "蓝牙权限被拒绝", Toast.LENGTH_SHORT).show()
+                            binding.progressbar.visibility = View.GONE
-//            stopScanning()
+
-//        }
+                        }
-//    }
+                    },
-//
+                    onScanFinished = {
-//    /**
+                        requireActivity().runOnUiThread {
-//     * 启动扫描计时器
+                            stopScanning()
-//     */
+                        }
-//    private fun startScanTimer(scanDialog: DialogScanDevices) {
+                    }
-//        scanTimer = object : CountDownTimer(SCAN_DURATION, 1000) {
+                )
-//            override fun onTick(millisUntilFinished: Long) {
+                // 扫描BLE设备
-//                val secondsLeft = millisUntilFinished / 1000
+                if (bluetoothInfo.isBluetoothLeSupported) {
-//                binding.blueList.tvScanStatus.text =
+                    bluetoothInfo.scanLeDevices(
-//                    "正在扫描附近设备... ${secondsLeft}秒后结束"
+                        onDeviceFound = { device ->
-//
+                            if (!isAdded || context == null) return@scanLeDevices
-//                // 更新弹窗中的倒计时
+                            requireActivity().runOnUiThread {
-//                scanDialog.updateTimer(secondsLeft.toInt())
+                                if (!isAdded || context == null) return@runOnUiThread
-//            }
+                                    // 加载 item 布局
-//
+                                    val itemView = LayoutInflater.from(requireContext())
-//            override fun onFinish() {
+                                        .inflate(R.layout.item_blue_tooth, it, false)
-//                stopScanning()
+
-//                scanDialog.scanFinished()
+                                    // 设置设备信息
-//            }
+                                    val tvName = itemView.findViewById<TextView>(R.id.textTitle)
-//        }.start()
+                                    val tvAddress = itemView.findViewById<TextView>(R.id.textContent)
-//    }
+
-//
+                                    tvName.text = device.name
-//    /**
+                                    tvAddress.text = device.address
-//     * 停止扫描
+                                    // 添加到容器
-//     */
+                                    it.addView(itemView)
-//    private fun stopScanning() {
+                                    binding.view.visibility = View.VISIBLE
-//        if (!isScanning) return
+                                    binding.progressbar.visibility = View.GONE
-//
+                            }
-//        isScanning = false
+                        },
-//
+                        durationMillis = SCAN_DURATION.toLong()
-//        // 停止计时器
+                    )
-//        scanTimer?.cancel()
+                }
-//        scanTimer = null
+
-//
+            }
-//        // 隐藏扫描UI
+
-//        binding.blueList.scanLayout.visibility = View.GONE
+
-//
+        } catch (e: SecurityException) {
-//        // 停止蓝牙扫描
+            Toast.makeText(requireContext(), getString(R.string.permissions_required), Toast.LENGTH_SHORT).show()
-//        AndInfo.instance.bluetooth.stopScan()
+            stopScanning()
-//    }
+        }
+    }
+
+    /**
+     * 启动进度条倒计时
+     */
+    private fun startProgressCountdown() {
+        scanTimer = object : CountDownTimer(SCAN_DURATION.toLong(), 1000) {
+            override fun onTick(millisUntilFinished: Long) {
+                val secondsLeft = millisUntilFinished / 1000
+                // 更新进度条（从15递减到0）
+                binding.progressItem.progress = secondsLeft.toInt()
+            }
+
+            override fun onFinish() {
+                // 倒计时结束，停止扫描
+                stopScanning()
+                binding.progressbar.visibility = View.GONE
+            }
+        }.start()
+    }
+
+    /**
+     * 停止扫描
+     */
+    private fun stopScanning() {
+        if (!isScanning) return
+
+        isScanning = false
+
+        // 停止计时器
+        scanTimer?.cancel()
+        scanTimer = null
+        // 重置进度条
+        binding.progressItem.progress = 0
+
+        // 停止蓝牙扫描
+        AndInfo.instance.bluetooth.stopScan()
+    }
+
 
     override fun onNegativeClick() {
         super.onNegativeClick()
-//        stopScanning()
+        stopScanning()
 
     }
 
     override fun onPositiveClick() {
         super.onPositiveClick()
-//        stopScanning()
+        stopScanning()
     }
     override fun onPause() {
         super.onPause()
         // 停止扫描
-//        stopScanning()
+        stopScanning()
     }
 }

myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogInput.kt

@@ -1,13 +1,14 @@
 package com.xyzshell.myphoneinfo.dialog
 
-import android.graphics.Typeface
 import android.os.Bundle
-import android.text.SpannableString
+import android.view.LayoutInflater
-import android.text.style.StyleSpan
 import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.xyzshell.andinfo.AndInfo
+import com.xyzshell.andinfo.libs.InputInfo
 import com.xyzshell.myphoneinfo.R
 import com.xyzshell.myphoneinfo.base.BaseDialogFragment
-import com.xyzshell.myphoneinfo.databinding.DialogCpuInfoBinding
 import com.xyzshell.myphoneinfo.databinding.DialogInputBinding
 
 class DialogInput :BaseDialogFragment<DialogInputBinding>(DialogInputBinding::inflate){
@@ -19,57 +20,40 @@ class DialogInput :BaseDialogFragment<DialogInputBinding>(DialogInputBinding::in
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.text1.textTitle.text = "input_mt_wrapper"
+        val info= AndInfo.instance.input
-        binding.text1.textContent.text = "Input Device 1:\n" +
+        val inputDevices = info.getInputDevices()
-                "input_mt_wrapper\n" +
+        val container = binding.container as? ViewGroup
-                "Descriptor:\n" +
+        container?.let{
-                "a988c03908bee014d816\n" +
+            if(inputDevices.isEmpty()){
-                "71ffdd909090304130b5\n" +
+                it.addView(TextView(requireContext()).apply {
-                "Generation: 14\n" +
+                    text = getString(R.string.no_devices)
-                "Location: built-in\n" +
+                })
-                "Keyboard Type:\n" +
+            }else{
-                "non-alphabetic\n" +
+                inputDevices.forEach { device ->
-                "Has Vibrator: false\n" +
+                    val view= LayoutInflater.from(requireContext()).inflate(R.layout.common_text_input,it,false)
-                "Has mic: false\n" +
+                    view.findViewById<TextView>(R.id.textTitle).text = device.name
-                "Sources: 0x1103\n" +
+                    val sb = StringBuilder()
-                "(keyboard touchscreen)\n" +
+                    sb.append("Input Device ${device.id} :${device.name}\n")
-                "AXISX:\n" +
+                    if(device.descriptor!=null){
-                "source=0x1002 min=0.0\n" +
+                        sb.append("Descriptor: ${device.descriptor}\n")
-                "max=719.0 flat=0.0\n" +
+                    }
-                "fuzz=0.0 resolution=0.0\n" +
+                    sb.append("Vendor Id: ${device.vendorId}\n")
-                "AXISY:\n" +
+                    sb.append("Product Id: ${device.productId}\n")
-                "source=0x1002 min=0.0\n" +
+                    sb.append("Enabled: ${device.isEnabled}\n")
-                "max=1559.0 flat=0.0\n" +
+                    sb.append("Keyboard Type: ${InputInfo.InputDeviceInfo.keyboardTypeToString[device.keyboardType] ?: device.keyboardType.toString()}\n")
-                "fuzz=0.0 resolution=0.0\n" +
+                    sb.append("Has Vibrator: ${device.hasVibrator}\n")
-                "AXIS PRESSURE:\n" +
+                    sb.append("Has Microphone: ${device.hasMicrophone}\n")
-                "source-0x1002 min=0.0\n" +
+                    if(device.sources!=null){
-                "max=1.0 flat=0.0 fuzz=0.0\n" +
+                        sb.append("Sources: ${device.sources}\n")
-                "resolution=0.0\n" +
+                    }
-                "AXIS_SIZE:\n" +
+
-                "source=0x1002 min=0.0\n" +
+
-                "max=1.0 flat=0.0 fuzz=0.0\n" +
+                    view.findViewById<TextView>(R.id.textContent).text =sb
-                "resolution=0.0\n" +
+
-                "AXIS TOUCH_MAJOR:\n" +
+                    it.addView(view)
-                "source=0x1002 min=0.0\n" +
+                }
-                "max=1718.1385 flat=0.0\n" +
+            }
-                "fuzz=0.0 resolution=0.0\n" +
+        }
-                "AXISTOUCH_MINOR:\n" +
-                "source=0x1002 min=0.0\n" +
-                "max=1718.1385 flat=0.0\n" +
-                "fuzz=0.0 resolution=0.0\n" +
-                "AXIS TOOL MAJOR:\n" +
-                "source=0×1002 min=0.0\n" +
-                "max=1718.1385 flat=0.0\n" +
-                "fuzz=0.0 resolution=0.0\n" +
-                "AXIS TOOL MINOR:\n" +
-                "source=0x1002 min=0.0\n" +
-                "max=1718.1385 flat-0.0\n" +
-                "fuzz=0.0 resolution=0.0\n" +
-                "AXIS_ORIENTATION:\n" +
-                "source=0x1002\n" +
-                "min=-1.5707964\n" +
-                "max=1.5707964 flat=0.0\n" +
-                "fuzz=0.0 resolution=0.0"
     }
 
     override fun onNegativeClick() {

myphoneinfo/src/main/res/layout/common_text_input.xml

@@ -12,16 +12,16 @@
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:text="@string/model"
-            android:textSize="15sp"
+            android:textSize="12sp"
             android:textStyle="bold" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/textContent"
-            style="@style/TextContentRight"
+            style="@style/LeftContent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:text="@string/apps"
-            android:textSize="15sp"
+            android:textColor="@color/right_color"
-            tools:ignore="RelativeOverlap" />
+            android:textSize="12sp" />
 </LinearLayout>

myphoneinfo/src/main/res/layout/dialog_blue_tooth.xml

@@ -21,10 +21,13 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:gravity="center"
+            android:visibility="gone"
             android:orientation="vertical">
             <ProgressBar
+                android:id="@+id/progressItem"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:max="15"
                 android:indeterminateTint="@color/module_title_color" />
             <TextView
                 android:layout_width="wrap_content"

myphoneinfo/src/main/res/layout/dialog_input.xml

@@ -9,18 +9,11 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
         <LinearLayout
+            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"/>
-            <include layout="@layout/common_text_15size_style" android:id="@+id/text1"/>
-            <include layout="@layout/common_text_15size_style" android:id="@+id/text2"/>
-            <include layout="@layout/common_text_15size_style" android:id="@+id/text3"/>
-            <include layout="@layout/common_text_15size_style" android:id="@+id/text4"/>
-            <include layout="@layout/common_text_15size_style" android:id="@+id/text5"/>
-        </LinearLayout>
-
     </androidx.core.widget.NestedScrollView>
 
 

myphoneinfo/src/main/res/layout/hard_bluetooth.xml

@@ -73,7 +73,7 @@
             android:id="@+id/blueList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+            android:visibility="visible"
             android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"

myphoneinfo/src/main/res/layout/item_blue_tooth.xml

@@ -2,20 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="4dp"
+        android:layout_margin="4dp"
         android:orientation="horizontal">
         <com.google.android.material.textview.MaterialTextView
             style="@style/LeftContent"
             android:id="@+id/textTitle"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:gravity="start"
             android:textSize="12sp"
             android:text="NUCBOX_K8" />
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1"/>
         <com.google.android.material.textview.MaterialTextView
         android:id="@+id/textContent"
             style="@style/LeftContent"
@@ -23,6 +20,7 @@
             android:layout_height="wrap_content"
             android:gravity="start"
             android:textSize="12sp"
+            android:layout_marginStart="20dp"
             android:textColor="@color/right_color"
             android:text="D0:12:55:2C:43:FB" />
 </LinearLayout>

myphoneinfo/src/main/res/values/strings.xml

@@ -301,4 +301,24 @@
     <string name="autofocus_modes">Autofocus modes</string>
     <string name="scene_modes">Scene modes</string>
     <string name="scanning">Scanning...</string>
+    <string name="no_devices">No devices</string>
+    <string name="permissions_required">Bluetooth permission denied.</string>
+    <string name="bluetooth_not_enabled">Bluetooth is not enabled.</string>
+    <string name="bluetooth_le">Bluetooth LE (Low Energy)</string>
+    <string name="multiple_advertisement">Multiple advertisement</string>
+    <string name="offloaded_filtering">Offloaded filtering</string>
+    <string name="offloaded_scan_batching">Offloaded scan batching</string>
+    <string name="le_periodic_advertising">LE Periodic Advertising</string>
+    <string name="le_extended_advertising">LE Extended Advertising</string>
+    <string name="le_2m_phy_high_speed">LE 2M PHY (high speed)</string>
+    <string name="le_2m_phy_low_power">LE Coded PHY (long range)</string>
+    <string name="le_audio_support">LE Audio support</string>
+    <string name="usb_host_support">USB host support</string>
+    <string name="usb_accessory_support">USB accessory support</string>
+    <string name="infrared_transmitter">Infrared transmitter</string>
+    <string name="uwb_support">UWB support</string>
+    <string name="nfc_support">NFC support</string>
+    <string name="secure_nfc_support">Secure NFC support</string>
+    <string name="gps">GPS</string>
+
 </resources>