Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_goodmoney
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_goodmoney
Commits
f9f19416
Commit
f9f19416
authored
Mar 29, 2021
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
c35b6e3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
51 deletions
+0
-51
SettingsActivity.kt
...java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
+0
-7
activity_settings.xml
GoodMoney/app/src/main/res/layout/activity_settings.xml
+0
-44
No files found.
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
View file @
f9f19416
...
...
@@ -205,14 +205,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
readyGo
(
AboutusActivity
::
class
.
java
)
}
R
.
id
.
btn_switch
->
{
<<<<<<<
HEAD
UserManager
.
getInstance
().
userLogout
()
readyGoThenKill
(
MainActivity
::
class
.
java
)
// readyGo(LoginActivity::class.java)
=======
backDialog
()
>>>>>>>
dev_ad
}
R
.
id
.
iv_left_icon
->
{
onBackPressed
()
...
...
GoodMoney/app/src/main/res/layout/activity_settings.xml
View file @
f9f19416
...
...
@@ -6,49 +6,6 @@
<include
layout=
"@layout/header_layout"
/>
<<<<<<
< HEAD
<include
android:id=
"@+id/item_phone"
layout=
"@layout/item_settings"
/>
<include
android:id=
"@+id/item_wechat"
layout=
"@layout/item_settings"
/>
<include
android:id=
"@+id/item_invitedCode"
layout=
"@layout/item_settings"
android:visibility=
"gone"
/>
<include
android:id=
"@+id/item_cleanCache"
layout=
"@layout/item_settings"
/>
<include
android:id=
"@+id/item_userAgree"
layout=
"@layout/item_settings"
/>
<include
android:id=
"@+id/item_privacyAgree"
layout=
"@layout/item_settings"
/>
<include
android:id=
"@+id/item_aboutUs"
layout=
"@layout/item_settings"
/>
<Button
android:id=
"@+id/btn_switch"
android:layout_width=
"201dp"
android:layout_height=
"50dp"
android:layout_gravity=
"center"
android:layout_marginLeft=
"20dp"
android:layout_marginTop=
"20dp"
android:layout_marginRight=
"20dp"
android:background=
"@drawable/shape_btn_switch"
android:text=
"退出登录"
android:textColor=
"@color/white"
android:textSize=
"16sp"
/>
=======
<com.mints.goodmoney.ui.widgets.ElasticScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
@@ -106,6 +63,5 @@
</LinearLayout>
</com.mints.goodmoney.ui.widgets.ElasticScrollView>
>>>>>>> dev_ad
</LinearLayout>
\ 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