user业务模块 - 资源前缀重命名

m-user/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'plugin.resTools'  // 资源重命名插件
-//
-//// 配置资源重命名插件
-//resConfig {
-//    new_prefix = 'user_'  // 资源前缀
-//    old_prefix = ''         // 老前缀，可为''空字符串
-//}
+apply plugin: 'plugin.resTools'  // 资源重命名插件
+
+// 配置资源重命名插件
+resConfig {
+    new_prefix = 'user_'  // 资源前缀
+    old_prefix = ''         // 老前缀，可为''空字符串
+}
 
 kapt {
     arguments {
@@ -45,7 +45,7 @@ android {
     }
 
     //前缀的名字
-//    resourcePrefix "user_"
+    resourcePrefix "user_"
 
     //Flavor 信息
     publishNonDefault true

m-user/src/main/java/com/yidianling/user/safePrivate/CheckPasswordActivity.kt

@@ -20,13 +20,13 @@ import com.yidianling.user.http.UserHttpImpl
 import com.yidianling.user.route.UserIn
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.activity_check_password.*
+import kotlinx.android.synthetic.main.user_activity_check_password.*
 /**
  * 验证登录密码
  */
 class CheckPasswordActivity : BaseActivity() {
     override fun layoutResId(): Int {
-        return R.layout.activity_check_password
+        return R.layout.user_activity_check_password
     }
 
     override fun getStatusViewOptions(): StatusBarOptions {

m-user/src/main/java/com/yidianling/user/safePrivate/FingerPrintCheckActivity.kt

@@ -25,7 +25,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
     }
 
     override fun layoutResId(): Int {
-        return R.layout.activity_finger_print_check
+        return R.layout.user_activity_finger_print_check
     }
 
     override fun getStatusViewOptions(): StatusBarOptions {
@@ -113,7 +113,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
         //判断系统指纹是否被暂时禁止
         if (!FingerPrintUtil.getFingerPrintIsAviable()) {
             CommonDialog(mContext)
-                    .setImageCenter(R.drawable.lock_ico_zhiwen)
+                    .setImageCenter(R.drawable.user_lock_ico_zhiwen)
                     .setMessage(FingerPrintUtil.errorMoreMessage)
                     .setMessageColor(R.color.platform_price_color)
                     .setRightClick("取消") {
@@ -125,7 +125,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
         }
 
         var dia = CommonDialog(mContext)
-                .setImageCenter(R.drawable.lock_ico_zhiwen)
+                .setImageCenter(R.drawable.user_lock_ico_zhiwen)
                 .setMessage("验证已有手机指纹")
                 .setRightClick("取消") {
                 }

m-user/src/main/java/com/yidianling/user/safePrivate/HandUnlockCheckActivity.kt

@@ -21,7 +21,7 @@ import com.yidianling.user.ui.login.RegisterAndLoginActivity
  */
 class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListener {
     override fun layoutResId(): Int {
-        return R.layout.activity_hand_unlock
+        return R.layout.user_activity_hand_unlock
     }
 
     override fun getStatusViewOptions(): StatusBarOptions {
@@ -187,7 +187,7 @@ class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListene
             }
 
             var dia = CommonDialog(mContext)
-                    .setImageCenter(R.drawable.lock_ico_zhiwen)
+                    .setImageCenter(R.drawable.user_lock_ico_zhiwen)
                     .setMessage("验证手机已有指纹")
                     .setLeftOnclick("取消") {
                         //停止指纹监听

m-user/src/main/java/com/yidianling/user/safePrivate/PrivacyActivity.kt

@@ -21,7 +21,7 @@ import com.yidianling.user.ui.InputPhoneActivity
 
 class PrivacyActivity : BaseActivity() {
     override fun layoutResId(): Int {
-        return R.layout.activity_me_privacy
+        return R.layout.user_activity_me_privacy
     }
 
     override fun initDataAndEvent() {

m-user/src/main/java/com/yidianling/user/safePrivate/SetFingerPrintActivity.kt

@@ -16,7 +16,7 @@ import com.yidianling.user.ui.login.RegisterAndLoginActivity
  */
 class SetFingerPrintActivity : BaseActivity(), View.OnClickListener {
     override fun layoutResId(): Int {
-        return R.layout.activity_finger_print_set
+        return R.layout.user_activity_finger_print_set
     }
 
     override fun initDataAndEvent() {
@@ -56,7 +56,7 @@ class SetFingerPrintActivity : BaseActivity(), View.OnClickListener {
     fun checkFinger() {
 
         var dia = CommonDialog(mContext)
-                .setImageCenter(R.drawable.lock_ico_zhiwen)
+                .setImageCenter(R.drawable.user_lock_ico_zhiwen)
                 .setMessage("验证已有手机指纹")
                 .setRightClick("取消") {
 

m-user/src/main/java/com/yidianling/user/safePrivate/SetHandUnLockActivity.kt

@@ -19,7 +19,7 @@ import com.yidianling.user.UserHelper
  */
 class SetHandUnLockActivity : BaseActivity() {
     override fun layoutResId(): Int {
-        return R.layout.activity_hand_unlock_set
+        return R.layout.user_activity_hand_unlock_set
     }
 
     override fun initDataAndEvent() {
@@ -43,7 +43,7 @@ class SetHandUnLockActivity : BaseActivity() {
         tipText = findViewById<TextView>(R.id.text_tip) as TextView
         lock9 = findViewById<Lock9View>(R.id.lock9View) as Lock9View
 
-        titleBar?.setRightTextColor(ContextCompat.getColor(this, R.color.main_theme))
+        titleBar?.setRightTextColor(ContextCompat.getColor(this, R.color.user_main_theme))
         titleBar?.setRightTextVisiable(View.GONE)
 
         titleBar?.setLeftImageListener {

m-user/src/main/java/com/yidianling/user/ui/AliAuthDemoActivity.java

@@ -44,7 +44,7 @@ public class AliAuthDemoActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_ali_auth_demo);
+        setContentView(R.layout.user_activity_ali_auth_demo);
         mVaildBtn = (Button) findViewById(R.id.vaild_button);
         mLoginBtn = (Button) findViewById(R.id.login_button);
         mRetTV = (TextView) findViewById(R.id.operator_name_tv);

m-user/src/main/java/com/yidianling/user/ui/CountryListActivity.java

@@ -42,7 +42,7 @@ public class CountryListActivity extends BaseActivity {
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_country_list;
+        return R.layout.user_activity_country_list;
     }
     @NotNull
 
@@ -120,7 +120,7 @@ public class CountryListActivity extends BaseActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            View view = LayoutInflater.from(context).inflate(R.layout.item_country_phone_code, parent, false);
+            View view = LayoutInflater.from(context).inflate(R.layout.user_item_country_phone_code, parent, false);
             TextView nameTv = view.findViewById(R.id.tv_name);
             TextView codeTv = view.findViewById(R.id.tv_code);
             final Country c = list.get(position);

m-user/src/main/java/com/yidianling/user/ui/FillInfoActivity.java

@@ -94,7 +94,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_fill_info;
+        return R.layout.user_activity_fill_info;
     }
 
     @NotNull
@@ -142,7 +142,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
             GlideApp.with(FillInfoActivity.this)
                     .load(icon)
                     .fitCenter()
-                    .error(R.drawable.regist_photo)
+                    .error(R.drawable.user_regist_photo)
                     .into(sdv_head);
         }
 
@@ -496,7 +496,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
                 .observeOn(AndroidSchedulers.mainThread())
                 .doOnSubscribe(disposable -> {
                     dismissProgressDialog();
-                    GlideApp.with(FillInfoActivity.this).load(R.drawable.loading2).into(sdv_head);
+                    GlideApp.with(FillInfoActivity.this).load(R.drawable.user_loading2).into(sdv_head);
                 })
                 .subscribe(o -> {
                     Map map = (Map) o;
@@ -505,7 +505,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
                     GlideApp.with(FillInfoActivity.this)
                             .load(path)
                             .fitCenter()
-                            .error(R.drawable.regist_photo)
+                            .error(R.drawable.user_regist_photo)
                             .into(sdv_head);
                     head = head_url;
                 }, new ThrowableConsumer() {

m-user/src/main/java/com/yidianling/user/ui/GetIdentifyingCodeActivity.java

@@ -80,7 +80,7 @@ public class GetIdentifyingCodeActivity extends BaseActivity implements View.OnC
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_get_identifying_code;
+        return R.layout.user_activity_get_identifying_code;
     }
 
     @NotNull

m-user/src/main/java/com/yidianling/user/ui/InputPhoneActivity.java

@@ -103,7 +103,7 @@ public class InputPhoneActivity extends BaseActivity implements View.OnClickList
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_input_phone;
+        return R.layout.user_activity_input_phone;
     }
 
     @Override

m-user/src/main/java/com/yidianling/user/ui/LoginActivity.java

@@ -56,7 +56,7 @@ public class LoginActivity extends BaseMvpActivity<LoginContract.View,LoginContr
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_login;
+        return R.layout.user_activity_login;
     }
 
     @Override

m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt

@@ -34,7 +34,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.activity_get_identifying_code.*
+import kotlinx.android.synthetic.main.user_activity_get_identifying_code.*
 import java.util.concurrent.TimeUnit
 
 
@@ -69,7 +69,7 @@ class SmsLoginActivity : BaseActivity() {
 
 
     override fun layoutResId(): Int {
-        return com.yidianling.user.R.layout.activity_get_identifying_code
+        return com.yidianling.user.R.layout.user_activity_get_identifying_code
     }
 
     override fun initDataAndEvent() {

m-user/src/main/java/com/yidianling/user/ui/login/H5Activity.java

@@ -31,7 +31,7 @@ public class H5Activity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_h5);
+        setContentView(R.layout.user_activity_h5);
         StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_white);
 
         WebView web_view = findViewById(R.id.web_view);

m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt

@@ -21,7 +21,7 @@ import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.route.UserIn
 import com.yidianling.user.ui.login.contract.IInputPassWordContract
 import com.yidianling.user.ui.login.presenter.InputPassWordPresenterImpl
-import kotlinx.android.synthetic.main.activity_input_password.*
+import kotlinx.android.synthetic.main.user_activity_input_password.*
 
 /**
  * @author jiucheng
@@ -77,7 +77,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
     }
 
     override fun layoutResId(): Int {
-        return R.layout.activity_input_password
+        return R.layout.user_activity_input_password
     }
 
     override fun initDataAndEvent() {
@@ -217,11 +217,11 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
      */
     private fun switchPwdShowType() {
         if (iv_visibility.isSelected) {
-            iv_visibility.setImageResource(R.drawable.ic_visibility)
+            iv_visibility.setImageResource(R.drawable.user_ic_visibility)
             et_input_password.transformationMethod = HideReturnsTransformationMethod.getInstance()
             et_input_password.hint = "当前密码可见"
         } else {
-            iv_visibility.setImageResource(R.drawable.ic_invisibility)
+            iv_visibility.setImageResource(R.drawable.user_ic_invisibility)
             et_input_password.transformationMethod = PasswordTransformationMethod.getInstance()
             et_input_password.hint = "当前密码不可见"
         }
@@ -264,7 +264,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
     }
 
     override fun startAnim() {
-        val shake = AnimationUtils.loadAnimation(this, R.anim.shake_input)//加载动画资源文件 
+        val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
         et_input_password.startAnimation(shake)
         view_input_lin.startAnimation(shake)
         view_input_lin.setBackgroundColor(Color.parseColor("#FB6761"))

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -49,7 +49,7 @@ import com.yidianling.user.route.UserIn
 import com.yidianling.user.ui.CountryListActivity
 import com.yidianling.user.ui.login.contract.ILoginContract
 import com.yidianling.user.ui.login.presenter.LoginPresenterImpl
-import kotlinx.android.synthetic.main.activity_register_and_login.*
+import kotlinx.android.synthetic.main.user_activity_register_and_login.*
 
 /**
  * @author jiucheng
@@ -113,7 +113,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
     }
 
     override fun layoutResId(): Int {
-        return R.layout.activity_register_and_login
+        return R.layout.user_activity_register_and_login
     }
 
     override fun initDataAndEvent() {
@@ -264,7 +264,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             override fun onClick(widget: View) {
                 if (!isUmengLoginState) {
                     H5Activity.start(this@RegisterAndLoginActivity, false)
-                    overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
+                    overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.user_slide_null)
                 }
             }
         }, 3, 9, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -278,7 +278,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             override fun onClick(widget: View) {
                 if (!isUmengLoginState) {
                     H5Activity.start(this@RegisterAndLoginActivity, true)
-                    overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
+                    overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.user_slide_null)
                 }
             }
         }, 10, str.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -333,7 +333,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
     }
 
     private fun setHint() {
-        val hintStr = SpannableString(resources.getString(R.string.edittext_hint))// 定义hint的值
+        val hintStr = SpannableString(resources.getString(R.string.user_edittext_hint))// 定义hint的值
         val ass = AbsoluteSizeSpan(16, true)// 设置字体大小 true表示单位是SP
         hintStr.setSpan(ass, 0, hintStr.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         et_phone_number.hint = SpannedString(hintStr)
@@ -371,7 +371,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             val intent = Intent(this, CountryListActivity::class.java)
             intent.putExtra("userCountryCode", countryCode)
             startActivityForResult(intent, REQUEST_CODE_COUNTRY)
-            overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
+            overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.user_slide_null)
         }
         //下一步
         iv_next.setOnClickListener {
@@ -439,7 +439,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      * 动画
      */
     private fun startAnim() {
-        val shake = AnimationUtils.loadAnimation(this, R.anim.shake_input)//加载动画资源文件 
+        val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
         et_phone_number.startAnimation(shake)
     }
 
@@ -628,16 +628,16 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      */
     private fun setCountryIcon(code: String?) {
         when (code) {
-            "0086" -> iv_country_icon.setImageResource(R.drawable.ic_china)
-            "001" -> iv_country_icon.setImageResource(R.drawable.country_usa)
-            "00886" -> iv_country_icon.setImageResource(R.drawable.ic_china)
-            "0081" -> iv_country_icon.setImageResource(R.drawable.country_japan)
-            "00852" -> iv_country_icon.setImageResource(R.drawable.country_hk)
-            "0061" -> iv_country_icon.setImageResource(R.drawable.country_australia)
-            "0064" -> iv_country_icon.setImageResource(R.drawable.country_nz)
-            "0082" -> iv_country_icon.setImageResource(R.drawable.country_sk)
-            "0060" -> iv_country_icon.setImageResource(R.drawable.country_malaysia)
-            "0044" -> iv_country_icon.setImageResource(R.drawable.country_uk)
+            "0086" -> iv_country_icon.setImageResource(R.drawable.user_ic_china)
+            "001" -> iv_country_icon.setImageResource(R.drawable.user_country_usa)
+            "00886" -> iv_country_icon.setImageResource(R.drawable.user_ic_china)
+            "0081" -> iv_country_icon.setImageResource(R.drawable.user_country_japan)
+            "00852" -> iv_country_icon.setImageResource(R.drawable.user_country_hk)
+            "0061" -> iv_country_icon.setImageResource(R.drawable.user_country_australia)
+            "0064" -> iv_country_icon.setImageResource(R.drawable.user_country_nz)
+            "0082" -> iv_country_icon.setImageResource(R.drawable.user_country_sk)
+            "0060" -> iv_country_icon.setImageResource(R.drawable.user_country_malaysia)
+            "0044" -> iv_country_icon.setImageResource(R.drawable.user_country_uk)
             else -> iv_country_icon.visibility = View.VISIBLE
         }
     }

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -27,7 +27,7 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.activity_verification_code.*
+import kotlinx.android.synthetic.main.user_activity_verification_code.*
 import java.util.concurrent.TimeUnit
 
 /**
@@ -100,7 +100,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
     }
 
     override fun layoutResId(): Int {
-        return R.layout.activity_verification_code
+        return R.layout.user_activity_verification_code
     }
 
     override fun initDataAndEvent() {
@@ -359,7 +359,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
      * 动画
      */
     override fun startAnim() {
-//        val shake = AnimationUtils.loadAnimation(this, R.anim.shake_input)//加载动画资源文件 
+//        val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
 //        pc_1.startAnimation(shake)
         //设置红色边框
         pc_1.setErrorColor()

m-user/src/main/java/com/yidianling/user/widget/PhoneCode.java

@@ -54,7 +54,7 @@ public class PhoneCode extends RelativeLayout {
     }
 
     private void loadView() {
-        View view = LayoutInflater.from(context).inflate(R.layout.phone_code, this);
+        View view = LayoutInflater.from(context).inflate(R.layout.user_phone_code, this);
         initView(view);
         initEvent();
     }
@@ -162,7 +162,7 @@ public class PhoneCode extends RelativeLayout {
     }
 
     public void setErrorColor() {
-        Animation shake = AnimationUtils.loadAnimation(getContext(), R.anim.shake_input);
+        Animation shake = AnimationUtils.loadAnimation(getContext(), R.anim.user_shake_input);
 
         v1.startAnimation(shake);
         v2.startAnimation(shake);

m-user/src/main/java/com/yidianling/user/widget/PrivacyDialog.kt

@@ -26,7 +26,7 @@ import com.yidianling.user.ui.login.RegisterAndLoginActivity
 import de.greenrobot.event.EventBus
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.dialog_privacy.*
+import kotlinx.android.synthetic.main.user_dialog_privacy.*
 
 /**
  * @author jiucheng
@@ -48,7 +48,7 @@ class PrivacyDialog : Dialog {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.dialog_privacy)
+        setContentView(R.layout.user_dialog_privacy)
         setCanceledOnTouchOutside(false)
         window.setBackgroundDrawable(ColorDrawable())
 
@@ -65,7 +65,7 @@ class PrivacyDialog : Dialog {
 
                     override fun onClick(widget: View) {
                         H5Activity.start(activity, true)
-                        activity!!.overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
+                        activity!!.overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.user_slide_null)
                     }
                 }, index, index + 9, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
 

m-user/src/main/res/anim/shake_input.xml → m-user/src/main/res/anim/user_shake_input.xml

-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:duration="400"
-           android:fromXDelta="0"
-           android:interpolator="@anim/cycle_input"
-           android:toXDelta="20" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:duration="400"
+           android:fromXDelta="0"
+           android:interpolator="@anim/user_cycle_input"
+           android:toXDelta="20" />
+

m-user/src/main/res/drawable/bg_radius_green_20.xml → m-user/src/main/res/drawable/user_bg_radius_green_20.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="20dp"></corners>
-    <solid android:color="@color/main_theme" />
-    <stroke android:width="1dp" android:color="@color/main_theme"/>
+    <solid android:color="@color/user_main_theme" />
+    <stroke android:width="1dp" android:color="@color/user_main_theme"/>
 
 </shape>
\ No newline at end of file

m-user/src/main/res/layout/activity_check_password.xml → m-user/src/main/res/layout/user_activity_check_password.xml

-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout 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"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.ydl.ydlcommon.view.TitleBar
-            android:id="@+id/title_bar"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            app:pa_left_start_icon="@drawable/user_nav_close_green"
-            app:pa_title_text="登录验证"/>
-
-        <TextView
-            android:id="@+id/text_phoneNumber"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:gravity="center"
-            tools:text="12000000000" />
-
-        <EditText
-            android:id="@+id/edit_pass"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@color/platform_white"
-            android:hint="输入登录密码"
-            android:inputType="textPassword"
-            android:maxLines="1"
-            android:paddingLeft="10dp"
-            android:textColorHint="@color/platform_place_holder_color" />
-
-        <TextView
-            android:id="@+id/btn_next"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/bg_radius_green_20"
-            android:gravity="center"
-            android:text="下一步"
-            android:textColor="@color/platform_white" />
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/pb_load"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone"/>
-
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout 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"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.ydl.ydlcommon.view.TitleBar
+            android:id="@+id/title_bar"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            app:pa_left_start_icon="@drawable/user_nav_close_green"
+            app:pa_title_text="登录验证"/>
+
+        <TextView
+            android:id="@+id/text_phoneNumber"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:gravity="center"
+            tools:text="12000000000" />
+
+        <EditText
+            android:id="@+id/edit_pass"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:background="@color/platform_white"
+            android:hint="输入登录密码"
+            android:inputType="textPassword"
+            android:maxLines="1"
+            android:paddingLeft="10dp"
+            android:textColorHint="@color/platform_place_holder_color" />
+
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/user_bg_radius_green_20"
+            android:gravity="center"
+            android:text="下一步"
+            android:textColor="@color/platform_white" />
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/pb_load"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+</FrameLayout>

m-user/src/main/res/layout/activity_country_list.xml → m-user/src/main/res/layout/user_activity_country_list.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="24dp"
-        android:padding="3dp"
-        android:src="@drawable/ic_del" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="10dp"
-        android:text="选择国家/地区"
-        android:textColor="@color/platform_color_444444"
-        android:textSize="28sp"
-        android:textStyle="bold" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:layout_marginTop="18dp"
-        android:background="#F0F0F0" />
-
-    <ListView
-        android:id="@+id/country_lv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
-        android:scrollbars="none" />
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginLeft="14dp"
+        android:layout_marginTop="24dp"
+        android:padding="3dp"
+        android:src="@drawable/user_ic_del" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="10dp"
+        android:text="选择国家/地区"
+        android:textColor="@color/platform_color_444444"
+        android:textSize="28sp"
+        android:textStyle="bold" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="18dp"
+        android:background="#F0F0F0" />
+
+    <ListView
+        android:id="@+id/country_lv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="25dp"
+        android:scrollbars="none" />
+</LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_fill_info.xml → m-user/src/main/res/layout/user_activity_fill_info.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <com.ydl.ydlcommon.view.TitleBar
-        android:id="@+id/tb_title"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/title_bar_height"
-        app:pa_left_text="退出"
-        app:pa_title_text="完善资料" />
-
-    <com.ydl.ydlcommon.view.CircleImageView
-        android:id="@+id/sdv_head"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="30dp"
-        android:src="@drawable/regist_photo" />
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:layout_marginTop="36dp"
-        android:background="@color/platform_divide_color" />
-
-    <TextView
-        android:id="@+id/tv_sex"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/platform_white"
-        android:gravity="center"
-        android:hint="@string/platform_please_select_gender"
-        android:padding="@dimen/platform_default_dis_size_huge"
-        android:textColorHint="#777777" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:background="@color/platform_divide_color" />
-
-    <EditText
-        android:id="@+id/et_nick"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/platform_white"
-        android:gravity="center"
-        android:hint="@string/platform_nickname_hint"
-        android:maxLength="10"
-        android:padding="@dimen/platform_default_dis_size_huge"
-        android:singleLine="true"
-        android:textColorHint="#777777" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:background="@color/platform_divide_color" />
-
-    <com.ydl.ydlcommon.view.RoundCornerButton
-        android:id="@+id/rcb_submit"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/platform_default_dis_size_big"
-        android:layout_marginRight="@dimen/platform_default_dis_size_big"
-        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-        android:text="@string/platform_finish"
-        android:textColor="@color/platform_white"
-        android:textSize="@dimen/platform_default_text_size_big"
-        app:pa_round_btn_active_bg="@color/platform_white"
-        app:pa_round_btn_bg="@color/main_theme"
-        app:pa_round_btn_radio_size="5dp" />
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <com.ydl.ydlcommon.view.TitleBar
+        android:id="@+id/tb_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/title_bar_height"
+        app:pa_left_text="退出"
+        app:pa_title_text="完善资料" />
+
+    <com.ydl.ydlcommon.view.CircleImageView
+        android:id="@+id/sdv_head"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="30dp"
+        android:src="@drawable/user_regist_photo" />
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:layout_marginTop="36dp"
+        android:background="@color/platform_divide_color" />
+
+    <TextView
+        android:id="@+id/tv_sex"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/platform_white"
+        android:gravity="center"
+        android:hint="@string/platform_please_select_gender"
+        android:padding="@dimen/platform_default_dis_size_huge"
+        android:textColorHint="#777777" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:background="@color/platform_divide_color" />
+
+    <EditText
+        android:id="@+id/et_nick"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/platform_white"
+        android:gravity="center"
+        android:hint="@string/platform_nickname_hint"
+        android:maxLength="10"
+        android:padding="@dimen/platform_default_dis_size_huge"
+        android:singleLine="true"
+        android:textColorHint="#777777" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:background="@color/platform_divide_color" />
+
+    <com.ydl.ydlcommon.view.RoundCornerButton
+        android:id="@+id/rcb_submit"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/platform_default_dis_size_big"
+        android:layout_marginRight="@dimen/platform_default_dis_size_big"
+        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+        android:text="@string/platform_finish"
+        android:textColor="@color/platform_white"
+        android:textSize="@dimen/platform_default_text_size_big"
+        app:pa_round_btn_active_bg="@color/platform_white"
+        app:pa_round_btn_bg="@color/user_main_theme"
+        app:pa_round_btn_radio_size="5dp" />
+
+</LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_finger_print_check.xml → m-user/src/main/res/layout/user_activity_finger_print_check.xml

@@ -27,10 +27,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="点击进入指纹解锁"
-        android:textColor="@color/main_theme"
+        android:textColor="@color/user_main_theme"
         android:gravity="center"
         android:drawablePadding="20dp"
-        android:drawableTop="@drawable/lock_ico_zhiwen"
+        android:drawableTop="@drawable/user_lock_ico_zhiwen"
         android:layout_centerInParent="true"/>
 
     <TextView
@@ -41,7 +41,7 @@
         android:gravity="center"
         android:padding="5dp"
         android:layout_marginBottom="10dp"
-        android:textColor="@color/main_theme"
+        android:textColor="@color/user_main_theme"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"/>
 </RelativeLayout>

m-user/src/main/res/layout/activity_finger_print_set.xml → m-user/src/main/res/layout/user_activity_finger_print_set.xml

@@ -19,10 +19,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="点击进入指纹解锁"
-        android:textColor="@color/main_theme"
+        android:textColor="@color/user_main_theme"
         android:gravity="center"
         android:drawablePadding="20dp"
-        android:drawableTop="@drawable/lock_ico_zhiwen"
+        android:drawableTop="@drawable/user_lock_ico_zhiwen"
         android:layout_centerInParent="true"/>
 
 </RelativeLayout>

m-user/src/main/res/layout/activity_get_identifying_code.xml → m-user/src/main/res/layout/user_activity_get_identifying_code.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.ydl.ydlcommon.view.TitleBar
-        android:id="@+id/tb_title"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/title_bar_height"
-        app:pa_left_start_icon="@drawable/user_toolbar_back"
-        app:pa_title_text="手机号" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/platform_default_dis_size_large"
-        android:gravity="center"
-        android:text="已发送短信验证码至"
-        android:textSize="@dimen/platform_default_text_size_small" />
-
-    <TextView
-        android:id="@+id/tv_phone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/platform_default_dis_size_large"
-        android:gravity="center"
-        android:textColor="#FF8A00"
-        android:textSize="@dimen/platform_default_text_size_big"
-        tools:text="159 571 87971" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/platform_white"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/platform_default_dis_size"
-                android:text="验证码" />
-
-            <EditText
-                android:id="@+id/et_code"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/platform_white"
-                android:hint="请输入"
-                android:inputType="number"
-                android:padding="@dimen/platform_default_dis_size"
-                android:textColorHint="@color/platform_gray7" />
-
-            <TextView
-                android:id="@+id/tv_get_code"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:padding="@dimen/platform_default_dis_size"
-                android:text="重新发送"
-                android:textColor="@color/main_theme" />
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-
-        <LinearLayout
-            android:id="@+id/lin_login_pass"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/platform_white"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/platform_default_dis_size"
-                android:text="登录密码" />
-
-            <EditText
-                android:id="@+id/et_password"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/platform_white"
-                android:hint="请设置"
-                android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:padding="@dimen/platform_default_dis_size"
-                android:textColorHint="@color/platform_gray7" />
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-
-
-        <TextView
-            android:id="@+id/text_pass_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/platform_default_dis_size"
-            android:text="密码6~16个字符，数字或英文字母的组合"
-            android:textColor="#A6A6A6"
-            android:textSize="@dimen/platform_default_text_size_small" />
-
-        <com.ydl.ydlcommon.view.RoundCornerButton
-            android:id="@+id/rcb_submit"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_default_dis_size"
-            android:layout_marginRight="@dimen/platform_default_dis_size"
-            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-            android:text="提交"
-            android:textColor="@color/platform_white"
-            android:textSize="@dimen/platform_default_text_size_big"
-            app:pa_round_btn_active_bg="@color/platform_white"
-            app:pa_round_btn_bg="@color/main_theme"
-            app:pa_round_btn_radio_size="5dp" />
-
-
-    </LinearLayout>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.ydl.ydlcommon.view.TitleBar
+        android:id="@+id/tb_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/title_bar_height"
+        app:pa_left_start_icon="@drawable/user_toolbar_back"
+        app:pa_title_text="手机号" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/platform_default_dis_size_large"
+        android:gravity="center"
+        android:text="已发送短信验证码至"
+        android:textSize="@dimen/platform_default_text_size_small" />
+
+    <TextView
+        android:id="@+id/tv_phone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/platform_default_dis_size_large"
+        android:gravity="center"
+        android:textColor="#FF8A00"
+        android:textSize="@dimen/platform_default_text_size_big"
+        tools:text="159 571 87971" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/platform_white"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/platform_default_dis_size"
+                android:text="验证码" />
+
+            <EditText
+                android:id="@+id/et_code"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/platform_white"
+                android:hint="请输入"
+                android:inputType="number"
+                android:padding="@dimen/platform_default_dis_size"
+                android:textColorHint="@color/platform_gray7" />
+
+            <TextView
+                android:id="@+id/tv_get_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:padding="@dimen/platform_default_dis_size"
+                android:text="重新发送"
+                android:textColor="@color/user_main_theme" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+
+        <LinearLayout
+            android:id="@+id/lin_login_pass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/platform_white"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/platform_default_dis_size"
+                android:text="登录密码" />
+
+            <EditText
+                android:id="@+id/et_password"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/platform_white"
+                android:hint="请设置"
+                android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                android:padding="@dimen/platform_default_dis_size"
+                android:textColorHint="@color/platform_gray7" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+
+
+        <TextView
+            android:id="@+id/text_pass_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/platform_default_dis_size"
+            android:text="密码6~16个字符，数字或英文字母的组合"
+            android:textColor="#A6A6A6"
+            android:textSize="@dimen/platform_default_text_size_small" />
+
+        <com.ydl.ydlcommon.view.RoundCornerButton
+            android:id="@+id/rcb_submit"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_default_dis_size"
+            android:layout_marginRight="@dimen/platform_default_dis_size"
+            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+            android:text="提交"
+            android:textColor="@color/platform_white"
+            android:textSize="@dimen/platform_default_text_size_big"
+            app:pa_round_btn_active_bg="@color/platform_white"
+            app:pa_round_btn_bg="@color/user_main_theme"
+            app:pa_round_btn_radio_size="5dp" />
+
+
+    </LinearLayout>
+</LinearLayout>

m-user/src/main/res/layout/activity_h5.xml → m-user/src/main/res/layout/user_activity_h5.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#fdfdfe"
-    android:orientation="vertical">
-
-
-    <ImageView
-        android:id="@+id/iv_pop"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_marginLeft="21dp"
-        android:layout_marginTop="24dp"
-        android:padding="4dp"
-        android:src="@drawable/ic_del" />
-
-    <WebView
-        android:id="@+id/web_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="20dp"></WebView>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#fdfdfe"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/iv_pop"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="21dp"
+        android:layout_marginTop="24dp"
+        android:padding="4dp"
+        android:src="@drawable/user_ic_del" />
+
+    <WebView
+        android:id="@+id/web_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"></WebView>
+
+</LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_hand_unlock.xml → m-user/src/main/res/layout/user_activity_hand_unlock.xml

@@ -41,11 +41,11 @@
         android:layout_width="300dp"
         android:layout_gravity="center_horizontal"
         android:layout_height="wrap_content"
-        app:pa_lock9_nodeSrc="@drawable/lock_btn_shoushi"
-        app:pa_lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
+        app:pa_lock9_nodeSrc="@drawable/user_lock_btn_shoushi"
+        app:pa_lock9_nodeOnSrc="@drawable/user_lock_btn_shoushi_pre"
         app:pa_lock9_padding="20dp"
         app:pa_lock9_spacing="40dp"
-        app:pa_lock9_lineColor="@color/main_theme"
+        app:pa_lock9_lineColor="@color/user_main_theme"
         app:pa_lock9_lineWidth="5dp"
         app:pa_lock9_autoLink="false"
         app:pa_lock9_enableVibrate="true"
@@ -62,14 +62,14 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textColor="@color/main_theme"
+            android:textColor="@color/user_main_theme"
             android:text="忘记手势密码"/>
         <TextView
             android:id="@+id/text_login"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:textColor="@color/main_theme"
+            android:textColor="@color/user_main_theme"
             android:gravity="center"
             android:text="切换登录方式"/>
     </LinearLayout>

m-user/src/main/res/layout/activity_hand_unlock_set.xml → m-user/src/main/res/layout/user_activity_hand_unlock_set.xml

@@ -40,11 +40,11 @@
         android:id="@+id/lock9View"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:pa_lock9_nodeSrc="@drawable/lock_btn_shoushi"
-        app:pa_lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
+        app:pa_lock9_nodeSrc="@drawable/user_lock_btn_shoushi"
+        app:pa_lock9_nodeOnSrc="@drawable/user_lock_btn_shoushi_pre"
         app:pa_lock9_padding="28dp"
         app:pa_lock9_spacing="28dp"
-        app:pa_lock9_lineColor="@color/main_theme"
+        app:pa_lock9_lineColor="@color/user_main_theme"
         app:pa_lock9_lineWidth="5dp"
         app:pa_lock9_autoLink="false"
         app:pa_lock9_enableVibrate="true"

m-user/src/main/res/layout/activity_input_password.xml → m-user/src/main/res/layout/user_activity_input_password.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <!--android:src="@drawable/bg_login"-->
-
-    <ImageView
-        android:id="@+id/iv_input_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/bg_login" />
-
-    <ImageView
-        android:id="@+id/input_img_back"
-        android:layout_width="31dp"
-        android:layout_height="31dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_back_grey" />
-
-    <TextView
-        android:id="@+id/tv_setPass2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:text="设置新密码2/2"
-        android:textColor="#2EB0FF"
-        android:textSize="11dp"
-        android:visibility="invisible" />
-
-    <TextView
-        android:id="@+id/input_password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/input_img_back"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="15dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:text="请输入密码"
-        android:textColor="#fdfdfe"
-        android:textSize="28dp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/tv_phone_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/input_password"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="@dimen/platform_dp_4"
-        android:text="当前手机号"
-        android:textColor="#fdfdfe"
-        android:textSize="13sp" />
-
-    <TextView
-        android:id="@+id/tv_user_phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_phone_num"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/tv_phone_num"
-        android:textColor="#fdfdfe"
-        android:textSize="13sp"
-        android:textStyle="bold"
-        tools:text="123234214" />
-
-    <TextView
-        android:id="@+id/tv_forget"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_phone_num"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="15dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:padding="5dp"
-        android:text="忘记密码"
-        android:textColor="#2EB0FF"
-        android:textSize="11sp" />
-
-    <RelativeLayout
-        android:id="@+id/rl_input_card_view"
-        android:layout_width="match_parent"
-        android:layout_height="213dp"
-        android:layout_below="@id/tv_phone_num"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="28dp"
-        android:background="@drawable/card_login"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/input_ll_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="60dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp">
-
-            <FrameLayout
-                android:layout_width="40dp"
-                android:layout_height="26dp"
-                android:background="@drawable/platform_bg_radius_f3_10"
-                android:gravity="center_vertical">
-
-                <ImageView
-                    android:id="@+id/iv_visibility"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="center_vertical"
-                    android:padding="12dp"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_invisibility" />
-            </FrameLayout>
-
-            <EditText
-                android:id="@+id/et_input_password"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
-                android:background="@null"
-                android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:hint="当前密码不可见"
-                android:lines="1"
-                android:maxLines="16"
-                android:textColorHint="#CACACA"
-                android:textSize="16sp" />
-
-            <ImageView
-                android:id="@+id/input_iv_del"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:layout_gravity="center_vertical"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_del" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_input_lin"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_below="@id/input_ll_bar"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="15dp"
-            android:background="#DBDBDB" />
-
-        <LinearLayout
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="13dp"
-            android:background="@drawable/bg_radius_bule"
-            android:elevation="10dp"
-            android:gravity="center">
-
-
-            <ImageView
-                android:id="@+id/input_iv_next"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerInParent="true"
-                android:padding="10dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_next" />
-
-            <ProgressBar
-                android:id="@+id/input_progressBarNormal"
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:padding="10dp"
-                android:indeterminateTint="#ffffff"
-                android:visibility="gone" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_msm_login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:background="@drawable/bg_radius_transparent"
-            android:gravity="center"
-            android:paddingLeft="10dp"
-            android:paddingTop="3dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="3dp"
-            android:text="短信登录"
-            android:textColor="#fff"
-            android:textSize="11dp" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_input_succee"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:background="#fff"
-        android:gravity="center"
-
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp">
-
-            <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:src="@drawable/ic_log_succee" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:text="登录成功!"
-                android:textColor="#32D296"
-                android:textSize="13dp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="35dp"
-            android:text="密码已修改"
-            android:textColor="#666666"
-            android:textSize="13dp" />
-    </LinearLayout>
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <!--android:src="@drawable/user_bg_login"-->
+
+    <ImageView
+        android:id="@+id/iv_input_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/user_bg_login" />
+
+    <ImageView
+        android:id="@+id/input_img_back"
+        android:layout_width="31dp"
+        android:layout_height="31dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/user_ic_back_grey" />
+
+    <TextView
+        android:id="@+id/tv_setPass2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:text="设置新密码2/2"
+        android:textColor="#2EB0FF"
+        android:textSize="11dp"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/input_password"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/input_img_back"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="15dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:text="请输入密码"
+        android:textColor="#fdfdfe"
+        android:textSize="28dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_phone_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/input_password"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="@dimen/platform_dp_4"
+        android:text="当前手机号"
+        android:textColor="#fdfdfe"
+        android:textSize="13sp" />
+
+    <TextView
+        android:id="@+id/tv_user_phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_phone_num"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/tv_phone_num"
+        android:textColor="#fdfdfe"
+        android:textSize="13sp"
+        android:textStyle="bold"
+        tools:text="123234214" />
+
+    <TextView
+        android:id="@+id/tv_forget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_phone_num"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="15dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:padding="5dp"
+        android:text="忘记密码"
+        android:textColor="#2EB0FF"
+        android:textSize="11sp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_input_card_view"
+        android:layout_width="match_parent"
+        android:layout_height="213dp"
+        android:layout_below="@id/tv_phone_num"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="28dp"
+        android:background="@drawable/user_card_login"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/input_ll_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp">
+
+            <FrameLayout
+                android:layout_width="40dp"
+                android:layout_height="26dp"
+                android:background="@drawable/platform_bg_radius_f3_10"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/iv_visibility"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="center_vertical"
+                    android:padding="12dp"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/user_ic_invisibility" />
+            </FrameLayout>
+
+            <EditText
+                android:id="@+id/et_input_password"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                android:hint="当前密码不可见"
+                android:lines="1"
+                android:maxLines="16"
+                android:textColorHint="#CACACA"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:id="@+id/input_iv_del"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center_vertical"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/user_ic_del" />
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_input_lin"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_below="@id/input_ll_bar"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="15dp"
+            android:background="#DBDBDB" />
+
+        <LinearLayout
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="13dp"
+            android:background="@drawable/user_bg_radius_bule"
+            android:elevation="10dp"
+            android:gravity="center">
+
+
+            <ImageView
+                android:id="@+id/input_iv_next"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerInParent="true"
+                android:padding="10dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/user_ic_next" />
+
+            <ProgressBar
+                android:id="@+id/input_progressBarNormal"
+                android:layout_width="62dp"
+                android:layout_height="62dp"
+                android:padding="10dp"
+                android:indeterminateTint="#ffffff"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_msm_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/user_bg_radius_transparent"
+            android:gravity="center"
+            android:paddingLeft="10dp"
+            android:paddingTop="3dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="3dp"
+            android:text="短信登录"
+            android:textColor="#fff"
+            android:textSize="11dp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_input_succee"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:background="#fff"
+        android:gravity="center"
+
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/user_ic_log_succee" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:text="登录成功!"
+                android:textColor="#32D296"
+                android:textSize="13dp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="35dp"
+            android:text="密码已修改"
+            android:textColor="#666666"
+            android:textSize="13dp" />
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_input_phone.xml → m-user/src/main/res/layout/user_activity_input_phone.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.ydl.ydlcommon.view.TitleBar
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/title_bar_height"
-        app:pa_left_start_icon="@drawable/user_toolbar_back"
-        app:pa_title_text="填写手机号"/>
-
-    <TextView
-        android:id="@+id/tv_free_packet_hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ico_hb_s"
-        android:drawablePadding="5dp"
-        android:paddingBottom="8dp"
-        android:paddingLeft="15dp"
-        android:paddingTop="25dp"
-        android:text="注册即可领取218元新人大礼包"
-        android:textColor="#666666"
-        android:textSize="@dimen/text_size_15"
-        android:visibility="gone"
-        tools:visibility="visible"/>
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-        android:background="@color/platform_divide_color"/>
-
-    <com.ydl.ydlcommon.view.JumpTextView
-        android:id="@+id/jtv_country"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#ffffff"
-        app:pa_jump_tv_icon="@drawable/platform_icon_country"
-        app:pa_jump_tv_left_icon_hight="20dp"
-        app:pa_jump_tv_left_icon_width="20dp"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:background="@color/platform_divide_color"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-        android:background="@color/platform_divide_color"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/platform_white"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/platform_default_dis_size"
-            android:text="手机号"/>
-
-        <com.ydl.ydlcommon.view.DeleteEditTextView
-            android:id="@+id/detv_phone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/platform_white"
-            android:inputType="number"
-            android:padding="@dimen/platform_default_dis_size" />
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divide_line_stroke_width"
-        android:background="@color/platform_divide_color"/>
-
-    <LinearLayout
-        android:id="@+id/ll_protocol"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_default_dis_size"
-            android:paddingBottom="@dimen/platform_default_dis_size_micro"
-            android:paddingTop="@dimen/platform_default_dis_size_micro"
-            android:text="已阅读并同意"
-            android:textColor="#A1A1A1"
-            android:textSize="@dimen/platform_default_text_size_small"/>
-
-        <TextView
-            android:id="@+id/tv_protocol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_default_dis_size_micro"
-            android:layout_marginStart="@dimen/platform_default_dis_size_micro"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingBottom="@dimen/platform_default_dis_size_micro"
-            android:paddingTop="@dimen/platform_default_dis_size_micro"
-            android:text="@string/platform_user_protocol"
-            android:textColor="@color/main_theme"
-            android:textSize="@dimen/platform_default_text_size_small"/>
-    </LinearLayout>
-
-    <com.ydl.ydlcommon.view.RoundCornerButton
-        android:id="@+id/rcb_next"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/platform_default_dis_size_big"
-        android:layout_marginRight="@dimen/platform_default_dis_size_big"
-        android:layout_marginTop="@dimen/platform_default_dis_size_large"
-        android:text="@string/platform_next_step"
-        android:textColor="@color/platform_white"
-        android:textSize="@dimen/platform_default_text_size_big"
-        app:pa_round_btn_active_bg="@color/platform_white"
-        app:pa_round_btn_bg="@color/main_theme"
-        app:pa_round_btn_radio_size="5dp"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.ydl.ydlcommon.view.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/title_bar_height"
+        app:pa_left_start_icon="@drawable/user_toolbar_back"
+        app:pa_title_text="填写手机号"/>
+
+    <TextView
+        android:id="@+id/tv_free_packet_hint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/user_ico_hb_s"
+        android:drawablePadding="5dp"
+        android:paddingBottom="8dp"
+        android:paddingLeft="15dp"
+        android:paddingTop="25dp"
+        android:text="注册即可领取218元新人大礼包"
+        android:textColor="#666666"
+        android:textSize="@dimen/user_text_size_15"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+        android:background="@color/platform_divide_color"/>
+
+    <com.ydl.ydlcommon.view.JumpTextView
+        android:id="@+id/jtv_country"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        app:pa_jump_tv_icon="@drawable/platform_icon_country"
+        app:pa_jump_tv_left_icon_hight="20dp"
+        app:pa_jump_tv_left_icon_width="20dp"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:background="@color/platform_divide_color"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+        android:background="@color/platform_divide_color"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/platform_white"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/platform_default_dis_size"
+            android:text="手机号"/>
+
+        <com.ydl.ydlcommon.view.DeleteEditTextView
+            android:id="@+id/detv_phone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/platform_white"
+            android:inputType="number"
+            android:padding="@dimen/platform_default_dis_size" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/user_divide_line_stroke_width"
+        android:background="@color/platform_divide_color"/>
+
+    <LinearLayout
+        android:id="@+id/ll_protocol"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_default_dis_size"
+            android:paddingBottom="@dimen/platform_default_dis_size_micro"
+            android:paddingTop="@dimen/platform_default_dis_size_micro"
+            android:text="已阅读并同意"
+            android:textColor="#A1A1A1"
+            android:textSize="@dimen/platform_default_text_size_small"/>
+
+        <TextView
+            android:id="@+id/tv_protocol"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_default_dis_size_micro"
+            android:layout_marginStart="@dimen/platform_default_dis_size_micro"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingBottom="@dimen/platform_default_dis_size_micro"
+            android:paddingTop="@dimen/platform_default_dis_size_micro"
+            android:text="@string/platform_user_protocol"
+            android:textColor="@color/user_main_theme"
+            android:textSize="@dimen/platform_default_text_size_small"/>
+    </LinearLayout>
+
+    <com.ydl.ydlcommon.view.RoundCornerButton
+        android:id="@+id/rcb_next"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/platform_default_dis_size_big"
+        android:layout_marginRight="@dimen/platform_default_dis_size_big"
+        android:layout_marginTop="@dimen/platform_default_dis_size_large"
+        android:text="@string/platform_next_step"
+        android:textColor="@color/platform_white"
+        android:textSize="@dimen/platform_default_text_size_big"
+        app:pa_round_btn_active_bg="@color/platform_white"
+        app:pa_round_btn_bg="@color/user_main_theme"
+        app:pa_round_btn_radio_size="5dp"/>
+
+</LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_login.xml → m-user/src/main/res/layout/user_activity_login.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
-    <LinearLayout
-        android:id="@+id/ll_top"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <com.ydl.ydlcommon.view.TitleBar
-            android:id="@+id/tb_title"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/title_bar_height"
-            app:pa_left_text="取消"
-            app:pa_title_text="登录" />
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-            android:background="@color/platform_divide_color" />
-
-        <com.ydl.ydlcommon.view.JumpTextView
-            android:id="@+id/jtv_country"
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:background="@color/platform_white"
-            app:pa_jump_tv_icon="@drawable/platform_icon_country"
-            app:pa_jump_tv_left_text="中国    +0086"
-            app:pa_jump_tv_left_icon_width="20dp"
-            app:pa_jump_tv_left_icon_hight="20dp"/>
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-        <android.support.v4.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-        <com.ydl.ydlcommon.view.DeleteEditTextView
-            android:id="@+id/detv_phone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/platform_white"
-            android:drawableLeft="@drawable/phone"
-            android:drawablePadding="@dimen/platform_default_dis_size_small"
-            android:hint="手机号"
-            android:inputType="number"
-            android:paddingTop="@dimen/platform_default_dis_size_big"
-            android:paddingRight="@dimen/platform_default_dis_size_big"
-            android:paddingBottom="@dimen/platform_default_dis_size_big"
-            android:paddingLeft="17dp"
-            android:text=""
-            android:textColorHint="@color/platform_default_text_color_hint" />
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-
-        <com.ydl.ydlcommon.view.DeleteEditTextView
-            android:id="@+id/detv_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/platform_white"
-            android:drawableLeft="@drawable/lock"
-            android:drawablePadding="@dimen/platform_default_dis_size_small"
-            android:hint="密码"
-            android:inputType="textPassword"
-            android:paddingTop="@dimen/platform_default_dis_size_big"
-            android:paddingRight="@dimen/platform_default_dis_size_big"
-            android:paddingBottom="@dimen/platform_default_dis_size_big"
-            android:paddingLeft="17dp"
-            android:text=""
-            android:textColorHint="@color/platform_default_text_color_hint" />
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:background="@color/platform_divide_color" />
-
-        <com.ydl.ydlcommon.view.RoundCornerButton
-            android:id="@+id/rcb_login"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/platform_default_dis_size_big"
-            android:layout_marginRight="@dimen/platform_default_dis_size_big"
-            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
-            android:text="登录"
-            android:textColor="@color/platform_white"
-            android:textSize="@dimen/platform_default_text_size_big"
-            app:pa_round_btn_active_bg="@color/platform_white"
-            app:pa_round_btn_bg="@color/main_theme"
-            app:pa_round_btn_radio_size="5dp" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/ll_top"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/register"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:paddingBottom="@dimen/platform_default_dis_size"
-            android:paddingLeft="@dimen/platform_default_dis_size"
-            android:paddingRight="@dimen/platform_default_dis_size_big"
-            android:paddingTop="@dimen/platform_default_dis_size_huge"
-            android:text="新手注册"
-            android:textColor="@color/main_theme"
-            android:textSize="17sp"/>
-
-        <TextView
-            android:id="@+id/sms_fast_login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:paddingBottom="@dimen/platform_default_dis_size"
-            android:paddingLeft="@dimen/platform_default_dis_size"
-            android:paddingRight="@dimen/platform_default_dis_size_big"
-            android:paddingTop="@dimen/platform_default_dis_size_huge"
-            android:text="短信快捷登录"
-            android:textColor="@color/main_theme"
-            android:textSize="17sp" />
-    </RelativeLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <LinearLayout
+        android:id="@+id/ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.ydl.ydlcommon.view.TitleBar
+            android:id="@+id/tb_title"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/title_bar_height"
+            app:pa_left_text="取消"
+            app:pa_title_text="登录" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+            android:background="@color/platform_divide_color" />
+
+        <com.ydl.ydlcommon.view.JumpTextView
+            android:id="@+id/jtv_country"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:background="@color/platform_white"
+            app:pa_jump_tv_icon="@drawable/platform_icon_country"
+            app:pa_jump_tv_left_text="中国    +0086"
+            app:pa_jump_tv_left_icon_width="20dp"
+            app:pa_jump_tv_left_icon_hight="20dp"/>
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+        <android.support.v4.widget.Space
+            android:layout_width="match_parent"
+            android:layout_height="10dp" />
+        <com.ydl.ydlcommon.view.DeleteEditTextView
+            android:id="@+id/detv_phone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/platform_white"
+            android:drawableLeft="@drawable/user_phone"
+            android:drawablePadding="@dimen/platform_default_dis_size_small"
+            android:hint="手机号"
+            android:inputType="number"
+            android:paddingTop="@dimen/platform_default_dis_size_big"
+            android:paddingRight="@dimen/platform_default_dis_size_big"
+            android:paddingBottom="@dimen/platform_default_dis_size_big"
+            android:paddingLeft="17dp"
+            android:text=""
+            android:textColorHint="@color/platform_default_text_color_hint" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+
+        <com.ydl.ydlcommon.view.DeleteEditTextView
+            android:id="@+id/detv_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/platform_white"
+            android:drawableLeft="@drawable/user_lock"
+            android:drawablePadding="@dimen/platform_default_dis_size_small"
+            android:hint="密码"
+            android:inputType="textPassword"
+            android:paddingTop="@dimen/platform_default_dis_size_big"
+            android:paddingRight="@dimen/platform_default_dis_size_big"
+            android:paddingBottom="@dimen/platform_default_dis_size_big"
+            android:paddingLeft="17dp"
+            android:text=""
+            android:textColorHint="@color/platform_default_text_color_hint" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/user_divide_line_stroke_width"
+            android:background="@color/platform_divide_color" />
+
+        <com.ydl.ydlcommon.view.RoundCornerButton
+            android:id="@+id/rcb_login"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/platform_default_dis_size_big"
+            android:layout_marginRight="@dimen/platform_default_dis_size_big"
+            android:layout_marginTop="@dimen/platform_default_dis_size_huge"
+            android:text="登录"
+            android:textColor="@color/platform_white"
+            android:textSize="@dimen/platform_default_text_size_big"
+            app:pa_round_btn_active_bg="@color/platform_white"
+            app:pa_round_btn_bg="@color/user_main_theme"
+            app:pa_round_btn_radio_size="5dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/ll_top"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/register"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:paddingBottom="@dimen/platform_default_dis_size"
+            android:paddingLeft="@dimen/platform_default_dis_size"
+            android:paddingRight="@dimen/platform_default_dis_size_big"
+            android:paddingTop="@dimen/platform_default_dis_size_huge"
+            android:text="新手注册"
+            android:textColor="@color/user_main_theme"
+            android:textSize="17sp"/>
+
+        <TextView
+            android:id="@+id/sms_fast_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="@dimen/platform_default_dis_size"
+            android:paddingLeft="@dimen/platform_default_dis_size"
+            android:paddingRight="@dimen/platform_default_dis_size_big"
+            android:paddingTop="@dimen/platform_default_dis_size_huge"
+            android:text="短信快捷登录"
+            android:textColor="@color/user_main_theme"
+            android:textSize="17sp" />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_me_privacy.xml → m-user/src/main/res/layout/user_activity_me_privacy.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.ydl.ydlcommon.view.TitleBar
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:pa_left_start_icon="@drawable/user_toolbar_back"
-        app:pa_title_text="隐私安全">
-
-    </com.ydl.ydlcommon.view.TitleBar>
-
-    <TextView
-        android:id="@+id/finger_tip"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:text="指纹密码仅对本机有效"
-        android:textColor="@color/platform_gray7"
-        android:background="@color/platform_f5f5f5"/>
-
-    <RelativeLayout
-        android:id="@+id/rela_finger"
-        android:background="#ffffff"
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <TextView
-            android:text="指纹解锁"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="15dp"/>
-
-        <com.ydl.ydlcommon.view.MyToggleButton
-            android:id="@+id/zhiwen"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="13dp"
-            android:layout_alignParentRight="true"
-            android:layout_width="50dp"
-            android:layout_height="30dp" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/platform_f5f5f5"/>
-
-    <RelativeLayout
-        android:background="#ffffff"
-        android:layout_width="match_parent"
-        android:layout_height="55dp">
-
-        <TextView
-            android:text="手势密码"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="15dp" />
-
-        <com.ydl.ydlcommon.view.MyToggleButton
-            android:id="@+id/shoushi"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="13dp"
-            android:layout_alignParentRight="true"
-            android:layout_width="50dp"
-            android:layout_height="30dp" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/platform_f5f5f5"/>
-
-    <LinearLayout
-        android:id="@+id/lin_update"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/platform_white"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        tools:visibility="visible"
-        android:visibility="gone"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="修改手势密码"
-            android:textSize="14sp"
-            android:gravity="center_vertical"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/nim_arrow_right"/>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.ydl.ydlcommon.view.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        app:pa_left_start_icon="@drawable/user_toolbar_back"
+        app:pa_title_text="隐私安全">
+
+    </com.ydl.ydlcommon.view.TitleBar>
+
+    <TextView
+        android:id="@+id/finger_tip"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical"
+        android:paddingLeft="10dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:text="指纹密码仅对本机有效"
+        android:textColor="@color/platform_gray7"
+        android:background="@color/platform_f5f5f5"/>
+
+    <RelativeLayout
+        android:id="@+id/rela_finger"
+        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:text="指纹解锁"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:layout_marginLeft="15dp"/>
+
+        <com.ydl.ydlcommon.view.MyToggleButton
+            android:id="@+id/zhiwen"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="13dp"
+            android:layout_alignParentRight="true"
+            android:layout_width="50dp"
+            android:layout_height="30dp" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/platform_f5f5f5"/>
+
+    <RelativeLayout
+        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="55dp">
+
+        <TextView
+            android:text="手势密码"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:layout_marginLeft="15dp" />
+
+        <com.ydl.ydlcommon.view.MyToggleButton
+            android:id="@+id/shoushi"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="13dp"
+            android:layout_alignParentRight="true"
+            android:layout_width="50dp"
+            android:layout_height="30dp" />
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/platform_f5f5f5"/>
+
+    <LinearLayout
+        android:id="@+id/lin_update"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/platform_white"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        tools:visibility="visible"
+        android:visibility="gone"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="修改手势密码"
+            android:textSize="14sp"
+            android:gravity="center_vertical"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/user_nim_arrow_right"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_register_and_login.xml → m-user/src/main/res/layout/user_activity_register_and_login.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rl_login_conten"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/bg_login"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/bg_login" />
-
-    <ImageView
-        android:id="@+id/img_reg_back"
-        android:layout_width="31dp"
-        android:layout_height="31dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_back_grey" />
-
-    <TextView
-        android:id="@+id/tv_skip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="23dp"
-        android:padding="5dp"
-        android:text="跳过"
-        android:textColor="#2EB0FF"
-        android:textSize="11dp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/tv_reg_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/img_reg_back"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="15dp"
-        android:text="登录/注册"
-        android:textColor="#fdfdfe"
-        android:textSize="28dp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/tv_des"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_reg_title"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="6.5dp"
-        android:fontFamily="sans-serif-light"
-        android:text="继续即代表您同意"
-        android:textColor="#fdfdfe"
-        android:textSize="13sp" />
-
-    <TextView
-        android:id="@+id/tv_protocol"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_des"
-        android:layout_toRightOf="@+id/tv_des"
-        android:text="《壹点灵用户使用协议》"
-        android:textColor="#fdfdfe"
-        android:textSize="13sp" />
-
-    <RelativeLayout
-        android:id="@+id/card_view"
-        android:layout_width="match_parent"
-        android:layout_height="213dp"
-        android:layout_below="@+id/tv_des"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="28dp"
-        android:background="@drawable/card_login"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/input_ll_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="60dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            tools:background="@color/blue">
-
-            <LinearLayout
-                android:id="@+id/ll_country"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg__choose_country_radius"
-                android:gravity="center_vertical"
-                android:paddingLeft="7dp"
-                android:paddingTop="4dp"
-                android:paddingRight="7dp"
-                android:paddingBottom="4dp">
-
-                <ImageView
-                    android:id="@+id/iv_country_icon"
-                    android:layout_width="23dp"
-                    android:layout_height="16dp"
-                    android:layout_gravity="center_vertical"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_china" />
-
-                <TextView
-                    android:id="@+id/tv_country_code"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4dp"
-                    android:maxLines="1"
-                    android:text="+86"
-                    android:textColor="#666666"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-            <com.ydl.ydlcommon.view.PhoneEditText
-                android:id="@+id/et_phone_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="@null"
-                android:gravity="center_vertical|left"
-                android:inputType="phone"
-                android:lines="1"
-                android:maxLength="13"
-                android:textColorHint="@color/platform_color_c6c3c3"
-                android:textSize="24sp" />
-
-            <ImageView
-                android:id="@+id/iv_del"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_gravity="center_vertical"
-                android:padding="5dp"
-                android:scaleType="fitXY"
-                android:src="@drawable/ic_del"
-                android:visibility="invisible" />
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_lin"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@+id/input_ll_bar"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="15dp"
-            android:background="#e8e8e8" />
-
-        <ImageView
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="13dp"
-            android:src="@drawable/next_border" />
-
-        <RelativeLayout
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="13dp"
-            android:background="@drawable/bg_radius_bule"
-            android:elevation="10dp"
-            android:gravity="center">
-
-            <ImageView
-                android:id="@+id/iv_next"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentBottom="true"
-                android:layout_centerInParent="true"
-                android:padding="18sp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_next" />
-
-            <ProgressBar
-                android:id="@+id/pb_Normal"
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:indeterminateTint="#ffffff"
-                android:padding="10dp"
-                android:visibility="gone" />
-        </RelativeLayout>
-    </RelativeLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="70dp"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/iv_weixin"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:contentDescription="@null"
-            android:scaleType="centerCrop"
-            android:src="@drawable/login_weixin" />
-
-        <ImageView
-            android:id="@+id/iv_qq"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:layout_marginLeft="30dp"
-            android:contentDescription="@null"
-            android:scaleType="centerCrop"
-            android:src="@drawable/login_qq"
-            android:visibility="visible" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_success"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:background="#fff"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp">
-
-            <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:src="@drawable/ic_log_succee" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:text="登录成功!"
-                android:textColor="#32D296"
-                android:textSize="13dp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="35dp"
-            android:text="您已通过阿里云号码认证服务，一键登录更安全。"
-            android:textColor="#666666"
-            android:textSize="13dp" />
-    </LinearLayout>
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rl_login_conten"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/bg_login"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/user_bg_login" />
+
+    <ImageView
+        android:id="@+id/img_reg_back"
+        android:layout_width="31dp"
+        android:layout_height="31dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/user_ic_back_grey" />
+
+    <TextView
+        android:id="@+id/tv_skip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="23dp"
+        android:padding="5dp"
+        android:text="跳过"
+        android:textColor="#2EB0FF"
+        android:textSize="11dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/tv_reg_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/img_reg_back"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="15dp"
+        android:text="登录/注册"
+        android:textColor="#fdfdfe"
+        android:textSize="28dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_des"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_reg_title"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="6.5dp"
+        android:fontFamily="sans-serif-light"
+        android:text="继续即代表您同意"
+        android:textColor="#fdfdfe"
+        android:textSize="13sp" />
+
+    <TextView
+        android:id="@+id/tv_protocol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_des"
+        android:layout_toRightOf="@+id/tv_des"
+        android:text="《壹点灵用户使用协议》"
+        android:textColor="#fdfdfe"
+        android:textSize="13sp" />
+
+    <RelativeLayout
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="213dp"
+        android:layout_below="@+id/tv_des"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="28dp"
+        android:background="@drawable/user_card_login"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/input_ll_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            tools:background="@color/blue">
+
+            <LinearLayout
+                android:id="@+id/ll_country"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/user_bg__choose_country_radius"
+                android:gravity="center_vertical"
+                android:paddingLeft="7dp"
+                android:paddingTop="4dp"
+                android:paddingRight="7dp"
+                android:paddingBottom="4dp">
+
+                <ImageView
+                    android:id="@+id/iv_country_icon"
+                    android:layout_width="23dp"
+                    android:layout_height="16dp"
+                    android:layout_gravity="center_vertical"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/user_ic_china" />
+
+                <TextView
+                    android:id="@+id/tv_country_code"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:maxLines="1"
+                    android:text="+86"
+                    android:textColor="#666666"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <com.ydl.ydlcommon.view.PhoneEditText
+                android:id="@+id/et_phone_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:gravity="center_vertical|left"
+                android:inputType="phone"
+                android:lines="1"
+                android:maxLength="13"
+                android:textColorHint="@color/platform_color_c6c3c3"
+                android:textSize="24sp" />
+
+            <ImageView
+                android:id="@+id/iv_del"
+                android:layout_width="23dp"
+                android:layout_height="23dp"
+                android:layout_gravity="center_vertical"
+                android:padding="5dp"
+                android:scaleType="fitXY"
+                android:src="@drawable/user_ic_del"
+                android:visibility="invisible" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_lin"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/input_ll_bar"
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="15dp"
+            android:background="#e8e8e8" />
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="13dp"
+            android:src="@drawable/user_next_border" />
+
+        <RelativeLayout
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="13dp"
+            android:background="@drawable/user_bg_radius_bule"
+            android:elevation="10dp"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/iv_next"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_alignParentBottom="true"
+                android:layout_centerInParent="true"
+                android:padding="18sp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/user_ic_next" />
+
+            <ProgressBar
+                android:id="@+id/pb_Normal"
+                android:layout_width="62dp"
+                android:layout_height="62dp"
+                android:indeterminateTint="#ffffff"
+                android:padding="10dp"
+                android:visibility="gone" />
+        </RelativeLayout>
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/iv_weixin"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:contentDescription="@null"
+            android:scaleType="centerCrop"
+            android:src="@drawable/user_login_weixin" />
+
+        <ImageView
+            android:id="@+id/iv_qq"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginLeft="30dp"
+            android:contentDescription="@null"
+            android:scaleType="centerCrop"
+            android:src="@drawable/user_login_qq"
+            android:visibility="visible" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_success"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:background="#fff"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/user_ic_log_succee" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:text="登录成功!"
+                android:textColor="#32D296"
+                android:textSize="13dp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="35dp"
+            android:text="您已通过阿里云号码认证服务，一键登录更安全。"
+            android:textColor="#666666"
+            android:textSize="13dp" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/activity_verification_code.xml → m-user/src/main/res/layout/user_activity_verification_code.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rl_login_conten"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/bg_login" />
-
-    <ImageView
-        android:id="@+id/img_goback"
-        android:layout_width="31dp"
-        android:layout_height="31dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_back_grey" />
-
-    <TextView
-        android:id="@+id/tv_first"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/img_goback"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="28dp"
-        android:layout_marginBottom="-5dp"
-        android:text="设置新密码1/2"
-        android:textColor="#2EB0FF"
-        android:textSize="11sp"
-        android:visibility="invisible"
-        tools:visibility="visible" />
-
-
-    <TextView
-        android:id="@+id/tv_countdown_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_des_number"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="23dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:padding="5dp"
-        android:textColor="@color/platform_white"
-        android:textSize="11dp"
-        tools:text="发送验证码"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/img_goback"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="15dp"
-        android:text="输入验证码"
-        android:textColor="@color/platform_white"
-        android:textSize="28sp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/tv_des_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_title"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="4dp"
-        android:text="短信已发送至 "
-        android:textColor="@color/platform_white"
-        android:textSize="14dp" />
-
-    <TextView
-        android:id="@+id/tv_phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_des_number"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/tv_des_number"
-        android:textColor="#fdfdfe"
-        android:textSize="14dp"
-        android:textStyle="bold"
-        tools:text="18258888888" />
-
-
-    <RelativeLayout
-        android:id="@+id/card_view"
-        android:layout_width="match_parent"
-        android:layout_height="213dp"
-        android:layout_below="@id/tv_des_number"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="28dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="28dp"
-        android:background="@drawable/card_login"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/ll_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <com.yidianling.user.widget.PhoneCode
-                android:id="@+id/pc_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="60dp"
-                android:layout_marginRight="20dp" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerInParent="true"
-            android:layout_marginBottom="13dp"
-            android:background="@drawable/bg_radius_bule"
-            android:elevation="10dp"
-            android:gravity="center">
-
-            <ImageView
-                android:id="@+id/ver_iv_next"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerInParent="true"
-                android:padding="10dp"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_next" />
-
-            <ProgressBar
-                android:id="@+id/pb_load"
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:padding="10dp"
-                android:indeterminateTint="#ffffff"
-                android:visibility="gone" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_passWord"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:background="@drawable/bg_radius_transparent"
-            android:gravity="center"
-            android:paddingLeft="10dp"
-            android:paddingTop="3dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="3dp"
-            android:text="密码登录"
-            android:textColor="#fff"
-            android:textSize="11dp" />
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="70dp"
-        android:gravity="center" />
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rl_login_conten"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/user_bg_login" />
+
+    <ImageView
+        android:id="@+id/img_goback"
+        android:layout_width="31dp"
+        android:layout_height="31dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/user_ic_back_grey" />
+
+    <TextView
+        android:id="@+id/tv_first"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/img_goback"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="28dp"
+        android:layout_marginBottom="-5dp"
+        android:text="设置新密码1/2"
+        android:textColor="#2EB0FF"
+        android:textSize="11sp"
+        android:visibility="invisible"
+        tools:visibility="visible" />
+
+
+    <TextView
+        android:id="@+id/tv_countdown_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_des_number"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="23dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:padding="5dp"
+        android:textColor="@color/platform_white"
+        android:textSize="11dp"
+        tools:text="发送验证码"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/img_goback"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="15dp"
+        android:text="输入验证码"
+        android:textColor="@color/platform_white"
+        android:textSize="28sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_des_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_title"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="4dp"
+        android:text="短信已发送至 "
+        android:textColor="@color/platform_white"
+        android:textSize="14dp" />
+
+    <TextView
+        android:id="@+id/tv_phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_des_number"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/tv_des_number"
+        android:textColor="#fdfdfe"
+        android:textSize="14dp"
+        android:textStyle="bold"
+        tools:text="18258888888" />
+
+
+    <RelativeLayout
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="213dp"
+        android:layout_below="@id/tv_des_number"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="28dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="28dp"
+        android:background="@drawable/user_card_login"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/ll_bar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <com.yidianling.user.widget.PhoneCode
+                android:id="@+id/pc_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="60dp"
+                android:layout_marginRight="20dp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="13dp"
+            android:background="@drawable/user_bg_radius_bule"
+            android:elevation="10dp"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/ver_iv_next"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerInParent="true"
+                android:padding="10dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/user_ic_next" />
+
+            <ProgressBar
+                android:id="@+id/pb_load"
+                android:layout_width="62dp"
+                android:layout_height="62dp"
+                android:padding="10dp"
+                android:indeterminateTint="#ffffff"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_passWord"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/user_bg_radius_transparent"
+            android:gravity="center"
+            android:paddingLeft="10dp"
+            android:paddingTop="3dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="3dp"
+            android:text="密码登录"
+            android:textColor="#fff"
+            android:textSize="11dp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:gravity="center" />
+
+</RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/dialog_privacy.xml → m-user/src/main/res/layout/user_dialog_privacy.xml

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView 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"
-    android:layout_width="match_parent"
-    android:layout_height="405dp"
-    android:background="#00000000"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    app:cardCornerRadius="15dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="120dp"
-            android:scaleType="fitXY"
-            android:src="@drawable/img_privacy" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:gravity="center"
-            android:text="用户隐私保护政策"
-            android:textColor="@color/platform_white"
-            android:textSize="21sp" />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/tv_disagree"
-            android:layout_below="@+id/title"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="28dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingLeft="23dp"
-                android:paddingRight="23dp">
-
-                <TextView
-                    android:id="@+id/tv_des"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:lineSpacingExtra="4dp"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="12sp"
-                    tools:text="为响应为为响应为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规，我们在近期更新了《壹点灵隐私政策》文件以确保用户充分理解政策，请您在使用前务必仔细阅读。
-点击下方“同意”按钮即可使用壹点灵提供的服务，使用过程中我们会竭尽全力保护您的隐私安全，未经您的授权，壹点灵不会向任何第三方提供您的信息。" />
-
-                <TextView
-                    android:id="@+id/tv_update_des"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:gravity="end"
-                    android:textColor="@color/platform_color_444444"
-                    android:textSize="12sp"
-                    tools:text="更新日期：2018年11月11日" />
-            </LinearLayout>
-        </ScrollView>
-
-        <TextView
-            android:id="@+id/tv_disagree"
-            android:layout_width="125dp"
-            android:layout_height="40dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="20dp"
-            android:layout_marginBottom="25dp"
-            android:background="@drawable/user_privacy_disagree_background"
-            android:gravity="center"
-            android:text="不同意"
-            android:textColor="@color/platform_color_999999"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/tv_agree"
-            android:layout_width="125dp"
-            android:layout_height="40dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="25dp"
-            android:background="@drawable/user_privacy_agree_background"
-            android:gravity="center"
-            android:text="同意"
-            android:textColor="@color/platform_white"
-            android:textStyle="bold" />
-
-    </RelativeLayout>
-</android.support.v7.widget.CardView>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView 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"
+    android:layout_width="match_parent"
+    android:layout_height="405dp"
+    android:background="#00000000"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    app:cardCornerRadius="15dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/user_img_privacy" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:gravity="center"
+            android:text="用户隐私保护政策"
+            android:textColor="@color/platform_white"
+            android:textSize="21sp" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/tv_disagree"
+            android:layout_below="@+id/title"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="28dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingLeft="23dp"
+                android:paddingRight="23dp">
+
+                <TextView
+                    android:id="@+id/tv_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:lineSpacingExtra="4dp"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="12sp"
+                    tools:text="为响应为为响应为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规，我们在近期更新了《壹点灵隐私政策》文件以确保用户充分理解政策，请您在使用前务必仔细阅读。
+点击下方“同意”按钮即可使用壹点灵提供的服务，使用过程中我们会竭尽全力保护您的隐私安全，未经您的授权，壹点灵不会向任何第三方提供您的信息。" />
+
+                <TextView
+                    android:id="@+id/tv_update_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:gravity="end"
+                    android:textColor="@color/platform_color_444444"
+                    android:textSize="12sp"
+                    tools:text="更新日期：2018年11月11日" />
+            </LinearLayout>
+        </ScrollView>
+
+        <TextView
+            android:id="@+id/tv_disagree"
+            android:layout_width="125dp"
+            android:layout_height="40dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginBottom="25dp"
+            android:background="@drawable/user_user_privacy_disagree_background"
+            android:gravity="center"
+            android:text="不同意"
+            android:textColor="@color/platform_color_999999"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_agree"
+            android:layout_width="125dp"
+            android:layout_height="40dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="25dp"
+            android:background="@drawable/user_user_privacy_agree_background"
+            android:gravity="center"
+            android:text="同意"
+            android:textColor="@color/platform_white"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file

m-user/src/main/res/layout/item_country_phone_code.xml → m-user/src/main/res/layout/user_item_country_phone_code.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="50dp"
-    android:minHeight="50dp"
-    >
-
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerInParent="true"
-        android:drawablePadding="@dimen/platform_default_dis_size_small"
-        android:text="中国"
-        android:textColor="@drawable/country_list_item_select"
-        android:textSize="18dp" />
-
-    <TextView
-        android:id="@+id/tv_code"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerInParent="true"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="end"
-        android:singleLine="true"
-        android:text="+86"
-        android:textColor="@drawable/country_list_item_select"
-        android:textSize="12dp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:layout_alignParentBottom="true"
-        android:background="#F0F0F0" />
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:minHeight="50dp"
+    >
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerInParent="true"
+        android:drawablePadding="@dimen/platform_default_dis_size_small"
+        android:text="中国"
+        android:textColor="@drawable/user_country_list_item_select"
+        android:textSize="18dp" />
+
+    <TextView
+        android:id="@+id/tv_code"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerInParent="true"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:gravity="end"
+        android:singleLine="true"
+        android:text="+86"
+        android:textColor="@drawable/user_country_list_item_select"
+        android:textSize="12dp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_alignParentBottom="true"
+        android:background="#F0F0F0" />
+</RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/phone_code.xml → m-user/src/main/res/layout/user_phone_code.xml

@@ -31,7 +31,7 @@
                 android:layout_height="2dp"
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="4dp"
-                android:background="@color/main_theme_light" />
+                android:background="@color/user_main_theme_light" />
         </LinearLayout>
 
         <LinearLayout

m-user/src/main/res/values-hdpi/dimens.xml

-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!--字体大小部分-->
-    <dimen name="default_text_size_small">12sp</dimen>
-    <dimen name="default_text_size">14sp</dimen>
-    <dimen name="default_text_size_big">16sp</dimen>
-    <dimen name="default_text_size_large">18sp</dimen>
-
-    <!--距离部分-->
-    <dimen name="default_dis_size_micro">4dp</dimen>
-    <dimen name="default_dis_size_small">6dp</dimen>
-    <dimen name="default_dis_size">8dp</dimen>
-    <dimen name="default_dis_size_big">10dp</dimen>
-    <dimen name="default_dis_size_large">12dp</dimen>
-    <dimen name="default_dis_size_huge">14dp</dimen>
-
-    <!--分割线粗细-->
-    <dimen name="divide_line_stroke_width">1px</dimen>
-
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--字体大小部分-->
+    <dimen name="user_default_text_size_small">12sp</dimen>
+    <dimen name="user_default_text_size">14sp</dimen>
+    <dimen name="user_default_text_size_big">16sp</dimen>
+    <dimen name="user_default_text_size_large">18sp</dimen>
+
+    <!--距离部分-->
+    <dimen name="user_default_dis_size_micro">4dp</dimen>
+    <dimen name="user_default_dis_size_small">6dp</dimen>
+    <dimen name="user_default_dis_size">8dp</dimen>
+    <dimen name="user_default_dis_size_big">10dp</dimen>
+    <dimen name="user_default_dis_size_large">12dp</dimen>
+    <dimen name="user_default_dis_size_huge">14dp</dimen>
+
+    <!--分割线粗细-->
+    <dimen name="user_divide_line_stroke_width">1px</dimen>
+
+</resources>

m-user/src/main/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- google color-->
-    <color name="google_yellow">#fdbd00</color>
-
-    <!--app主要颜色-->
-    <color name="white">#ffffff</color>
-    <color name="theme_bg">#FAFAFA</color>
-    <color name="default_text_color">#555555</color>
-    <color name="default_text_color_hint">#333333</color>
-    <color name="divide_color">#EDEDED</color>
-    <color name="place_holder_color">#DDDDDD</color>
-    <color name="transparent">#00FFFFFF</color>
-    <color name="price_color">#EC7100</color>
-    <color name="tag_text">#777777</color>
-    <color name="f5f5f5">#f5f5f5</color>
-
-    <color name="black_deep">#FF000000</color>
-
-<!--最后删除-->
-    <color name="colorTextDefault">#555555</color>
-
-    <!-- main bg color -->
-
-    <!-- session -->
-
-    <!-- image picker -->
-
-    <!-- contact -->
-
-    <!-- setting -->
-    <color name="color_black_ff666666">#ff666666</color>
-    <!--云信　ｅｎｄ-->
-
-    <color name="text_gray">#B6B6B6</color>
-
-
-    <color name="title_bottom_line_bg">#DDDDDD</color>
-
-    <!--动态-->
-    <!--动态顶部title背景变色-->
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- google color-->
+    <color name="user_google_yellow">#fdbd00</color>
+
+    <!--app主要颜色-->
+    <color name="user_white">#ffffff</color>
+    <color name="user_theme_bg">#FAFAFA</color>
+    <color name="user_default_text_color">#555555</color>
+    <color name="user_default_text_color_hint">#333333</color>
+    <color name="user_divide_color">#EDEDED</color>
+    <color name="user_place_holder_color">#DDDDDD</color>
+    <color name="user_transparent">#00FFFFFF</color>
+    <color name="user_price_color">#EC7100</color>
+    <color name="user_tag_text">#777777</color>
+    <color name="user_f5f5f5">#f5f5f5</color>
+
+    <color name="user_black_deep">#FF000000</color>
+
+<!--最后删除-->
+    <color name="user_colorTextDefault">#555555</color>
+
+    <!-- main bg color -->
+
+    <!-- session -->
+
+    <!-- image picker -->
+
+    <!-- contact -->
+
+    <!-- setting -->
+    <color name="user_color_black_ff666666">#ff666666</color>
+    <!--云信　ｅｎｄ-->
+
+    <color name="user_text_gray">#B6B6B6</color>
+
+
+    <color name="user_title_bottom_line_bg">#DDDDDD</color>
+
+    <!--动态-->
+    <!--动态顶部title背景变色-->
+
+</resources>

m-user/src/main/res/values/dimens.xml

-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-
-
-    <!--动态-->
-    <!--顶部title Size-->
-
-    <!-- map -->
-
-    <dimen name="text_size_12">12sp</dimen>
-    <dimen name="text_size_15">15sp</dimen>
-
-
-</resources>
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+
+
+    <!--动态-->
+    <!--顶部title Size-->
+
+    <!-- map -->
+
+    <dimen name="user_text_size_12">12sp</dimen>
+    <dimen name="user_text_size_15">15sp</dimen>
+
+
+</resources>

m-user/src/main/res/values/strings.xml

-<resources>
-    <string name="attend_course_success">报名成功</string>
-    <string name="theme">主题</string>
-    <string name="area">地区</string>
-    <string name="sort">排序</string>
-    <string name="filter">筛选</string>
-    <string name="reset">重置</string>
-    <string name="confirm">确定</string>
-    <string name="no_more">没有更多了</string>
-    <string name="no_search_result">没有符合条件的内容</string>
-    <string name="search_by_category">按主题搜索看看</string>
-    <string name="search_hint">搜索话题、咨询师姓名</string>
-    <string name="need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
-    <string name="user_protocol">用户协议</string>
-    <string name="next_step">下一步</string>
-    <string name="finish">完成</string>
-    <string name="nickname_hint">设置一个昵称，方便大家认识你哦(最多10个字)</string>
-    <string name="please_select_gender">请选择性别</string>
-    <string name="register_success">注册成功</string>
-    <string name="private_safe_hint">设置手势密码，保障安全隐私</string>
-    <string name="gson_parse_error">解析错误</string>
-
-    <!--网络提示模块-->
-    <string name="network_error">请检查网络连接！</string>
-    <string name="timeout">网络超时！</string>
-    <string name="httperror">请求失败</string>
-
-    <!--动态模块-->
-
-    <string name="dialog_loading">加载中…</string>
-    <string name="edittext_hint"></string>
-
-
-</resources>
+<resources>
+    <string name="user_attend_course_success">报名成功</string>
+    <string name="user_theme">主题</string>
+    <string name="user_area">地区</string>
+    <string name="user_sort">排序</string>
+    <string name="user_filter">筛选</string>
+    <string name="user_reset">重置</string>
+    <string name="user_confirm">确定</string>
+    <string name="user_no_more">没有更多了</string>
+    <string name="user_no_search_result">没有符合条件的内容</string>
+    <string name="user_search_by_category">按主题搜索看看</string>
+    <string name="user_search_hint">搜索话题、咨询师姓名</string>
+    <string name="user_need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
+    <string name="user_user_protocol">用户协议</string>
+    <string name="user_next_step">下一步</string>
+    <string name="user_finish">完成</string>
+    <string name="user_nickname_hint">设置一个昵称，方便大家认识你哦(最多10个字)</string>
+    <string name="user_please_select_gender">请选择性别</string>
+    <string name="user_register_success">注册成功</string>
+    <string name="user_private_safe_hint">设置手势密码，保障安全隐私</string>
+    <string name="user_gson_parse_error">解析错误</string>
+
+    <!--网络提示模块-->
+    <string name="user_network_error">请检查网络连接！</string>
+    <string name="user_timeout">网络超时！</string>
+    <string name="user_httperror">请求失败</string>
+
+    <!--动态模块-->
+
+    <string name="user_dialog_loading">加载中…</string>
+    <string name="user_edittext_hint"></string>
+
+
+</resources>

m-user/src/xlzx/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--主题色-->
-    <color name="main_theme">#fdbd00</color>
+    <color name="user_main_theme">#fdbd00</color>
     <!--主题浅色-->
-    <color name="main_theme_light">#FFEC8C</color>
+    <color name="user_main_theme_light">#FFEC8C</color>
     <!--主题亮色-->
-    <color name="main_theme_bright">#fffae0</color>
-    <!--确认按钮背景颜色-->
-    <color name="confirm_bg_color">#FFDD33</color>
-    <!--确认按钮字体颜色-->
-    <color name="confirm_text_color">#242424</color>
-    <!--确认按钮提示字体颜色-->
-    <color name="confirm_text_hint_color">#666666</color>
-    <!--筛选条件选择框字体颜色-->
-    <color name="filter_content_text_color_en">#242424</color>
-    <color name="filter_content_text_color_un">#555555</color>
+    <color name="user_main_theme_bright">#fffae0</color>
 </resources>

m-user/src/ydl/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--主题色-->
-    <color name="main_theme">#1da1f2</color>
+    <color name="user_main_theme">#1da1f2</color>
     <!--主题浅色-->
-    <color name="main_theme_light">#60BDF5</color>
+    <color name="user_main_theme_light">#60BDF5</color>
     <!--主题亮色-->
-    <color name="main_theme_bright">#E8F6FF</color>
-    <!--确认按钮背景颜色-->
-    <color name="confirm_bg_color">#1da1f2</color>
-    <!--确认按钮颜色-->
-    <color name="confirm_text_color">#ffffff</color>
-    <!--确认提示颜色-->
-    <color name="confirm_text_hint_color">#60ffffff</color>
-    <!--筛选条件选择框字体颜色-->
-    <color name="filter_content_text_color_en">#1da1f2</color>
-    <color name="filter_content_text_color_un">#242424</color>
+    <color name="user_main_theme_bright">#E8F6FF</color>
 </resources>

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt

@@ -133,13 +133,13 @@ class HttpConfig {
                 val url = request.url()
                 val newBuilder = url.newBuilder()
 
-                for (i in 0 until url.querySize()) {
-                    //取出url中？后的参数
-                    val key = url.queryParameterName(i)
-                    val value = url.queryParameterValue(i)
-                    newBuilder.
-                        addQueryParameter(key, value)
-                }
+//                for (i in 0 until url.querySize()) {
+//                    //取出url中？后的参数
+//                    val key = url.queryParameterName(i)
+//                    val value = url.queryParameterValue(i)
+//                    newBuilder.
+//                        addQueryParameter(key, value)
+//                }
 
                 newBuilder.
                     addQueryParameter(FFROM, PlatformDataManager.getRam().getChannelName())