代码优化

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt

@@ -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

@@ -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