yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.8.0]

Browse Source 
[fea]
[增加结束虚拟单按钮]
This commit is contained in:
yangyakun
2024-11-20 15:47:39 +08:00
parent 94046a67fd
commit 6a062c6dc6
25 changed files with 116 additions and 2677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OCH/common/common/src/main/AndroidManifest.xml
View File

@@ -1,29 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.och.common.module">
<uses-permission android:name="android.permission.BLUETOOTH"
android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH"
android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30" />
<!--查找蓝牙设备-->
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<!--使当前设备可被其他蓝牙设备检测到-->
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<!--与已配对的蓝牙设备进行通讯-->
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<!--使用蓝牙扫描结果来推导物理位置-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<application>
<activity
android:name=".wigets.media.MediaPlayerActivity"

32
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/bluetooth/BaseBluetoothManager.kt
View File

@@ -51,37 +51,5 @@ open class BaseBluetoothManager {
ToastUtils.showShort("设备无蓝牙硬件")
return BluetoothState.NONE
}
fun requestPermission(){
if (PermissionUtil.checkPermission(AbsMogoApplication.getApp(), *permissionlist)) {
}else{
//申请悬浮窗权限
val shouldShowRequestPermissionRationale = ActivityUtils.getTopActivity()
.shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)
if(shouldShowRequestPermissionRationale){// 可以弹窗系统权限框
ActivityCompat.requestPermissions(
ActivityUtils.getTopActivity(),
permissionlist, MainPresenter.MOGO_PERMISSION_REQUEST_CODE
)
}else{// 不会弹系统弹窗
PermissionsDialogUtils.openAppDetails(ActivityUtils.getTopActivity(), "蓝牙", 100)
}
}
}
fun checkPermission():Boolean{
AbsMogoApplication.getApp()?.let {
permissionlist.forEach { permission->
val checkSelfPermission = ActivityCompat.checkSelfPermission(it, permission)
if (PackageManager.PERMISSION_GRANTED!=checkSelfPermission) {
return false
}
}
}
return true
}
}

1
OCH/common/common/src/main/res/layout/common_dialog_status_new.xml
View File

@@ -13,6 +13,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/common_dialog_close"
android:visibility="gone"
android:layout_marginEnd="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_50"
android:layout_width="@dimen/dp_60"

6
OCH/common/common/src/main/res/values/strings.xml
View File

@@ -33,4 +33,10 @@
<string name="common_biz_loading">加载中……</string>
<string name="common_empty_data">暂无数据</string>
<string name="common_error_data">重新加载</string>
<string name="common_dialog_title">提示</string>
<string name="common_dialog_confirm">确认</string>
<string name="common_dialog_cancel">取消</string>
</resources>