Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -95,6 +95,8 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:taskAffinity="com.quansu.heifengwuliu" />
+        <activity android:name=".activity.MsgActivity" />
+        <activity android:name=".activity.AccountActivity" />
 
     </application >
 

app/src/main/java/com/quansu/heifengwuliu/activity/AccountActivity.kt

@@ -0,0 +1,74 @@
+package com.quansu.heifengwuliu.activity
+
+import android.graphics.Color
+import android.graphics.Typeface
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.PagerAdapter
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.databinding.ActivityAccountBinding
+import com.quansu.heifengwuliu.fragment.AccountAnalysisFragment
+import com.quansu.heifengwuliu.fragment.AccountBillFragment
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+class AccountActivity : MBActivity<BViewModel<BRepository>, ActivityAccountBinding>() {
+
+    override fun initView(view: View?) {
+        super.initView(view)
+
+        initTabs()
+        initPager()
+    }
+
+    private fun initPager() {
+        val mPagerAdapter: PagerAdapter = object : FragmentPagerAdapter(supportFragmentManager) {
+            override fun getItem(position: Int): Fragment {
+                return if (position == 1) {
+                    AccountAnalysisFragment()
+                } else AccountBillFragment()
+            }
+
+            override fun getCount(): Int {
+                return 2
+            }
+        }
+        binding.pager.adapter = mPagerAdapter
+        binding.tabs.setupWithViewPager(binding.pager, false)
+    }
+
+
+    private fun initTabs() {
+        binding.tabs.setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context(), 3), false, true))
+        val builder = binding.tabs.tabBuilder()
+        builder
+                .skinChangeWithTintColor(false)
+                .setSelectColor(Color.parseColor("#2E4E71"))
+                .setNormalColor(Color.parseColor("#666666"))
+                .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT_BOLD)
+                .setDynamicChangeIconColor(false)
+        val component = builder
+                .setText(getString(R.string.bill))
+                .build(context())
+        val util = builder
+                .setText(getText(R.string.analysis))
+                .build(context())
+        binding.tabs
+                .addTab(component)
+                .addTab(util)
+    }
+
+
+    override fun binding(): ActivityAccountBinding {
+        return ActivityAccountBinding.inflate(layoutInflater)
+    }
+
+
+    override fun title(): String? {
+        return getString(R.string.my_account)
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/activity/MsgActivity.kt

@@ -0,0 +1,29 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.adapter.MsgAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityMsgBinding
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class MsgActivity : MBRActivity<BRViewModel<BRRepository>, MsgAdapter, ActivityMsgBinding>() {
+    override fun binding(): ActivityMsgBinding {
+        return ActivityMsgBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): MsgAdapter {
+        return MsgAdapter()
+    }
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("", vm?.repository()?.autoPage()!!)
+    }
+
+    override fun title(): String? {
+        return getString(R.string.msg)
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/activity/OneLoginActivity.kt

@@ -1,6 +1,5 @@
 package com.quansu.heifengwuliu.activity
 
-import android.util.Log
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.quansu.heifengwuliu.base.MBActivity
@@ -42,9 +41,7 @@ class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>() {
 
     @Subscribe(tags = [Tag(ConfigRx.ADD_ONELOGIN)])
     fun setOneLogin(token: String) {
-        Log.e("-shy-", "token1: " + token)
         vm.oneLogin(token)
-
     }
 
     @Subscribe(tags = [Tag(ConfigRx.ONELOGIN_ERROR)])
@@ -82,7 +79,6 @@ class OneLoginActivity : MBActivity<OneLoginVModel, ActivityOneloginBinding>() {
 
     @Subscribe(tags = [Tag(ConfigRx.ADD_SEND_CODE)])
     fun setLoginCode(code: String) {
-        Log.d("Hello", code)
         vm.login(code)
     }
 }

app/src/main/java/com/quansu/heifengwuliu/activity/RegisterActivity.kt

@@ -11,9 +11,8 @@ class RegisterActivity : MBActivity<RegisterVModel, ActivityRegisterBinding>() {
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
-        vm.open_id=intent?.extras?.getString("open_id", "")
-
-
+        vm.openId = intent?.extras?.getString("openid", "")
+        vm.unionId = intent?.extras?.getString("unionid", "")
     }
 
 

app/src/main/java/com/quansu/heifengwuliu/activity/SettingsActivity.kt

@@ -5,14 +5,11 @@ import android.view.View
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog.MessageDialogBuilder
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.databinding.ActivitySettingsBinding
 import com.quansu.heifengwuliu.repository.UserInfoRepository
-import com.quansu.heifengwuliu.utils.SettingsUtil
 import com.quansu.heifengwuliu.vmodel.SettingsVModel
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.ccretrofit.CCRetrofit
@@ -27,54 +24,21 @@ class SettingsActivity : MBActivity<SettingsVModel, ActivitySettingsBinding>() {
     override fun listeners() {
         super.listeners()
 
-        binding.cbIcGoogle.isChecked = SettingsUtil.pinGoogleIcon()
-        binding.cbClip.isChecked = SettingsUtil.clipboardListener()
-        binding.cbAutoAd.isChecked = SettingsUtil.autoAd()
-        binding.cbMsg.isChecked = SettingsUtil.showMsg()
-        binding.cbDoublePaste.isChecked = SettingsUtil.doubleClickPaste()
         binding.layAboutUs.onClick {
             single(AboutActivity::class.java)
         }
         binding.layCheckupdate.setOnClickListener { v: View? ->
 
+            //检查更新
             CCRetrofit.instance()
                     .create(IUpdate::class.java)
-                    .checkUpgrade(false)
+                    .checkUpgrade(true)
                     .subscribe()
 
         }
-        binding.layBackup.setOnClickListener { v: View? ->
-            MessageDialogBuilder(context())
-                    .setTitle("备份")
-                    .setMessage("确定要将现在所有的设置备份到云中吗？")
-                    .addAction("取消") { dialog: QMUIDialog, index: Int -> dialog.dismiss() }
-                    .addAction("是的") { dialog: QMUIDialog?, index: Int ->
-                        toast(R.string.developing)
-
-//                        val funcs = App.getConfigOrm().query(Func::class.java)
-//                        val searchEngines = App.getConfigOrm().query(SearchEngine::class.java)
-                    }
-                    .show()
-        }
 
-        binding.layRestore.setOnClickListener { v: View? ->
-            MessageDialogBuilder(context())
-                    .setTitle("恢复备份")
-                    .setMessage("确定要恢复云中的备份？")
-                    .addAction("取消") { dialog: QMUIDialog, which: Int -> dialog.dismiss() }
-                    .addAction("是的") { dialog: QMUIDialog?, which: Int ->
-                        toast(R.string.developing)
-
-//                        SettingsUtil.backUp()
-                    }
-                    .show()
-        }
 
 
-        binding.cbIcGoogle.setOnCheckedChangeListener { buttonView, isChecked ->
-            SettingsUtil.pinGoogleIcon(isChecked)
-//            RoundSearchWidget.setDefault(context())
-        }
 
 
 
@@ -82,7 +46,7 @@ class SettingsActivity : MBActivity<SettingsVModel, ActivitySettingsBinding>() {
             message(R.string.enture_logout, negativeEnable = true, positiveAction = { dialog, _ ->
                 MMKVManager.instance().clearAll()
                 dialog.dismiss()
-                UiSwitch.single_new_task_with_clear_task(context(), PrivateCenterActivity::class.java)
+                UiSwitch.single_new_task_with_clear_task(context(), OneLoginActivity::class.java)
             })
         }
     }

app/src/main/java/com/quansu/heifengwuliu/activity/TodosActivity.kt

@@ -10,24 +10,6 @@ import com.ysnows.base.net.IResponse
 import io.reactivex.Observable
 
 class TodosActivity : MBRActivity<TodoListVModel, TodosAdapter, ActivityTodosBinding>() {
-    //    @Override
-    //    public void onItemDragEnd(RecyclerView.ViewHolder viewHolder, int pos) {
-    //
-    //        int size = getAdapter().getData().size();
-    //        for (int i = 0; i < size; i++) {
-    ////            Todo item = getAdapter().getData().get(i);
-    //
-    ////            HashMap<String, Object> params = new HashMap<>();
-    ////            params.put("order", size - i);
-    //
-    ////            vm.repository().lreq(NetEngine.getService().taskSave(item.id, params), new OnRes<String>() {
-    ////                @Override
-    ////                public void onCall(IResponse<String> res) {
-    ////
-    ////                }
-    ////            });
-    //        }
-    //    }
     override fun title(): String {
         return getStr(R.string.todo_list)!!
     }

app/src/main/java/com/quansu/heifengwuliu/activity/WebViewActivity.kt

@@ -1,6 +1,8 @@
 package com.quansu.heifengwuliu.activity
 
 import android.os.Bundle
+import android.webkit.WebView
+import com.qmuiteam.qmui.widget.webview.QMUIWebViewClient
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.databinding.ActivityWebviewBinding
 import com.ysnows.base.base.BRepository
@@ -10,6 +12,12 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
+
+        binding.webView.webViewClient = MyWebViewClient()
+        val settings = binding.webView.settings
+        settings.javaScriptEnabled = true
+
+
         binding.webView.loadUrl(intent?.extras?.getString("url", "http://www.baidu.com"))
     }
 
@@ -22,4 +30,20 @@ open class WebViewActivity : MBActivity<BViewModel<BRepository>, ActivityWebview
         super.onDestroy()
     }
 
+
+    private class MyWebViewClient : QMUIWebViewClient(true, false) {
+
+        override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+//            if (Uri.parse(url).host == "www.example.com") {
+            // This is my web site, so do not override; let my WebView load the page
+            return false
+//            }
+            // Otherwise, the link is not for a page on my site, so launch another Activity that handles URLs
+//            Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
+//                startActivity(this)
+//            }
+//            return true
+        }
+    }
+
 }

app/src/main/java/com/quansu/heifengwuliu/adapter/BillAdapter.kt

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemMsgBinding
+import com.quansu.heifengwuliu.model.Msg
+import com.ysnows.base.base.BAdapter
+
+class BillAdapter : BAdapter<Msg, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
+    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: Msg) {
+        holder.dataBinding?.item = item
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/adapter/MsgAdapter.kt

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemMsgBinding
+import com.quansu.heifengwuliu.model.Msg
+import com.ysnows.base.base.BAdapter
+
+class MsgAdapter : BAdapter<Msg, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
+    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: Msg) {
+        holder.dataBinding?.item = item
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/base/MBActivity.kt

@@ -1,7 +1,7 @@
 package com.quansu.heifengwuliu.base
 
 import androidx.databinding.ViewDataBinding
-import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BActivity
@@ -26,4 +26,15 @@ abstract class MBActivity<VM : BViewModel<*>, B : ViewDataBinding> : BActivity<V
         return User.get()
     }
 
+    override fun bgColor(): Int {
+        return R.color.white
+    }
+
+    override fun titleColor(): Int {
+        return R.color.black
+    }
+
+    override fun backDrawable(): Int {
+        return R.drawable.ic_back_black
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/base/MBRActivity.kt

@@ -3,7 +3,7 @@ package com.quansu.heifengwuliu.base
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRActivity
@@ -27,4 +27,17 @@ abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
     override fun user(): IUser? {
         return User.get()
     }
+
+    override fun bgColor(): Int {
+        return R.color.white
+    }
+
+    override fun titleColor(): Int {
+        return R.color.black
+    }
+
+    override fun backDrawable(): Int {
+        return R.drawable.ic_back_black
+    }
+
 }

app/src/main/java/com/quansu/heifengwuliu/base/MBRFragment.kt

@@ -3,7 +3,6 @@ package com.quansu.heifengwuliu.base
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.quansu.heifengwuliu.activity.LoginActivity
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRFragment
@@ -29,4 +28,6 @@ abstract class MBRFragment<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
     override fun user(): IUser? {
         return User.get()
     }
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/AccountAnalysisFragment.kt

@@ -0,0 +1,20 @@
+package com.quansu.heifengwuliu.fragment
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.quansu.heifengwuliu.base.MBFragment
+import com.quansu.heifengwuliu.databinding.FragmentAccountAnalysisBinding
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+class AccountAnalysisFragment : MBFragment<BViewModel<BRepository>, FragmentAccountAnalysisBinding>() {
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentAccountAnalysisBinding {
+        return FragmentAccountAnalysisBinding.inflate(inflater, container, false)
+    }
+
+
+    override fun title(): String? {
+        return null
+    }
+
+}

app/src/main/java/com/quansu/heifengwuliu/fragment/AccountBillFragment.kt

@@ -0,0 +1,31 @@
+package com.quansu.heifengwuliu.fragment
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.quansu.heifengwuliu.adapter.BillAdapter
+import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.databinding.FragmentAccountBillBinding
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class AccountBillFragment : MBRFragment<BRViewModel<BRRepository>, BillAdapter, FragmentAccountBillBinding>() {
+
+    override fun initAdapter(): BillAdapter {
+        return BillAdapter()
+    }
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("", vm?.repository()?.autoPage()!!)
+    }
+
+    override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentAccountBillBinding {
+        return FragmentAccountBillBinding.inflate(layoutInflater, container, false)
+    }
+
+    override fun title(): String? {
+        return null
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/fragment/IndexFragment.kt

@@ -2,14 +2,10 @@ package com.quansu.heifengwuliu.fragment
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.qmuiteam.qmui.kotlin.onClick
-import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.base.MBFragment
 import com.quansu.heifengwuliu.databinding.FragmentIndexBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
-import com.ysnows.base.utils.MMKVManager
-import com.ysnows.base.utils.UiSwitch
 
 /**
  *Created by shihuiyun
@@ -20,10 +16,6 @@ class IndexFragment : MBFragment<BViewModel<BRepository>, FragmentIndexBinding>(
     override fun listeners() {
         super.listeners()
 
-        binding.btnLogout.onClick {
-            MMKVManager.instance().clearAll()
-            UiSwitch.single_new_task_with_clear_task(context, OneLoginActivity::class.java)
-        }
     }
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentIndexBinding {

app/src/main/java/com/quansu/heifengwuliu/fragment/MineFragment.kt

@@ -12,8 +12,7 @@ import com.ysnows.base.base.BRepository
  *Created by shihuiyun
  *on 2020/9/9
  */
-class MineFragment  : MBFragment<MineVModel, FragmentMineBinding>(){
-
+class MineFragment : MBFragment<MineVModel, FragmentMineBinding>() {
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentMineBinding {
         return FragmentMineBinding.inflate(layoutInflater)

app/src/main/java/com/quansu/heifengwuliu/model/Bill.kt

@@ -0,0 +1,11 @@
+package com.quansu.heifengwuliu.model
+
+
+data class Bill(
+        val title: String?,
+        val content: String?,
+        val create_time: String?,
+        val checked: Int?
+) {
+
+}

app/src/main/java/com/quansu/heifengwuliu/model/LoginBean.java

@@ -8,6 +8,8 @@ import com.ysnows.base.inter.IModel;
  */
 public class LoginBean implements IModel {
     public String uid;
+    public String openid;
+    public String unionid;
     public String name;
     public String mobile;
     public String TOKEN;

app/src/main/java/com/quansu/heifengwuliu/model/Msg.kt

@@ -0,0 +1,12 @@
+package com.quansu.heifengwuliu.model
+
+
+data class Msg(
+        val title: String?,
+        val content: String?,
+        val create_time: String?,
+        val checked: Int?
+) {
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/model/User.java

@@ -30,7 +30,6 @@ public class User implements IUser, Parcelable, IModel {
         return type == 1;
     }
 
-
     public Boolean isShipper() {
         return type == 2;
     }

app/src/main/java/com/quansu/heifengwuliu/repository/MineRepository.kt

@@ -1,10 +1,8 @@
 package com.quansu.heifengwuliu.repository
 
-import com.ysnows.base.base.BRepository
-
 /**
  *Created by shihuiyun
  *on 2020/9/10
  */
-class MineRepository: BRepository() {
+class MineRepository: UserInfoRepository() {
 }

app/src/main/java/com/quansu/heifengwuliu/repository/OneLoginRepository.kt

@@ -1,22 +1,22 @@
 package com.quansu.heifengwuliu.repository
 
 import android.annotation.SuppressLint
+import android.os.Bundle
 import com.quansu.heifengwuliu.activity.HomeActivity
 import com.quansu.heifengwuliu.activity.RegisterActivity
 import com.quansu.heifengwuliu.model.LoginBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.tencent.mmkv.MMKV
 import com.ysnows.base.base.BRepository
-import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 
 class OneLoginRepository : BRepository() {
     @SuppressLint("CheckResult")
-    fun login(token: String) {
+    fun login(code: String) {
 
-        lreq(NetEngine.service.wxLogin(token))
-                .doOnError(){
-                   it.printStackTrace()
+        lreq(NetEngine.service.wxLogin(code))
+                .doOnError() {
+                    it.printStackTrace()
                 }
                 .doOnNext {
                     if (it.ok(true)) {
@@ -28,8 +28,10 @@ class OneLoginRepository : BRepository() {
 
                     } else {
                         if (it.code() == 0) {
-
-                            UiSwitch.bundle(context, RegisterActivity::class.java, B.with().putString("open_id", token).ok())
+                            UiSwitch.bundle(context, RegisterActivity::class.java, Bundle().apply {
+                                putString("openid", it.data()?.openid)
+                                putString("unionid", it.data()?.unionid)
+                            })
                         }
                     }
                 }

app/src/main/java/com/quansu/heifengwuliu/repository/RegisterRepository.kt

@@ -13,7 +13,7 @@ import io.reactivex.Observable
 class RegisterRepository : BRepository() {
 
 
-    fun register(name: String?, mobile: String?, code: String?, type: String? ,open_id:String?): Observable<Response<Any>>? {
+    fun register(name: String?, mobile: String?, code: String?, type: String?, open_id: String? = null, unionid: String? = null): Observable<Response<Any>>? {
         if (name.isNullOrEmpty()) {
             toast(R.string.please_input_user_name)
             return null
@@ -28,13 +28,13 @@ class RegisterRepository : BRepository() {
         }
 
         return Observable.create { emitter ->
-            lreq(NetEngine.service.register(name, mobile, code,type,open_id))
+            lreq(NetEngine.service.register(name, mobile, code, type, open_id,unionId = unionid))
                     .doOnNext() {
                         if (it.ok(true)) {
-                            var bean: LoginBean =it.data() as LoginBean;
+                            var bean: LoginBean = it.data() as LoginBean;
 
-                            MMKV.defaultMMKV().putString("token",bean.TOKEN)
-                            UiSwitch.single(context,HomeActivity::class.java)
+                            MMKV.defaultMMKV().putString("token", bean.TOKEN)
+                            UiSwitch.single(context, HomeActivity::class.java)
 //                            emitter.onNext(it)
                         }
                     }

app/src/main/java/com/quansu/heifengwuliu/repository/UserInfoRepository.kt

@@ -5,7 +5,7 @@ import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 import io.reactivex.Observable
 
-class UserInfoRepository : BRepository() {
+open class UserInfoRepository : BRepository() {
 
     fun getUserInfo(): Observable<User> {
         return Observable.create { emitter ->

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -14,7 +14,6 @@ import java.util.*
 interface ApiService {
 
 
-
     @POST("task/save")
     @FormUrlEncoded
     fun addTodo(@Field("title") title: String?): Observable<Response<Any>>
@@ -24,7 +23,6 @@ interface ApiService {
     fun alipayPreOrder(@Field("vip_level") vip_level: Int): Observable<Response<String>>
 
 
-
     @GET("task/ls")
     fun taskList(@Query("action") action: String?, @Query("page") page: Int): Observable<Response<ArrayList<Todo>>>
 
@@ -77,7 +75,6 @@ interface ApiService {
     fun getRegisterSms(@Field("mobile") mobile: String?): Observable<Response<SendSmsBean>>
 
 
-
     /**
      * 极光一键登录
      *
@@ -95,9 +92,7 @@ interface ApiService {
 
     @POST("api/index/register")
     @FormUrlEncoded
-    fun register(@Field("name") name: String?, @Field("mobile") mobile: String?, @Field("code") code: String?
-                 ,@Field("type") type: String?
-                 ,@Field("openid") openid: String?): Observable<Response<LoginBean>>
+    fun register(@Field("name") name: String?, @Field("mobile") mobile: String?, @Field("code") code: String?, @Field("type") type: String?, @Field("openid") openid: String? = null, @Field("unionid") unionId: String? = null): Observable<Response<LoginBean>>
 
 
     /**
@@ -128,16 +123,15 @@ interface ApiService {
     fun wxLogin(@Field("code") code: String?): Observable<Response<LoginBean>>
 
 
-
-
     /**
-     简易版注册
+    简易版注册
      *
      * @return
      */
     @POST("api/index/siml_register")
     @FormUrlEncoded
-    fun simlRegister(@Field("mobile") mobile: String?,@Field("type") type: String?): Observable<Response<LoginBean>>
+    fun simlRegister(@Field("mobile") mobile: String?, @Field("type") type: String?): Observable<Response<LoginBean>>
+
     /**
      * 用户信息
      * @return
@@ -146,6 +140,4 @@ interface ApiService {
     fun getUser(): Observable<Response<User>>
 
 
-
-
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/MineVModel.kt

@@ -1,9 +1,12 @@
 package com.quansu.heifengwuliu.vmodel
 
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.activity.AccountActivity
+import com.quansu.heifengwuliu.activity.MsgActivity
+import com.quansu.heifengwuliu.activity.SettingsActivity
+import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.MineRepository
 import com.ysnows.base.base.BViewModel
-import com.ysnows.base.ccretrofit.CCRetrofit
-import com.ysnows.base.route.IUpdate
 import com.ysnows.base.utils.DialUtils
 
 /**
@@ -11,14 +14,27 @@ import com.ysnows.base.utils.DialUtils
  *on 2020/9/10
  */
 open class MineVModel : BViewModel<MineRepository>() {
+    val user: MutableLiveData<User> = MutableLiveData(User.get())
 
-    fun checkUpdates() {
-        //检查更新
-        CCRetrofit.instance()
-                .create(IUpdate::class.java)
-                .checkUpgrade(true)
-                .subscribe()
+    fun goSettings() {
+        single(SettingsActivity::class.java)
+    }
+
+    fun goMsg() {
+        single(MsgActivity::class.java)
+    }
 
+    fun goMyAccount() {
+        single(AccountActivity::class.java)
+    }
+
+    override fun firstReq() {
+        super.firstReq()
+        repository().getUserInfo()
+                .doOnNext {
+                    user.value = it
+                }
+                .subscribe()
     }
 
     fun callPhone() {

app/src/main/java/com/quansu/heifengwuliu/vmodel/RegisterVModel.kt

@@ -21,7 +21,8 @@ open class RegisterVModel : BViewModel<RegisterRepository>() {
 
     var showType: MutableLiveData<Boolean> = MutableLiveData(getShow)
 
-    var open_id: String? = null
+    var openId: String? = null
+    var unionId: String? = null
 
 
     override fun init() {
@@ -56,19 +57,16 @@ open class RegisterVModel : BViewModel<RegisterRepository>() {
         }
 
 
-
-
-
     fun register() {
 
         //todo：
 
-       // var ss=showType.value//choseType
+        // var ss=showType.value//choseType
 
-        var type=if(showType.value!!)"2" else "1"
+        var type = if (showType.value!!) "2" else "1"
 
         repository()
-                .register(userName,phone, code, type,open_id)
+                .register(userName, phone, code, type, open_id = openId, unionid = unionId)
                 ?.doOnNext() {
                     toast(it.msg())
                 }
@@ -77,10 +75,11 @@ open class RegisterVModel : BViewModel<RegisterRepository>() {
 
     }
 
-    fun choseType(type:Int){
-        showType.value = type==1
+    fun choseType(type: Int) {
+        showType.value = type == 1
 
     }
+
     fun getSmsCode(start: Long = 1) {
         if (codeTip.value != getCodeStr) {
             return
@@ -134,7 +133,6 @@ open class RegisterVModel : BViewModel<RegisterRepository>() {
         const val getShow = true
 
 
-
     }
 
     private fun disposeTimer() {

app/src/main/java/com/quansu/heifengwuliu/wxapi/WXEntryActivity.kt

@@ -30,6 +30,7 @@ class WXEntryActivity : Activity(), IWXAPIEventHandler {
                     //获取微信传回的code
                     val code = baseResp.code
                     RxBus.get().post(ConfigRx.ADD_SEND_CODE, code)
+                    finish()
                     return
                 }
                 if (baseResp?.getType() == ConstantsAPI.COMMAND_SENDMESSAGE_TO_WX) {

app/src/main/res/layout/activity_account.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <FrameLayout
+            android:id="@+id/lay_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <com.qmuiteam.qmui.widget.tab.QMUITabSegment
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/title_bar_height"
+                android:background="@color/white"
+                android:textSize="12sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_marginTop="@dimen/title_bar_height"
+                android:background="@color/color_page" />
+
+            <com.qmuiteam.qmui.widget.QMUIViewPager
+                android:id="@+id/pager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="58dp" />
+
+        </FrameLayout >
+
+    </LinearLayout >
+</layout >

app/src/main/res/layout/activity_msg.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_msg" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

app/src/main/res/layout/activity_onelogin.xml

@@ -2,6 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
+
         <import type="com.quansu.heifengwuliu.utils.MUiSwitch" />
 
         <variable
@@ -9,103 +10,96 @@
             type="com.quansu.heifengwuliu.vmodel.OneLoginVModel" />
     </data >
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_height="match_parent">
-
+        android:layout_height="match_parent" >
 
         <ImageView
             android:id="@+id/iv_logo"
             android:layout_width="70dp"
             android:layout_height="70dp"
+            android:layout_marginTop="90dp"
+            android:src="@mipmap/ic_launcher"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="50dp"
-            android:src="@mipmap/ic_launcher" />
-
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_logo"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="物流平台"
-            android:textSize="15sp"
+            android:text="黑蜂物流"
             android:textColor="#4B3200"
-            android:layout_height="wrap_content">
-
-        </TextView>
+            android:textSize="15sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/iv_logo" >
 
+        </TextView >
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
             android:id="@+id/btn_one_click_login"
             android:layout_width="match_parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
-            android:layout_marginTop="90dp"
+            android:layout_height="@dimen/dp_48"
             android:layout_marginStart="25dp"
+            android:layout_marginTop="90dp"
             android:layout_marginEnd="24dp"
-            app:qmui_borderColor="#E17E30"
-            app:qmui_backgroundColor="#E17E30"
-            app:qmui_radius="@dimen/dp_25"
             android:onClick="@{v->vm.clickLogin()}"
-            android:textColor="@color/white"
             android:text="本机号码一键登录"
-            android:textSize="18sp"
-            android:layout_height="54dp">
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:qmui_backgroundColor="#E17E30"
+            app:qmui_borderColor="#E17E30"
+            app:qmui_radius="@dimen/dp_25" >
 
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton >
 
         <TextView
             android:id="@+id/tv_other_login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
             android:layout_marginTop="10dp"
-            app:layout_constraintTop_toBottomOf="@id/btn_one_click_login"
-            android:text="其他手机号码登录"
             android:onClick="@{v->MUiSwitch.INSTANCE.toLogin(vm.view().context())}"
+            android:text="其他手机号码登录"
             android:textColor="#4B3200"
-            android:textSize="12sp">
-
-        </TextView>
+            android:textSize="12sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_one_click_login" >
 
+        </TextView >
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="50dp"
+            android:gravity="center"
             android:onClick="@{v->vm.wxLogin()}"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
 
-            android:layout_height="wrap_content">
+            app:layout_constraintRight_toRightOf="parent" >
 
             <ImageView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:src="@drawable/ic_to_wxchat" />
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:padding="@dimen/dp_5"
+                android:src="@drawable/ic_wx_login" />
 
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_marginTop="10dp"
+                android:layout_height="wrap_content"
                 android:text="微信登录"
-                android:textSize="15sp"
-                android:textColor="#4B3200"
-                android:layout_height="wrap_content">
-
-            </TextView>
-        </LinearLayout>
-
+                android:textColor="@color/gray"
+                android:textSize="@dimen/sp_12" >
 
+            </TextView >
+        </LinearLayout >
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout >
 </layout >

app/src/main/res/layout/activity_settings.xml

@@ -17,981 +17,154 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
-        <ScrollView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent" >
 
-            <LinearLayout
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" >
-
-                <LinearLayout
-                    android:id="@+id/lay_vip"
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingLeft="@dimen/dp_16"
-                    android:paddingRight="@dimen/dp_16" >
-
-                    <ImageView
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@mipmap/ic_launcher" />
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_14"
-                        android:layout_weight="1"
-                        android:orientation="vertical" >
-
-                        <TextView
-                            android:id="@+id/tv_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_16" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_3"
-                            android:textColor="@color/text_hint"
-                            android:textSize="@dimen/sp_13" />
-                    </LinearLayout >
-
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:id="@+id/btn_vip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/colorPrimary"
-                        android:paddingLeft="@dimen/dp_8"
-                        android:paddingTop="@dimen/dp_4"
-                        android:paddingRight="@dimen/dp_8"
-                        android:paddingBottom="@dimen/dp_4"
-                        android:onClick="@{v->vm.buyVip()}"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_13"
-                        app:qmui_backgroundColor="@color/colorPrimary"
-                        app:qmui_borderWidth="0dp" />
-
-                </LinearLayout >
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/color_page_bg" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10" >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:layout_marginStart="@dimen/dp_14"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:gravity="center_vertical"
-                        android:text="小部件"
-                        android:textSize="@dimen/sp_14" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-
-                        android:background="@color/color_page_bg" />
-
-                    <RelativeLayout
-                        android:id="@+id/lay_widgets"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="4.5dp"
-                            android:src="@drawable/ic_widgets_manage" />
-
-                        <TextView
-                            android:id="@+id/tv_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon"
-                            android:gravity="center_vertical"
-                            android:text="管理小部件图标"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_14"
-                            android:padding="@dimen/dp_6"
-                            android:src="@drawable/ic_arrow_right" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:id="@+id/lay_search_bar"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon13"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="4.2dp"
-                            android:src="@drawable/ic_search_bar_mg" />
-
-                        <TextView
-                            android:id="@+id/tv_title13"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon13"
-                            android:gravity="center_vertical"
-                            android:text="管理搜索栏图标"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_14"
-                            android:padding="@dimen/dp_6"
-                            android:src="@drawable/ic_arrow_right" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title13"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon1"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_google" />
-
-                        <TextView
-                            android:id="@+id/tv_title1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon1"
-                            android:gravity="center_vertical"
-                            android:text="固定左侧图标为谷歌"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <CheckBox
-                            android:id="@+id/cb_ic_google"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="@dimen/dp_18"
-                            android:padding="@dimen/dp_6" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title1"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <!--                    <RelativeLayout-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="48dp"-->
-                    <!--                        android:layout_marginLeft="@dimen/dp_14" >-->
-
-                    <!--                        <ImageView-->
-                    <!--                            android:id="@+id/img_icon2"-->
-                    <!--                            android:layout_width="30dp"-->
-                    <!--                            android:layout_height="30dp"-->
-                    <!--                            android:layout_centerVertical="true"-->
-                    <!--                            android:padding="@dimen/dp_5"-->
-                    <!--                            android:src="@drawable/ic_qr" />-->
-
-                    <!--                        <TextView-->
-                    <!--                            android:id="@+id/tv_title2"-->
-                    <!--                            android:layout_width="wrap_content"-->
-                    <!--                            android:layout_height="wrap_content"-->
-                    <!--                            android:layout_centerVertical="true"-->
-                    <!--                            android:layout_marginLeft="@dimen/dp_10"-->
-                    <!--                            android:layout_toRightOf="@id/img_icon2"-->
-                    <!--                            android:gravity="center_vertical"-->
-                    <!--                            android:text="固定右侧图标为这个扫一扫图标"-->
-                    <!--                            android:textColor="@color/primary_text"-->
-                    <!--                            android:textSize="@dimen/sp_15" />-->
-
-                    <!--                        <CheckBox-->
-                    <!--                            android:id="@+id/cb_ic_qr"-->
-                    <!--                            android:layout_width="30dp"-->
-                    <!--                            android:layout_height="30dp"-->
-                    <!--                            android:layout_alignParentEnd="true"-->
-                    <!--                            android:layout_centerVertical="true"-->
-                    <!--                            android:layout_marginEnd="@dimen/dp_18"-->
-                    <!--                            android:padding="@dimen/dp_6" />-->
-
-                    <!--                        <View-->
-                    <!--                            android:layout_width="match_parent"-->
-                    <!--                            android:layout_height="1dp"-->
-                    <!--                            android:layout_alignLeft="@id/tv_title2"-->
-                    <!--                            android:layout_alignParentBottom="true"-->
-                    <!--                            android:background="@color/color_page_bg" />-->
-
-                    <!--                    </RelativeLayout >-->
-
-                </LinearLayout >
-
-                <!--                <LinearLayout-->
-                <!--                    android:layout_width="match_parent"-->
-                <!--                    android:layout_height="wrap_content"-->
-                <!--                    android:orientation="vertical"-->
-                <!--                    android:paddingBottom="@dimen/dp_10"-->
-                <!--                    android:paddingTop="@dimen/dp_10" >-->
-
-                <!--                    <TextView-->
-                <!--                        android:layout_width="wrap_content"-->
-                <!--                        android:layout_height="28dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14"-->
-                <!--                        android:layout_marginTop="@dimen/dp_2"-->
-                <!--                        android:gravity="center_vertical"-->
-                <!--                        android:text="@string/entrance"-->
-                <!--                        android:textSize="@dimen/sp_14" />-->
-
-                <!--                    <View-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="1dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14"-->
-
-                <!--                        android:background="@color/color_page_bg" />-->
-
-                <!--                    <RelativeLayout-->
-                <!--                        android:id="@+id/lay_widgets_gesture"-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="48dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14" >-->
-
-                <!--                        <ImageView-->
-                <!--                            android:id="@+id/img_icon11"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:padding="4.5dp"-->
-                <!--                            android:src="@drawable/ic_gesture_entrance" />-->
-
-                <!--                        <TextView-->
-                <!--                            android:id="@+id/tv_title11"-->
-                <!--                            android:layout_width="wrap_content"-->
-                <!--                            android:layout_height="wrap_content"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginLeft="@dimen/dp_10"-->
-                <!--                            android:layout_toRightOf="@id/img_icon11"-->
-                <!--                            android:gravity="center_vertical"-->
-                <!--                            android:text="手势入口"-->
-                <!--                            android:textColor="@color/primary_text"-->
-                <!--                            android:textSize="@dimen/sp_15" />-->
-
-                <!--                        <ImageView-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_alignParentRight="true"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginRight="@dimen/dp_14"-->
-                <!--                            android:padding="@dimen/dp_6"-->
-                <!--                            android:src="@drawable/ic_arrow_right" />-->
-
-                <!--                        <View-->
-                <!--                            android:layout_width="match_parent"-->
-                <!--                            android:layout_height="1dp"-->
-                <!--                            android:layout_alignLeft="@id/tv_title11"-->
-                <!--                            android:layout_alignParentBottom="true"-->
-                <!--                            android:background="@color/color_page_bg" />-->
-
-                <!--                    </RelativeLayout >-->
-
-                <!--                </LinearLayout >-->
-
-                <!--                <com.ysnows.base.widget.RadioGroup-->
-                <!--                    android:id="@+id/rg_selector"-->
-                <!--                    android:layout_width="match_parent"-->
-                <!--                    android:layout_height="wrap_content"-->
-                <!--                    android:orientation="vertical"-->
-                <!--                    android:paddingBottom="@dimen/dp_10"-->
-                <!--                    android:paddingTop="@dimen/dp_10" >-->
-
-                <!--                    <TextView-->
-                <!--                        android:layout_width="wrap_content"-->
-                <!--                        android:layout_height="28dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14"-->
-                <!--                        android:layout_marginTop="@dimen/dp_2"-->
-                <!--                        android:gravity="center_vertical"-->
-                <!--                        android:text="搜索引擎选择器"-->
-                <!--                        android:textSize="@dimen/sp_14" />-->
-
-                <!--                    <View-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="1dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14"-->
-
-                <!--                        android:background="@color/color_page_bg" />-->
-
-                <!--                    <RelativeLayout-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="48dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14" >-->
-
-                <!--                        <ImageView-->
-                <!--                            android:id="@+id/img_icon6"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:padding="@dimen/dp_5"-->
-                <!--                            android:src="@drawable/ic_btn" />-->
-
-                <!--                        <TextView-->
-                <!--                            android:id="@+id/tv_title6"-->
-                <!--                            android:layout_width="wrap_content"-->
-                <!--                            android:layout_height="wrap_content"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginLeft="@dimen/dp_10"-->
-                <!--                            android:layout_toRightOf="@id/img_icon6"-->
-                <!--                            android:gravity="center_vertical"-->
-                <!--                            android:text="显示选择器激活按钮"-->
-                <!--                            android:textColor="@color/primary_text"-->
-                <!--                            android:textSize="@dimen/sp_15" />-->
-
-                <!--                        <RadioButton-->
-                <!--                            android:id="@+id/rb_ic_show_button"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_alignParentEnd="true"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginEnd="@dimen/dp_18"-->
-                <!--                            android:padding="@dimen/dp_6" />-->
-
-                <!--                        <View-->
-                <!--                            android:layout_width="match_parent"-->
-                <!--                            android:layout_height="1dp"-->
-                <!--                            android:layout_alignLeft="@id/tv_title6"-->
-                <!--                            android:layout_alignParentBottom="true"-->
-                <!--                            android:background="@color/color_page_bg" />-->
-
-                <!--                    </RelativeLayout >-->
-
-                <!--                    <RelativeLayout-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="48dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14" >-->
-
-                <!--                        <ImageView-->
-                <!--                            android:id="@+id/img_icon5"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:padding="@dimen/dp_4"-->
-                <!--                            android:src="@drawable/ic_selector" />-->
-
-                <!--                        <TextView-->
-                <!--                            android:id="@+id/tv_title5"-->
-                <!--                            android:layout_width="wrap_content"-->
-                <!--                            android:layout_height="wrap_content"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginLeft="@dimen/dp_10"-->
-                <!--                            android:layout_toRightOf="@id/img_icon5"-->
-                <!--                            android:gravity="center_vertical"-->
-                <!--                            android:text="选择器一直显示在下方"-->
-                <!--                            android:textColor="@color/primary_text"-->
-                <!--                            android:textSize="@dimen/sp_15" />-->
-
-                <!--                        <RadioButton-->
-                <!--                            android:id="@+id/rb_ic_always_show"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_alignParentEnd="true"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginEnd="@dimen/dp_18"-->
-                <!--                            android:padding="@dimen/dp_6" />-->
-
-                <!--                        <View-->
-                <!--                            android:layout_width="match_parent"-->
-                <!--                            android:layout_height="1dp"-->
-                <!--                            android:layout_alignLeft="@id/tv_title5"-->
-                <!--                            android:layout_alignParentBottom="true"-->
-                <!--                            android:background="@color/color_page_bg" />-->
-
-                <!--                    </RelativeLayout >-->
-
-                <!--                    <RelativeLayout-->
-                <!--                        android:layout_width="match_parent"-->
-                <!--                        android:layout_height="48dp"-->
-                <!--                        android:layout_marginLeft="@dimen/dp_14" >-->
-
-                <!--                        <ImageView-->
-                <!--                            android:id="@+id/img_icon7"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:padding="@dimen/dp_3"-->
-                <!--                            android:src="@drawable/ic_hidden" />-->
-
-                <!--                        <TextView-->
-                <!--                            android:id="@+id/tv_title7"-->
-                <!--                            android:layout_width="wrap_content"-->
-                <!--                            android:layout_height="wrap_content"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginLeft="@dimen/dp_10"-->
-                <!--                            android:layout_toRightOf="@id/img_icon7"-->
-                <!--                            android:gravity="center_vertical"-->
-                <!--                            android:text="隐藏选择器"-->
-                <!--                            android:textColor="@color/primary_text"-->
-                <!--                            android:textSize="@dimen/sp_15" />-->
-
-                <!--                        <RadioButton-->
-                <!--                            android:id="@+id/rb_ic_no_show"-->
-                <!--                            android:layout_width="30dp"-->
-                <!--                            android:layout_height="30dp"-->
-                <!--                            android:layout_alignParentEnd="true"-->
-                <!--                            android:layout_centerVertical="true"-->
-                <!--                            android:layout_marginEnd="@dimen/dp_18"-->
-                <!--                            android:padding="@dimen/dp_6" />-->
-
-                <!--                        <View-->
-                <!--                            android:layout_width="match_parent"-->
-                <!--                            android:layout_height="1dp"-->
-                <!--                            android:layout_alignLeft="@id/tv_title7"-->
-                <!--                            android:layout_alignParentBottom="true"-->
-                <!--                            android:background="@color/color_page_bg" />-->
-
-                <!--                    </RelativeLayout >-->
-
-                <!--                </com.ysnows.base.widget.RadioGroup >-->
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10" >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:gravity="center_vertical"
-                        android:text="高级动作"
-                        android:textSize="@dimen/sp_14" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-
-                        android:background="@color/color_page_bg" />
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon8"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_clip" />
-
-                        <TextView
-                            android:id="@+id/tv_title8"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon8"
-                            android:gravity="center_vertical"
-                            android:text="监听剪贴板"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <CheckBox
-                            android:id="@+id/cb_clip"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="@dimen/dp_18"
-                            android:padding="@dimen/dp_6" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title8"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon9"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_auto_ad" />
-
-                        <TextView
-                            android:id="@+id/tv_title9"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon9"
-                            android:gravity="center_vertical"
-                            android:text="跳过应用启动广告"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <CheckBox
-                            android:id="@+id/cb_auto_ad"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="@dimen/dp_18"
-                            android:padding="@dimen/dp_6" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title9"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon10"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_msg_noti" />
-
-                        <TextView
-                            android:id="@+id/tv_title10"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon10"
-                            android:gravity="center_vertical"
-                            android:text="显示消息图标"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <CheckBox
-                            android:id="@+id/cb_msg"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="@dimen/dp_18"
-                            android:padding="@dimen/dp_6" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title10"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:id="@+id/lay_double_paste"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon12"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="4.5dp"
-                            android:src="@drawable/ic_double_click" />
-
-                        <TextView
-                            android:id="@+id/tv_title12"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toEndOf="@id/img_icon12"
-                            android:gravity="center_vertical"
-                            android:text="双击输入框粘贴"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <CheckBox
-                            android:id="@+id/cb_double_paste"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginEnd="@dimen/dp_18"
-                            android:padding="@dimen/dp_6" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title12"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                </LinearLayout >
+                android:layout_height="match_parent" >
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10" >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:gravity="center_vertical"
-                        android:text="备份"
-                        android:textSize="@dimen/sp_14" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-
-                        android:background="@color/color_page_bg" />
-
-                    <RelativeLayout
-                        android:id="@+id/lay_backup"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon3"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_backup" />
-
-                        <TextView
-                            android:id="@+id/tv_title3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon3"
-                            android:gravity="center_vertical"
-                            android:text="备份设置到云中"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <TextView
-                            android:id="@+id/tv_backup_time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_14"
-                            android:gravity="center_vertical"
-                            android:textColor="@color/secondary_text"
-                            android:textSize="@dimen/sp_12" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title3"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
+                    android:orientation="vertical" >
 
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:id="@+id/lay_restore"
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginLeft="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon4"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_5"
-                            android:src="@drawable/ic_restore" />
-
-                        <TextView
-                            android:id="@+id/tv_title4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon4"
-                            android:gravity="center_vertical"
-                            android:text="恢复备份"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingTop="@dimen/dp_10"
+                        android:paddingBottom="@dimen/dp_10" >
 
                         <TextView
-                            android:id="@+id/tv_restore_time"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_14"
+                            android:layout_height="28dp"
+                            android:layout_marginLeft="@dimen/dp_14"
+                            android:layout_marginTop="@dimen/dp_2"
                             android:gravity="center_vertical"
-                            android:text="恢复时间：2018-08-23 14:29:22"
-                            android:textColor="@color/secondary_text"
-                            android:textSize="@dimen/sp_12"
-                            android:visibility="gone" />
+                            android:text="应用"
+                            android:textSize="@dimen/sp_14" />
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title4"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
+                            android:layout_marginLeft="@dimen/dp_14"
 
-                </LinearLayout >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10" >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:gravity="center_vertical"
-                        android:text="应用"
-                        android:textSize="@dimen/sp_14" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginLeft="@dimen/dp_14"
-
-                        android:background="@color/color_page_bg" />
-
-                    <RelativeLayout
-                        android:id="@+id/lay_checkupdate"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginStart="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon14"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_check_update" />
-
-                        <TextView
-                            android:id="@+id/tv_title14"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon14"
-                            android:gravity="center_vertical"
-                            android:text="检查更新"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <TextView
-                            android:id="@+id/tv_version_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentRight="true"
-                            android:layout_centerVertical="true"
-                            android:layout_marginRight="@dimen/dp_14"
-                            android:gravity="center_vertical"
-                            android:text="@{`V`+BuildConfig.VERSION_NAME}"
-                            android:textColor="@color/secondary_text"
-                            android:textSize="@dimen/sp_12" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title14"
-                            android:layout_alignParentBottom="true"
                             android:background="@color/color_page_bg" />
 
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:id="@+id/lay_check_permisions"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginStart="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon16"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_check_permissions" />
-
-                        <TextView
-                            android:id="@+id/tv_title16"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon16"
-                            android:gravity="center_vertical"
-                            android:text="检查权限"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <View
+                        <RelativeLayout
+                            android:id="@+id/lay_checkupdate"
                             android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title16"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
-
-                    <RelativeLayout
-                        android:id="@+id/lay_about_us"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginStart="@dimen/dp_14" >
-
-                        <ImageView
-                            android:id="@+id/img_icon15"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerVertical="true"
-                            android:padding="@dimen/dp_4"
-                            android:src="@drawable/ic_about_us" />
-
-                        <TextView
-                            android:id="@+id/tv_title15"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_toRightOf="@id/img_icon15"
-                            android:gravity="center_vertical"
-                            android:text="关于我们"
-                            android:textColor="@color/primary_text"
-                            android:textSize="@dimen/sp_15" />
-
-                        <View
+                            android:layout_height="48dp"
+                            android:layout_marginStart="@dimen/dp_14" >
+
+                            <ImageView
+                                android:id="@+id/img_icon14"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:layout_centerVertical="true"
+                                android:padding="@dimen/dp_4"
+                                android:src="@drawable/ic_check_update" />
+
+                            <TextView
+                                android:id="@+id/tv_title14"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_toRightOf="@id/img_icon14"
+                                android:gravity="center_vertical"
+                                android:text="检查更新"
+                                android:textColor="@color/primary_text"
+                                android:textSize="@dimen/sp_15" />
+
+                            <TextView
+                                android:id="@+id/tv_version_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginRight="@dimen/dp_14"
+                                android:gravity="center_vertical"
+                                android:text="@{`V`+BuildConfig.VERSION_NAME}"
+                                android:textColor="@color/secondary_text"
+                                android:textSize="@dimen/sp_12" />
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="1dp"
+                                android:layout_alignLeft="@id/tv_title14"
+                                android:layout_alignParentBottom="true"
+                                android:background="@color/color_page_bg" />
+
+                        </RelativeLayout >
+
+                        <RelativeLayout
+                            android:id="@+id/lay_about_us"
                             android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_alignLeft="@id/tv_title15"
-                            android:layout_alignParentBottom="true"
-                            android:background="@color/color_page_bg" />
-
-                    </RelativeLayout >
+                            android:layout_height="48dp"
+                            android:layout_marginStart="@dimen/dp_14" >
+
+                            <ImageView
+                                android:id="@+id/img_icon15"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:layout_centerVertical="true"
+                                android:padding="@dimen/dp_4"
+                                android:src="@drawable/ic_about_us" />
+
+                            <TextView
+                                android:id="@+id/tv_title15"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:layout_toRightOf="@id/img_icon15"
+                                android:gravity="center_vertical"
+                                android:text="关于我们"
+                                android:textColor="@color/primary_text"
+                                android:textSize="@dimen/sp_15" />
+
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="1dp"
+                                android:layout_alignLeft="@id/tv_title15"
+                                android:layout_alignParentBottom="true"
+                                android:background="@color/color_page_bg" />
+
+                        </RelativeLayout >
 
+                    </LinearLayout >
                 </LinearLayout >
+            </ScrollView >
 
-                <androidx.cardview.widget.CardView
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="45dp"
+                android:layout_gravity="bottom"
+                android:layout_marginLeft="35dp"
+                android:layout_marginTop="35dp"
+                android:layout_marginRight="35dp"
+                android:layout_marginBottom="@dimen/sp_15"
+                android:background="@color/colorPrimary"
+                android:visibility="@{vm.user.isLogin()?0:8}"
+                app:cardBackgroundColor="@color/colorPrimary"
+                app:cardCornerRadius="22.5dp"
+                app:cardElevation="2dp"
+                app:cardPreventCornerOverlap="true" >
+
+                <Button
+                    android:id="@+id/btn_logout"
                     android:layout_width="match_parent"
-                    android:layout_height="45dp"
-                    android:layout_marginLeft="35dp"
-                    android:layout_marginTop="35dp"
-                    android:layout_marginRight="35dp"
-                    android:layout_marginBottom="@dimen/sp_15"
+                    android:layout_height="match_parent"
                     android:background="@color/colorPrimary"
-                    android:visibility="@{vm.user.isLogin()?0:8}"
-                    app:cardBackgroundColor="@color/colorPrimary"
-                    app:cardCornerRadius="22.5dp"
-                    app:cardElevation="2dp"
-                    app:cardPreventCornerOverlap="true" >
-
-                    <Button
-                        android:id="@+id/btn_logout"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@color/colorPrimary"
-                        android:text="@string/logout"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16" />
+                    android:text="@string/logout"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16" />
 
-                </androidx.cardview.widget.CardView >
+            </androidx.cardview.widget.CardView >
 
-            </LinearLayout >
-        </ScrollView >
+        </FrameLayout >
     </LinearLayout >
 </layout >

app/src/main/res/layout/fragment_account_analysis.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_msg" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

app/src/main/res/layout/fragment_account_bill.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_msg" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

app/src/main/res/layout/fragment_index.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
 
@@ -11,16 +10,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/btn_logout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginStart="@dimen/dp_40"
-            android:layout_marginEnd="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_80"
-            android:text="@string/logout"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout >
+
 </layout >

app/src/main/res/layout/fragment_mine.xml

@@ -49,7 +49,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:layout_marginEnd="@dimen/dp_10"
-                        android:src="@drawable/ic_to_wxchat" />
+                        android:onClick="@{v->vm.goMsg()}"
+                        android:padding="@dimen/dp_2"
+                        android:src="@drawable/ic_msg" />
 
                 </RelativeLayout >
 
@@ -66,11 +68,12 @@
                         android:id="@+id/img_user_avater"
                         android:layout_width="55dp"
                         android:layout_height="55dp"
-                        android:src="@drawable/ic_math"
+                        android:src="@drawable/ic_default_image"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:qmui_is_circle="true" />
+                        app:qmui_is_circle="true"
+                        app:url="@{vm.user.avatar()}" />
 
                     <TextView
                         android:id="@+id/tv_user_name"
@@ -78,6 +81,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
                         android:layout_marginTop="10dp"
+                        android:text="@{vm.user.name}"
                         app:layout_constraintStart_toEndOf="@id/img_user_avater"
                         app:layout_constraintTop_toTopOf="@id/img_user_avater"
                         tools:text="郑货主" />
@@ -88,16 +92,18 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
                         android:layout_marginBottom="10dp"
+                        android:text="@{vm.user.mobile}"
                         app:layout_constraintBottom_toBottomOf="@id/img_user_avater"
                         app:layout_constraintStart_toEndOf="@id/img_user_avater"
                         tools:text="18353965350" />
 
                     <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:layout_width="72dp"
-                        android:layout_height="30dp"
+                        android:layout_width="70dp"
+                        android:layout_height="26dp"
                         android:layout_marginEnd="@dimen/dp_10"
                         android:text="未认证"
                         android:textColor="#459AEA"
+                        android:textSize="@dimen/sp_13"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -127,12 +133,12 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center"
+                        android:onClick="@{v->vm.goMyAccount()}"
                         android:orientation="vertical" >
 
                         <ImageView
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/ic_math" />
+                            style="@style/img_mine"
+                            android:src="@drawable/ic_default_image" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -151,9 +157,8 @@
                         android:orientation="vertical" >
 
                         <ImageView
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/ic_math" />
+                            style="@style/img_mine"
+                            android:src="@drawable/ic_default_image" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -171,9 +176,8 @@
                         android:orientation="vertical" >
 
                         <ImageView
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/ic_math" />
+                            style="@style/img_mine"
+                            android:src="@drawable/ic_default_image" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -191,9 +195,8 @@
                         android:orientation="vertical" >
 
                         <ImageView
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
-                            android:src="@drawable/ic_math" />
+                            style="@style/img_mine"
+                            android:src="@drawable/ic_default_image" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -220,8 +223,7 @@
 
                         <ImageView
                             style="@style/mine_img"
-                            android:layout_width="wrap_content"
-                            android:src="@drawable/mine_update" />
+                            android:src="@drawable/ic_cloud_sync" />
 
                         <TextView
                             style="@style/mine_text"
@@ -233,20 +235,13 @@
 
                     </LinearLayout >
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#DDDDDD"
-                        android:visibility="visible" >
-
-                    </View >
+                    <View style="@style/line_mine" />
 
                     <LinearLayout style="@style/mine_list" >
 
                         <ImageView
                             style="@style/mine_img"
-                            android:layout_width="wrap_content"
-                            android:src="@drawable/mine_update" />
+                            android:src="@drawable/ic_backup" />
 
                         <TextView
                             style="@style/mine_text"
@@ -258,51 +253,20 @@
 
                     </LinearLayout >
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#DDDDDD"
-                        android:visibility="visible" >
-
-                    </View >
-
-                    <LinearLayout style="@style/mine_list" >
-
-                        <ImageView
-                            style="@style/mine_img"
-                            android:layout_width="wrap_content"
-                            android:src="@drawable/mine_update" />
-
-                        <TextView
-                            style="@style/mine_text"
-                            android:text="设置" />
-
-                        <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
-
-                    </LinearLayout >
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#DDDDDD"
-                        android:visibility="visible" >
-
-                    </View >
+                    <View style="@style/line_mine" />
 
                     <LinearLayout
+                        android:id="@+id/lay_settings"
                         style="@style/mine_list"
-                        android:onClick="@{v->vm.checkUpdates()}" >
+                        android:onClick="@{v->vm.goSettings()}" >
 
                         <ImageView
                             style="@style/mine_img"
-                            android:layout_width="wrap_content"
-                            android:src="@drawable/mine_update" />
+                            android:src="@drawable/ic_private_settings" />
 
                         <TextView
                             style="@style/mine_text"
-                            android:text="检查更新" />
+                            android:text="设置" />
 
                         <ImageView
                             style="@style/mine_arrow_right"
@@ -310,11 +274,7 @@
 
                     </LinearLayout >
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#DDDDDD"
-                        android:visibility="visible" />
+                    <View style="@style/line_mine" />
 
                 </LinearLayout >
 
@@ -324,6 +284,7 @@
                     android:layout_marginBottom="@dimen/dp_40"
                     android:onClick="@{v->vm.callPhone()}"
                     android:text="平台联系方式：1835397689"
+                    android:textColor="@color/qmui_config_color_gray_5"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />

app/src/main/res/layout/item_bill.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.Msg" />
+
+    </data >
+
+    <RelativeLayout
+        android:id="@+id/rl_todo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10" >
+
+        <ImageView
+            android:id="@+id/img_icon"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_13"
+            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
+            tools:src="@mipmap/ic_launcher" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_8"
+            android:layout_toEndOf="@id/img_icon"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@{item.title}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                android:textSize="@dimen/sp_16"
+                tools:text="@string/app_name" />
+
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_2"
+                android:text="@{item.create_time}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                tools:text="@string/app_name" />
+
+        </LinearLayout >
+
+        <ImageView
+            android:id="@+id/img_sort"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_14"
+            android:src="@drawable/ic_sort" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@color/llGray" />
+    </RelativeLayout >
+</layout >

app/src/main/res/layout/item_msg.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.Msg" />
+
+    </data >
+
+    <RelativeLayout
+        android:id="@+id/rl_todo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10" >
+
+        <ImageView
+            android:id="@+id/img_icon"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_13"
+            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
+            tools:src="@mipmap/ic_launcher" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_8"
+            android:layout_toEndOf="@id/img_icon"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@{item.title}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                android:textSize="@dimen/sp_16"
+                tools:text="@string/app_name" />
+
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_2"
+                android:text="@{item.create_time}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                tools:text="@string/app_name" />
+
+        </LinearLayout >
+
+        <ImageView
+            android:id="@+id/img_sort"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_14"
+            android:src="@drawable/ic_sort" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@color/llGray" />
+    </RelativeLayout >
+</layout >

app/src/main/res/values/strings.xml

@@ -413,5 +413,8 @@ Api 已达到使用限制
     <string name="my_account" >我的账户</string >
     <string name="my_collection" >我的收藏</string >
     <string name="connect_service" >联系客服</string >
+    <string name="msg" >消息</string >
+    <string name="bill" >账单</string >
+    <string name="analysis" >统计</string >
 
 </resources >

app/src/main/res/values/styles.xml

@@ -197,19 +197,20 @@
         <item name="qmui_dialog_menu_container_padding_bottom_when_action_exist" >24dp</item >
     </style >
 
-
     <style name="mine_list" >
         <item name="android:layout_width" >match_parent</item >
         <item name="android:layout_height" >45dp</item >
         <item name="android:gravity" >center_vertical</item >
         <item name="android:orientation" >horizontal</item >
-        <item name="android:paddingLeft" >23dp</item >
-        <item name="android:paddingRight" >26dp</item >
+        <item name="android:paddingLeft" >12dp</item >
+        <item name="android:paddingRight" >12dp</item >
     </style >
+
     <style name="mine_img" >
-        <item name="android:layout_width" >15dp</item >
+        <item name="android:layout_width" >17dp</item >
         <item name="android:layout_height" >17dp</item >
     </style >
+
     <style name="mine_text" >
         <item name="android:layout_width" >wrap_content</item >
         <item name="android:layout_height" >wrap_content</item >
@@ -218,8 +219,23 @@
         <item name="android:textColor" >#333435</item >
         <item name="android:textSize" >16sp</item >
     </style >
+
     <style name="mine_arrow_right" >
         <item name="android:layout_width" >7dp</item >
         <item name="android:layout_height" >12dp</item >
     </style >
+
+    <style name="img_mine" >
+        <item name="android:layout_width" >50dp</item >
+        <item name="android:layout_height" >50dp</item >
+        <item name="android:padding" >@dimen/dp_4</item >
+    </style >
+
+    <style name="line_mine" >
+        <item name="android:layout_width" >match_parent</item >
+        <item name="android:layout_height" >0.8dp</item >
+        <item name="android:background" >@color/gray_lite</item >
+        <item name="android:layout_marginStart" >@dimen/dp_15</item >
+        <item name="android:visibility" >visible</item >
+    </style >
 </resources >