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
7d632fdd
Commit
7d632fdd
authored
Jul 28, 2021
by
mengcuiguang2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改协议展示
parent
9c0bfa8f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
8 deletions
+17
-8
Constant.kt
app/src/main/java/com/mints/street/common/Constant.kt
+6
-0
HomeFragment.kt
app/src/main/java/com/mints/street/main/home/HomeFragment.kt
+1
-1
AboutusActivity.kt
...src/main/java/com/mints/street/main/my/AboutusActivity.kt
+3
-2
MoresettingsActivity.kt
...ain/java/com/mints/street/main/my/MoresettingsActivity.kt
+3
-2
MyFragment.kt
app/src/main/java/com/mints/street/main/my/MyFragment.kt
+3
-2
PermissionsActivity.kt
...main/java/com/mints/street/main/my/PermissionsActivity.kt
+1
-1
No files found.
app/src/main/java/com/mints/street/common/Constant.kt
View file @
7d632fdd
package
com.mints.street.common
import
com.mints.street.BuildConfig
object
Constant
{
/**
...
...
@@ -16,4 +18,8 @@ object Constant {
* 第一次打开权限页面
*/
const
val
FIRST_OPEN_PERMISSIONS
=
"first_open_permissions"
// 协议地址
var
REGISTER_URL
=
BuildConfig
.
MainIp
+
"map/register.html"
//服务协议
var
PRIVACY_URL
=
BuildConfig
.
MainIp
+
"map/privacy.html"
//隐私协议
}
app/src/main/java/com/mints/street/main/home/HomeFragment.kt
View file @
7d632fdd
...
...
@@ -117,7 +117,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
// 默认 天安门
val
center
=
LatLng
(
it
[
"latitude"
]
?:
39.915071
,
it
[
"longitude"
]
?:
116.403907
)
setNewMapStatus
(
center
)
binding
.
scrollLayout
.
toggle
(
ScrollLayout
.
STATUS_
CLOSE
)
binding
.
scrollLayout
.
toggle
(
ScrollLayout
.
STATUS_
DEFAULT
)
})
}
...
...
app/src/main/java/com/mints/street/main/my/AboutusActivity.kt
View file @
7d632fdd
...
...
@@ -10,6 +10,7 @@ import com.fry.base.base.BaseActivity
import
com.mints.street.AppApplication
import
com.mints.street.BR
import
com.mints.street.R
import
com.mints.street.common.Constant
import
com.mints.street.utils.CommonUtils
import
com.mints.street.webview.MintsWebViewActivity
import
kotlinx.android.synthetic.main.activity_aboutus.*
...
...
@@ -54,10 +55,10 @@ class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>()
when
(
v
?.
id
)
{
R
.
id
.
iv_left_icon
->
finish
()
R
.
id
.
tv_user
->
{
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
"http://test.mints-id.com/map-api/map/register.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
Constant
.
REGISTER_URL
)
}
R
.
id
.
tv_privacy
->
{
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
"http://test.mints-id.com/map-api/map/privacy.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
Constant
.
PRIVACY_URL
)
}
}
}
...
...
app/src/main/java/com/mints/street/main/my/MoresettingsActivity.kt
View file @
7d632fdd
...
...
@@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat
import
com.fry.base.base.BaseActivity
import
com.mints.street.BR
import
com.mints.street.R
import
com.mints.street.common.Constant
import
com.mints.street.databinding.ActivityMoresettingsBinding
import
com.mints.street.manager.UserManager
import
com.mints.street.webview.MintsWebViewActivity
...
...
@@ -126,10 +127,10 @@ class MoresettingsActivity : BaseActivity<ActivityMoresettingsBinding, Moresetti
KLog
.
e
(
"setOnClick"
,
"btn_switch has been clicked."
)
}
R
.
id
.
item_userAgree
->
{
//用户协议
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
"http://test.mints-id.com/map-api/map/register.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
Constant
.
REGISTER_URL
)
}
R
.
id
.
item_privacyAgree
->
{
//隐私协议
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
"http://test.mints-id.com/map-api/map/privacy.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
Constant
.
PRIVACY_URL
)
}
}
...
...
app/src/main/java/com/mints/street/main/my/MyFragment.kt
View file @
7d632fdd
...
...
@@ -22,6 +22,7 @@ import com.mints.street.BR
import
com.mints.street.R
import
com.mints.street.bean.UserBean
import
com.mints.street.bean.WXInfo
import
com.mints.street.common.Constant
import
com.mints.street.databinding.FragmentMyBinding
import
com.mints.street.login.LoginActivity
import
com.mints.street.login.LoginApi
...
...
@@ -215,10 +216,10 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
// }
// }
R
.
id
.
tv_regist
->
{
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
"http://test.mints-id.com/map-api/map/register.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
Constant
.
REGISTER_URL
)
}
R
.
id
.
tv_private
->
{
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
"http://test.mints-id.com/map-api/map/privacy.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"隐私协议"
,
url
=
Constant
.
PRIVACY_URL
)
}
}
}
...
...
app/src/main/java/com/mints/street/main/my/PermissionsActivity.kt
View file @
7d632fdd
...
...
@@ -101,7 +101,7 @@ class PermissionsActivity : BaseActivity<ActivityPermissionsBinding, Permission
return
}
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
"http://test.mints-id.com/map-api/map/register.html"
)
MintsWebViewActivity
.
startWebView
(
name
=
"用户协议"
,
url
=
Constant
.
REGISTER_URL
)
}
R
.
id
.
tv_private
->{
if
(!
NetUtils
.
isNetworkConnected
(
AppApplication
.
getContext
()))
{
...
...
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