Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature_android_permission #1052

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/Dokit.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ dependencies {
implementation rootProject.ext.dependencies["easypermissions"]
releaseImplementation rootProject.ext.dependencies["okgo"]
//高德地图定位
implementation rootProject.ext.dependencies["amap_location"]
// implementation rootProject.ext.dependencies["amap_location"]
//高德地图
// implementation rootProject.ext.dependencies["amap_map3d"]
//高德搜索
implementation rootProject.ext.dependencies["amap_search"]
// implementation rootProject.ext.dependencies["amap_search"]
implementation rootProject.ext.dependencies["amap_navi"]
//腾讯地图定位
// implementation rootProject.ext.dependencies["tencent_location"]
Expand Down
4 changes: 3 additions & 1 deletion Android/dokit/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
android:name=".kit.connect.DoKitScanActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|stateUnchanged" />

<activity
android:name=".kit.permissionlist.ExpandableActivity"
android:screenOrientation="portrait"/>
<provider
android:name=".DebugFileProvider"
android:authorities="${applicationId}.debugfileprovider"
Expand Down
Loading