Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_street
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
android
android_street
Commits
b592441b
Commit
b592441b
authored
Sep 09, 2021
by
fengruiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改BUg
720音频问题 修改名称
parent
ec9831dd
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
7 deletions
+31
-7
Constant.kt
app/src/main/java/com/mints/street/common/Constant.kt
+1
-1
AboutusActivity.kt
...src/main/java/com/mints/street/main/my/AboutusActivity.kt
+1
-1
MintsWebViewActivity.kt
...ain/java/com/mints/street/webview/MintsWebViewActivity.kt
+24
-0
activity_permissions.xml
app/src/main/res/layout/activity_permissions.xml
+2
-2
dialog_backvip.xml
app/src/main/res/layout/dialog_backvip.xml
+1
-1
dialog_power.xml
app/src/main/res/layout/dialog_power.xml
+1
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/src/main/java/com/mints/street/common/Constant.kt
View file @
b592441b
...
...
@@ -7,7 +7,7 @@ object Constant {
/**
* app名称
*/
const
val
MINTS_APP_NAME
=
"3D高清街景"
const
val
MINTS_APP_NAME
=
"
世界
3D高清街景"
/**
* 应用包名
...
...
app/src/main/java/com/mints/street/main/my/AboutusActivity.kt
View file @
b592441b
...
...
@@ -40,7 +40,7 @@ class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>()
tv_title
.
setTextColor
(
Color
.
BLACK
)
iv_left_icon
.
setImageResource
(
R
.
mipmap
.
ic_arrow_back
)
iv_left_icon
.
visibility
=
View
.
VISIBLE
tvAboutasVersion
.
text
=
"3D高清街景 v"
+
DeviceInfo
.
instance
.
versionName
tvAboutasVersion
.
text
=
"
世界
3D高清街景 v"
+
DeviceInfo
.
instance
.
versionName
tvAboutasService
.
setOnClickListener
(
this
)
tvAboutasPolicy
.
setOnClickListener
(
this
)
...
...
app/src/main/java/com/mints/street/webview/MintsWebViewActivity.kt
View file @
b592441b
package
com.mints.street.webview
import
android.content.Context
import
android.content.Intent
import
android.media.AudioManager
import
android.os.Bundle
import
android.view.ViewGroup
import
android.webkit.WebChromeClient
...
...
@@ -50,6 +52,10 @@ class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebV
return
"file:///android_asset/web/m.html?lat=${lat}&lng=${lng}&bk=${bk}"
}
}
private
var
audioManager
:
AudioManager
?=
null
private
var
listener
:
AudioManager
.
OnAudioFocusChangeListener
?=
null
override
fun
initContentView
(
savedInstanceState
:
Bundle
?)
=
R
.
layout
.
activity_mints_web_view
override
fun
initVariableId
()
=
BR
.
viewModel
...
...
@@ -88,6 +94,24 @@ class MintsWebViewActivity : BaseActivity<ActivityMintsWebViewBinding, MintsWebV
}
override
fun
onResume
()
{
if
(
audioManager
!=
null
)
{
audioManager
?.
abandonAudioFocus
(
listener
)
audioManager
=
null
;
}
super
.
onResume
()
}
override
fun
onPause
()
{
super
.
onPause
()
//解决退出时音效继续播放
audioManager
=
this
.
getSystemService
(
Context
.
AUDIO_SERVICE
)
as
(
AudioManager
)
listener
=
AudioManager
.
OnAudioFocusChangeListener
()
{
}
audioManager
?.
requestAudioFocus
(
listener
,
AudioManager
.
STREAM_MUSIC
,
AudioManager
.
AUDIOFOCUS_GAIN_TRANSIENT
);
}
override
fun
onDestroy
()
{
...
...
app/src/main/res/layout/activity_permissions.xml
View file @
b592441b
...
...
@@ -19,7 +19,7 @@
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_marginTop=
"25dp"
android:text=
"3D高清街景"
android:text=
"
世界
3D高清街景"
android:textStyle=
"bold"
android:textColor=
"@color/black"
android:textSize=
"25dp"
/>
...
...
@@ -183,7 +183,7 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"您的个人信息将受到严格的保密,3D高清街景不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权,但可能影响部分功能使用。"
android:text=
"您的个人信息将受到严格的保密,
世界
3D高清街景不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权,但可能影响部分功能使用。"
android:layout_margin=
"10dp"
android:textColor=
"#CD000000"
/>
...
...
app/src/main/res/layout/dialog_backvip.xml
View file @
b592441b
...
...
@@ -49,7 +49,7 @@
android:layout_height=
"wrap_content"
android:elevation=
"5dp"
android:layout_marginTop=
"4dp"
android:text=
"3D高清街景会员吗?"
android:text=
"
世界
3D高清街景会员吗?"
android:textColor=
"#8E5832"
android:textSize=
"26sp"
android:textStyle=
"bold"
...
...
app/src/main/res/layout/dialog_power.xml
View file @
b592441b
...
...
@@ -38,7 +38,7 @@
android:layout_marginLeft=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginRight=
"16dp"
android:text=
"我们依据最新的法律,向您说明3D高清街景软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
android:text=
"我们依据最新的法律,向您说明
世界
3D高清街景软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
android:textColor=
"@color/black"
android:textSize=
"14sp"
/>
...
...
app/src/main/res/values/strings.xml
View file @
b592441b
<resources>
<string
name=
"app_name"
>
3D高清街景
</string>
<string
name=
"app_name"
>
世界
3D高清街景
</string>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment