提交分类： ui改版,項目混淆；

提交内容：  1、个人注册UI修改
           2、添加uu课堂
           3、AndResGuard资源文件混淆
当前版本：  测试版本6.2.9
是否冲突：  否

WeiChat/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
+apply plugin: 'AndResGuard'
+
 //定义时间
 def releaseTime() {
    // return new Date().format("yyyyMMdd.HHmm.ss")
@@ -145,6 +147,75 @@ android {
     }*/
 }
 
+andResGuard {
+    // mappingFile = file("./resource_mapping.txt")
+    mappingFile = null
+    use7zip = true
+    useSign = true
+    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
+    keepRoot = false
+    whiteList = [
+            // for your icon
+            "R.drawable.uuu",
+            // for fabric
+            "R.string.com.crashlytics.*",
+            // for google-services
+            "R.string.google_app_id",
+            "R.string.gcm_defaultSenderId",
+            "R.string.default_web_client_id",
+            "R.string.ga_trackingId",
+            "R.string.firebase_database_url",
+            "R.string.google_api_key",
+            "R.string.google_crash_reporting_api_key",
+            //for umeng
+            "R.anim.umeng*",
+            "R.string.umeng*",
+            "R.string.UM*",
+            "R.string.tb_*",
+            "R.layout.umeng*",
+            "R.layout.socialize_*",
+            "R.layout.*messager*",
+            "R.layout.tb_*",
+            "R.color.umeng*",
+            "R.color.tb_*",
+            "R.style.*UM*",
+            "R.style.umeng*",
+            "R.drawable.umeng*",
+            "R.drawable.tb_*",
+            "R.drawable.sina*",
+            "R.drawable.qq_*",
+            "R.drawable.tb_*",
+            "R.id.umeng*",
+            "R.id.*messager*",
+            "R.id.progress_bar_parent",
+            "R.id.socialize_*",
+            "R.id.webView",
+            //for jpush
+            "R.drawable.jpush_notification_icon"
+    ]
+    compressFilePattern = [
+            "*.png",
+            "*.jpg",
+            "*.jpeg",
+            "*.gif",
+    ]
+    sevenzip {
+        artifact = 'com.tencent.mm:SevenZip:1.2.13'
+        //path = "/usr/local/bin/7za"
+    }
+
+    /**
+     * 可选： 如果不设置则会默认覆盖assemble输出的apk
+     **/
+    // finalApkBackupPath = "${project.rootDir}/final.apk"
+
+    /**
+     * 可选: 指定v1签名时生成jar文件的摘要算法
+     * 默认值为“SHA-1”
+     **/
+    // digestalg = "SHA-256"
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit

WeiChat/src/main/AndroidManifest.xml

@@ -1029,15 +1029,6 @@
             android:label="在线人脸识别" />
         <activity android:name=".ui.erp.activity.oa.FileLoadingActivity" />
 
-        <activity
-            android:name=".ui.erp.activity.message.PersonalRegActivity"
-            android:label="个人注册">
-            <intent-filter>
-                <action android:name="com.modular.login.PersonalRegActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".ui.me.TemperatureActivity" />
 
         <activity android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/PersonalRegActivity.java

@@ -1,219 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.message;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.alibaba.fastjson.JSON;
-import com.andreabaccega.widget.FormEditText;
-import com.common.LogUtil;
-import com.common.data.CalendarUtil;
-import com.common.data.JSONUtil;
-import com.common.data.StringUtil;
-import com.common.hmac.Md5Util;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
-import com.core.net.http.ViewUtil;
-import com.core.utils.ToastUtil;
-import com.core.utils.time.wheel.DateTimePicker;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 个人用户注册
- * Created by FANGlh on 2017/7/21.
- * function:
- */
-public class PersonalRegActivity extends BaseActivity implements View.OnClickListener {
-    @ViewInject(R.id.phone_et)
-    private FormEditText phone_et;
-    @ViewInject(R.id.password_et)
-    private FormEditText password_et;
-    @ViewInject(R.id.name_et)
-    private FormEditText name_et;
-    @ViewInject(R.id.male_et)
-    private EditText male_et;
-    @ViewInject(R.id.birthday_et)
-    private EditText birthday_et;
-    @ViewInject(R.id.person_sign_et)
-    private EditText person_sign_et;
-    @ViewInject(R.id.register_btn)
-    private Button register_btn;
-    @ViewInject(R.id.to_login_tv)
-    private TextView to_login_tv;
-    private int male_log = 1;
-    private long bir_Timestamp = 1489141231;
-    private String md5_password;
-    private Handler rHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            String result = msg.getData().getString("result");
-            switch (msg.what) {
-                case 0x01:
-                    if (!StringUtil.isEmpty(result)) {
-                        if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1) {
-                            Toast.makeText(ct, "注册成功", Toast.LENGTH_LONG).show();
-                            finish();
-                        } else {
-                            ToastMessage(JSON.parseObject(result).getString("resultMsg"));
-                        }
-                    }
-                    break;
-                case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    if (JSONUtil.validate(result)) {
-                        ToastMessage(JSON.parseObject(result).getString("exceptionInfo"));
-                    } else {
-                        ToastMessage(result);
-                    }
-                    progressDialog.dismiss();
-                    register_btn.setEnabled(true);
-                    break;
-            }
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.personal_reg_activity);
-        getSupportActionBar().hide();
-        ViewUtils.inject(this);
-        initView();
-    }
-
-    private void initView() {
-        male_et.setKeyListener(null);
-        male_et.setFocusable(false);
-        male_et.setOnClickListener(this);
-
-        birthday_et.setKeyListener(null);
-        birthday_et.setFocusable(false);
-        birthday_et.setOnClickListener(this);
-
-        register_btn.setOnClickListener(this);
-        to_login_tv.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.male_et:
-                showSelectSexDialog();
-                break;
-            case R.id.birthday_et:
-                showSelectBirthdayDialog();
-                break;
-            case R.id.register_btn:
-                registerJudge();
-                break;
-            case R.id.to_login_tv:
-                finish();
-                break;
-        }
-
-    }
-
-    private void registerJudge() {
-      /*  if (StringUtil.isEmpty(phone_et.getText().toString())){
-            ToastMessage(getString(R.string.input_phone_number));
-            return;
-        }*/
-
-       /* if (!StringUtil.isEmpty(password_et.getText().toString())){
-            ToastMessage(getString(R.string.please_input_password));
-            return;
-        }
-*/
-       /* if (StringUtil.isEmpty(name_et.getText().toString())){
-            ToastMessage(getString(R.string.input_name));
-            return;
-        }*/
-        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()) {
-            if (!CommonUtil.isNetWorkConnected(this)) {
-                ToastMessage(getString(R.string.common_notlinknet));
-            } else {
-                md5_password = Md5Util.toMD5(password_et.getText().toString());
-                doRegiter();
-            }
-        }
-
-    }
-    private static final String TAG = "PersonalRegActivity";
-    private void doRegiter() {
-        progressDialog.dismiss();
-        String url = Constants.IM_BASE_URL() + "user/appRegister";
-        LogUtil.d(TAG,"url:"+url);
-        Map<String, Object> params = new HashMap<>();
-        params.put("telephone", phone_et.getText().toString());
-        params.put("password", md5_password);
-        params.put("userType", 0);
-        params.put("companyId", 0);
-        params.put("nickname", name_et.getText().toString());
-        params.put("description", "");
-        params.put("sex", male_log);
-        params.put("birthday", bir_Timestamp);
-        LogUtil.prinlnLongMsg("0x01params", "url=" + url + JSON.toJSONString(params));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, params, rHandler, headers, 0x01, null, null, "post");
-    }
-
-    private void showSelectBirthdayDialog() {
-        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
-        picker.setRange(1960, CalendarUtil.getYear());
-        picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
-            @Override
-            public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
-                Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
-                GregorianCalendar calendar = new GregorianCalendar(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day));
-
-                long currentTime = System.currentTimeMillis() / 1000;
-                long birthdayTime = calendar.getTime().getTime() / 1000;
-                if (birthdayTime > currentTime) {
-                    ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
-                } else {
-                    birthday_et.setText(year + "-" + month + "-" + day);
-                    bir_Timestamp = birthdayTime;
-                }
-            }
-        });
-        picker.show();
-
-    }
-
-    private void showSelectSexDialog() {
-        // 1是男，0是女，2是全部
-        String[] sexs = new String[]{getString(R.string.user_body), getString(R.string.user_girl)};
-        int checkItem = 0;
-        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
-                .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == 0) {
-                            male_et.setText(R.string.user_body);
-                            male_log = 1;
-                        } else {
-                            male_et.setText(R.string.user_girl);
-                            male_log = 0;
-                        }
-                        dialog.dismiss();
-                    }
-                }).setCancelable(true).create().show();
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -254,6 +254,10 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     intent.putExtra("url", url);
                     intent.putExtra("p", context.getString(R.string.work_business_find));
                     intent.putExtra("cookie", true);
+                } else if ("ic_work_uu_education".equals(menuIcon)) {
+                    String url = "http://www.i-ronge.com/?referee=uuhl666666";
+                    intent.putExtra("url", url);
+                    intent.putExtra("p", context.getString(R.string.str_work_uu_education));
                 }
                 break;
             case "com.modular.work.CommonDataFormActivity":

WeiChat/src/main/res/layout/item_work_parent_layout.xml

@@ -8,9 +8,9 @@
     android:layout_height="wrap_content"
     app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="6dp"
-    app:cardElevation="3dp"
-    app:cardMaxElevation="3dp"
-    app:cardPreventCornerOverlap="true"
+    app:cardElevation="4dp"
+    app:cardMaxElevation="4dp"
+    app:cardPreventCornerOverlap="false"
     app:cardUseCompatPadding="true">
 
     <LinearLayout

WeiChat/src/main/res/layout/personal_reg_activity.xml

@@ -1,263 +0,0 @@
-<?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"
-    xmlns:whatever="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:background="@drawable/personalreg">
-
-    <TextView
-        android:textSize="18sp"
-        android:textColor="@color/white"
-        android:gravity="center"
-        android:text="@string/person_register"
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"/>
-
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_transparent_btn"
-            >
-
-            <ImageView
-                android:src="@drawable/icon_phone"
-                android:layout_width="30dp"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"/>
-            <View
-                android:layout_gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_width="@dimen/line"
-                android:layout_height="30dp"
-                android:background="@color/white"/>
-            <com.andreabaccega.widget.FormEditText
-                android:id="@+id/phone_et"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:hint="@string/phone_number"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:paddingLeft="50dp"
-                android:textColorHint="@color/white"
-                android:textSize="15sp"
-                android:inputType="number"
-                android:maxLength="11"
-                whatever:customRegexp="^((13[1-9])|(15[^4])|(18[0,2,3,5-9])|(17[0-8])|(147))\\d{8}$"
-                whatever:testErrorString="请输入正确的手机号"
-                />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_transparent_btn"
-            >
-
-            <ImageView
-                android:src="@drawable/icon_password"
-                android:layout_width="30dp"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"/>
-            <View
-                android:layout_gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_width="@dimen/line"
-                android:layout_height="30dp"
-                android:background="@color/white"/>
-            <com.andreabaccega.widget.FormEditText
-                android:id="@+id/password_et"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:hint="@string/rpassword"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:paddingLeft="50dp"
-                android:textColorHint="@color/white"
-                android:textSize="15sp"
-                android:inputType="textPassword"
-                android:maxLength="12"
-                whatever:customRegexp="^[0-9a-zA-Z]{6,12}$"
-                whatever:testErrorString="请输入6-12位密码（仅限数字+字母组合）"
-                />
-        </LinearLayout>
-    <LinearLayout
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/bg_transparent_btn"
-        >
-
-        <ImageView
-            android:src="@drawable/icon_name"
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"/>
-        <View
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:background="@color/white"/>
-        <com.andreabaccega.widget.FormEditText
-            android:id="@+id/name_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:hint="@string/name"
-            android:background="@null"
-            android:gravity="center_vertical"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp"
-            android:maxLength="12"
-            whatever:testType="regexp"
-            whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,12}+$"
-            whatever:testErrorString="姓名只能为12个字符之内的中、英文"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_male" />
-
-        <View
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:background="@color/white" />
-
-        <EditText
-            android:id="@+id/male_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@null"
-            android:drawableRight="@drawable/icon_more"
-            android:gravity="center_vertical"
-            android:hint="@string/user_sex"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_data" />
-
-        <View
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:background="@color/white" />
-
-        <EditText
-            android:id="@+id/birthday_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@null"
-            android:drawableRight="@drawable/icon_more"
-            android:gravity="center_vertical"
-            android:hint="@string/birthday"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_writing" />
-
-        <EditText
-            android:id="@+id/person_sign_et"
-            android:layout_width="match_parent"
-            android:layout_height="65dp"
-            android:background="@null"
-            android:gravity="left|top"
-            android:hint="@string/input_person_sign"
-            android:maxLength="15"
-            android:padding="10dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-    </LinearLayout>
-
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:id="@+id/ly_bottom_submit"
-            style="@style/form_linear_customer"
-            android:background="@null">
-
-            <Button
-                android:id="@+id/register_btn"
-                android:layout_marginTop="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginBottom="10dp"
-                android:padding="10dp"
-                android:textColor="@color/black"
-                android:textSize="@dimen/text_main"
-                android:text="@string/register"
-                android:background="@drawable/bg_white_btn"/>
-
-            <TextView
-                android:id="@+id/to_login_tv"
-                android:padding="5dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/to_login"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-</LinearLayout>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -887,7 +887,7 @@
     <string name="set_about">关于UU互联</string>
     <string name="set_version">当前版本</string>
     <string name="set_login_out">退出登录</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <!--更新版本检测-->
     <string name="update_load">当前版本</string>
     <string name="update_msg">已经是最新版,不需要更新</string>
@@ -1378,7 +1378,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">以后再说</string>
     <string name="fangkui_success">提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -859,7 +859,7 @@
     <string name="set_about">關於UU互聯</string>
     <string name="set_version">當前版本</string>
     <string name="set_login_out">登出</string>
-    <string name="set_language">切換語言</string>
+    <string name="set_language">語言设置</string>
     <!--更新版本检测-->
     <!--  <string name="update_load">当前版本</string>-->
     <string name="update_msg">已經是最新版，不需要更新</string>
@@ -1375,7 +1375,7 @@
     <string name="Rated_UU">為UU評分</string>
     <string name="Rated_notice1">請您為UU評一個分數吧，只需要花費您很少的時間，感謝您的支持!</string>
     <string name="Rated_now">現在去評分</string>
-    <string name="Rated_suggest">問題反饋</string>
+    <string name="Rated_suggest">用戶反饋</string>
     <string name="Rated_next">下次再​​說</string>
     <string name="fangkui_success">提交成功,我們會在第一時間查看您的問題,謝謝您的配合！</string>
     <string name="Uploaded_successfully">上傳成功</string>

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

@@ -1553,7 +1553,7 @@
     <string name="select_client">选择客户</string>
     <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <string name="select_form_phoneablum">从手机相册选择</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
     <string name="Business_license_number">营业执照号</string>
@@ -1573,7 +1573,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>

app_core/common/src/main/assets/work_menu.json

@@ -45,6 +45,16 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_uu_education",
+        "menuIcon": "ic_work_uu_education",
+        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuTag": "local_uu_education",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/assets/work_menu_b2b.json

@@ -26,6 +26,16 @@
         "caller": "",
         "isHide": false
       },
+      {
+        "isLocalMenu": true,
+        "menuName": "charitable",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuTag": "local_charitable_donations",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
       {
         "isLocalMenu": true,
         "menuName": "str_work_invite_register",
@@ -35,6 +45,16 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_uu_education",
+        "menuIcon": "ic_work_uu_education",
+        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuTag": "local_uu_education",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/assets/work_menu_personal.json

@@ -26,6 +26,16 @@
         "caller": "",
         "isHide": false
       },
+      {
+        "isLocalMenu": true,
+        "menuName": "charitable",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuTag": "local_charitable_donations",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
       {
         "isLocalMenu": true,
         "menuName": "str_work_invite_register",
@@ -35,6 +45,16 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_uu_education",
+        "menuIcon": "ic_work_uu_education",
+        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuTag": "local_uu_education",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   }

app_core/common/src/main/java/com/core/base/activity/BaseMVPActivity.java

@@ -3,7 +3,7 @@ package com.core.base.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.base.presenter.BasePresenter;
 import com.core.base.view.BaseView;
 
@@ -14,7 +14,7 @@ import com.core.base.view.BaseView;
  * @date 2017/11/9 14:20
  */
 
-public abstract class BaseMVPActivity<T extends BasePresenter> extends BaseActivity implements BaseView {
+public abstract class BaseMVPActivity<T extends BasePresenter> extends SupportToolBarActivity implements BaseView {
     protected T mPresenter;
 
     @Override

app_core/common/src/main/res/layout/activity_feedback.xml

@@ -138,7 +138,7 @@
                     style="@style/commonButtonStyle"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
-                    android:text="@string/common_save_button" />
+                    android:text="@string/common_submit_button" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

app_core/common/src/main/res/layout/activity_register_select.xml

@@ -1,43 +0,0 @@
-<?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:layout_gravity="center"
-    android:orientation="vertical">
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/iv_head"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="100dp"
-        android:src="@drawable/login_header" />
-    
-    <Button
-        android:id="@+id/company_btn"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_gravity="center"
-        android:layout_marginLeft="20dp"
-        android:layout_centerInParent="true"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_green_btn"
-        android:text="企业注册"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main" />
-
-    <Button
-        android:id="@+id/person_btn"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_below="@+id/company_btn"
-        android:layout_gravity="center"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/bg_bule_btn"
-        android:text="个人注册"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main" />
-</RelativeLayout>

app_core/common/src/main/res/layout/layout_work_plat_set.xml

@@ -6,7 +6,7 @@
     android:background="#e9f0f5"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="18dp">
 
     <TextView
         android:id="@+id/work_plat_set_tv"
@@ -16,11 +16,11 @@
         android:drawableLeft="@drawable/ic_work_panel_set"
         android:drawablePadding="6dp"
         android:gravity="center"
-        android:paddingBottom="8dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="8dp"
-        android:text="工作面板设置"
+        android:paddingBottom="9dp"
+        android:paddingLeft="17dp"
+        android:paddingRight="17dp"
+        android:paddingTop="9dp"
+        android:text="工作模块设置"
         android:textColor="#81A6C1"
         android:textSize="12sp" />
 </LinearLayout>

app_core/common/src/main/res/layout/personal_reg_activity.xml

@@ -1,263 +0,0 @@
-<?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"
-    xmlns:whatever="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:background="@drawable/personalreg">
-
-    <TextView
-        android:textSize="18sp"
-        android:textColor="@color/white"
-        android:gravity="center"
-        android:text="@string/person_register"
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"/>
-
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_transparent_btn"
-            >
-
-            <ImageView
-                android:src="@drawable/icon_phone"
-                android:layout_width="30dp"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"/>
-            <View
-                android:layout_gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_width="@dimen/line"
-                android:layout_height="30dp"
-                android:background="@color/white"/>
-            <com.andreabaccega.widget.FormEditText
-                android:id="@+id/phone_et"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:hint="@string/phone_number"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:paddingLeft="50dp"
-                android:textColorHint="@color/white"
-                android:textSize="15sp"
-                android:inputType="number"
-                android:maxLength="11"
-                whatever:customRegexp="^((13[1-9])|(15[^4])|(18[0,2,3,5-9])|(17[0-8])|(147))\\d{8}$"
-                whatever:testErrorString="请输入正确的手机号"
-                />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/bg_transparent_btn"
-            >
-
-            <ImageView
-                android:src="@drawable/icon_password"
-                android:layout_width="30dp"
-                android:layout_height="35dp"
-                android:layout_marginLeft="5dp"/>
-            <View
-                android:layout_gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_width="@dimen/line"
-                android:layout_height="30dp"
-                android:background="@color/white"/>
-            <com.andreabaccega.widget.FormEditText
-                android:id="@+id/password_et"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:hint="@string/rpassword"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:paddingLeft="50dp"
-                android:textColorHint="@color/white"
-                android:textSize="15sp"
-                android:inputType="textPassword"
-                android:maxLength="12"
-                whatever:customRegexp="^[0-9a-zA-Z]{6,12}$"
-                whatever:testErrorString="请输入6-12位密码（仅限数字+字母组合）"
-                />
-        </LinearLayout>
-    <LinearLayout
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/bg_transparent_btn"
-        >
-
-        <ImageView
-            android:src="@drawable/icon_name"
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"/>
-        <View
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:background="@color/white"/>
-        <com.andreabaccega.widget.FormEditText
-            android:id="@+id/name_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:hint="@string/name"
-            android:background="@null"
-            android:gravity="center_vertical"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp"
-            android:maxLength="12"
-            whatever:testType="regexp"
-            whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,12}+$"
-            whatever:testErrorString="姓名只能为12个字符之内的中、英文"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_male" />
-
-        <View
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:background="@color/white" />
-
-        <EditText
-            android:id="@+id/male_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@null"
-            android:drawableRight="@drawable/icon_more"
-            android:gravity="center_vertical"
-            android:hint="@string/user_sex"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_data" />
-
-        <View
-            android:layout_width="@dimen/line"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="20dp"
-            android:background="@color/white" />
-
-        <EditText
-            android:id="@+id/birthday_et"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@null"
-            android:drawableRight="@drawable/icon_more"
-            android:gravity="center_vertical"
-            android:hint="@string/birthday"
-            android:paddingLeft="50dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_transparent_btn"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:src="@drawable/icon_writing" />
-
-        <EditText
-            android:id="@+id/person_sign_et"
-            android:layout_width="match_parent"
-            android:layout_height="65dp"
-            android:background="@null"
-            android:gravity="left|top"
-            android:hint="@string/input_person_sign"
-            android:maxLength="15"
-            android:padding="10dp"
-            android:textColorHint="@color/white"
-            android:textSize="15sp" />
-    </LinearLayout>
-
-        <LinearLayout
-            android:layout_marginTop="10dp"
-            android:id="@+id/ly_bottom_submit"
-            style="@style/form_linear_customer"
-            android:background="@null">
-
-            <Button
-                android:id="@+id/register_btn"
-                android:layout_marginTop="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginBottom="10dp"
-                android:padding="10dp"
-                android:textColor="@color/black"
-                android:textSize="@dimen/text_main"
-                android:text="@string/register"
-                android:background="@drawable/bg_white_btn"/>
-
-            <TextView
-                android:id="@+id/to_login_tv"
-                android:padding="5dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/to_login"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-</LinearLayout>

app_core/common/src/main/res/layout/view_empty.xml

@@ -45,13 +45,14 @@
             android:id="@+id/view_empty_gif"
             android:layout_width="110dp"
             android:layout_height="110dp"
+            android:scaleType="fitEnd"
             android:src="@drawable/gif_empty_view" />
 
         <TextView
             android:id="@+id/textViewMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="80dp"
+            android:layout_marginBottom="90dp"
             android:text="数据为空"
             android:textSize="14sp"
             />

app_core/common/src/main/res/layout/view_public_inquiry_empty.xml

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@+id/rl_empty"
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+<RelativeLayout
+    android:id="@+id/rl_empty"
+    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:background="@color/white"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:visibility="gone">
 
         <TextView
-            android:id="@+id/textViewMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_marginTop="16dp"
             android:drawableTop="@drawable/ic_empty"
-            android:gravity="center"
-            android:paddingLeft="26dp"
-            android:paddingRight="26dp"
-            android:text="当前企业没有任何相关询价单，请前往系统维护产品库"
+            android:text="@string/common_list_empty"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/gray_light" />
 
@@ -27,14 +28,34 @@
             android:id="@+id/buttonEmpty"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/textViewMessage"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="16dp"
             android:text="@string/empty_button"
             android:visibility="gone" />
     </RelativeLayout>
 
-    <TextView
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <pl.droidsonroids.gif.GifImageView
+            android:id="@+id/view_empty_gif"
+            android:layout_width="110dp"
+            android:layout_height="110dp"
+            android:scaleType="fitEnd"
+            android:src="@drawable/gif_empty_view" />
+
+        <TextView
+            android:id="@+id/textViewMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="80dp"
+            android:text="当前企业没有任何相关询价单，请前往系统维护产品库"
+            android:textSize="14sp"
+            />
+    </LinearLayout>
 </RelativeLayout>
+

app_core/common/src/main/res/values-en/strings.xml

@@ -1490,6 +1490,7 @@
     <string name="str_work_subscribe_secretary">Appointment Assistant</string>
     <string name="str_work_uu_sports">UU Sport</string>
     <string name="str_work_invite_register">invitation to register</string>
+    <string name="str_work_uu_education">UU education</string>
 
     <string name="str_administrative_office">OA</string>
     <string name="str_work_work_approval">my reviews</string>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1554,6 +1554,7 @@
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
     <string name="str_work_invite_register">邀请注册</string>
+    <string name="str_work_uu_education">UU课堂</string>
 
     <string name="str_administrative_office">行政办公</string>
     <string name="str_work_work_approval">我的审批</string>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1541,6 +1541,7 @@
     <string name="str_work_subscribe_secretary">預約小秘書</string>
     <string name="str_work_uu_sports">UU運動</string>
     <string name="str_work_invite_register">邀請註冊</string>
+    <string name="str_work_uu_education">UU课堂</string>
 
     <string name="str_administrative_office">行政辦公</string>
     <string name="str_work_work_approval">我的審批</string>

app_core/common/src/main/res/values/strings.xml

@@ -1890,6 +1890,7 @@
     <string name="str_work_subscribe_secretary">预约小秘书</string>
     <string name="str_work_uu_sports">UU运动</string>
     <string name="str_work_invite_register">邀请注册</string>
+    <string name="str_work_uu_education">UU课堂</string>
 
     <string name="str_administrative_office">行政办公</string>
     <string name="str_work_work_approval">我的审批</string>

app_core/common/src/main/res/values/styles.xml

@@ -1343,4 +1343,15 @@
         <item name="android:paddingRight">@dimen/commonSettingItemPaddingR</item>
         <item name="android:background">@drawable/selector_me_menu_item_bg</item>
     </style>
+
+    <style name="MainBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:buttonStyle">@android:style/Widget.Button</item>
+        <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
+        <item name="android:listViewStyle">@style/IMListView</item>
+        <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="android:windowDisablePreview">true</item>
+        <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="actionMenuTextColor">#ffffff</item>
+    </style>
 </resources>

app_modular/applogin/src/main/AndroidManifest.xml

@@ -3,18 +3,23 @@
           android:versionCode="111"
           android:versionName="5.8.9">
 
-    <application>
+    <application
+        >
         <!-- 登录模块 -->
         <activity
             android:name=".activity.LoginActivity"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan" />
         <!--注册选择-->
-        <activity android:name=".activity.RegisterSelectActivity"></activity>
+        <activity
+            android:name=".activity.RegisterSelectActivity"
+            android:theme="@style/MainBaseTheme"
+            ></activity>
         <!--个人注册-->
         <activity
             android:name=".activity.PersonalRegActivity"
-            android:label="个人注册"></activity>
+            android:label="个人注册"
+            android:theme="@style/MainBaseTheme"></activity>
 
         <activity
             android:name=".activity.EnterpriseRegisterActivity"
@@ -24,15 +29,20 @@
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity android:name=".activity.EnterpriseCompleteActivity" />
         <activity android:name=".activity.IndustryChooseActivity" />
-        <activity android:name=".activity.ModifyPasswordModeActivity" />
+        <activity android:name=".activity.ModifyPasswordModeActivity"
+                  android:theme="@style/MainBaseTheme"
+            />
         <activity
             android:name=".activity.ModifyPasswordPhoneActivity"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".activity.ModifyPasswordEmailActivity"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".activity.ModifyPasswordEmailVerifyActivity"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
     </application>
 </manifest>

app_modular/applogin/src/main/java/com/modular/login/activity/ModifyPasswordPhoneActivity.java

@@ -165,7 +165,11 @@ public class ModifyPasswordPhoneActivity extends BaseMVPActivity<SimplePresenter
                     ToastUtil.showToast(this, R.string.networks_out);
                 }
             } else {
-                toast("请填写正确的手机号");
+                if (TextUtils.isEmpty(phone)) {
+                    toast("手机号为空");
+                } else {
+                    toast("请填写正确的手机号");
+                }
             }
         } else if (i == R.id.modify_password_phone_confirm_tv) {
             String phone = mPhoneEditText.getText().toString().trim();
@@ -188,7 +192,11 @@ public class ModifyPasswordPhoneActivity extends BaseMVPActivity<SimplePresenter
                     toast("两次输入的密码不一致");
                 }
             } else {
-                toast("请填写正确的手机号");
+                if (TextUtils.isEmpty(phone)) {
+                    toast("手机号为空");
+                } else {
+                    toast("请填写正确的手机号");
+                }
             }
         } else if (i == R.id.modify_password_success_btn) {
             startActivity(LoginActivity.class);

app_modular/applogin/src/main/java/com/modular/login/activity/PersonalRegActivity.java

@@ -4,24 +4,28 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
-import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.hmac.Md5Util;
 import com.common.preferences.PreferenceUtils;
 import com.core.app.Constants;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
+import com.core.widget.ClearEditText;
+import com.core.widget.StrengthView;
 import com.modular.login.R;
 
 import java.util.HashMap;
@@ -31,13 +35,13 @@ import java.util.Map;
 /**
  * 个人用户注册
  */
-public class PersonalRegActivity extends BaseActivity implements View.OnClickListener {
+public class PersonalRegActivity extends SupportToolBarActivity {
+    public static final String REGEXP_MOBILE_CONTINENT = "1[0-9]{10}";
 
-    private FormEditText phone_et;
-    private FormEditText password_et;
-    private FormEditText name_et;
-    private Button register_btn;
-    private TextView to_login_tv;
+    private ClearEditText mUsernameEditText, mPhoneEditText, mPasswordEditText, mPasswordConfirmEditText;
+    private TextView mConfirmButton, mSuccessButton;
+    private LinearLayout mPasswordLinearLayout, mPasswordConfirmLinearLayout, mSuccessLinearLayout;
+    private StrengthView mStrengthView;
 
     private int male_log = 1;
     private long bir_Timestamp = 1489141231;
@@ -48,60 +52,151 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.personal_reg_activity);
-        getSupportActionBar().hide();
-        phone_et = (FormEditText) findViewById(R.id.phone_et);
-        password_et = (FormEditText) findViewById(R.id.password_et);
-        name_et = (FormEditText) findViewById(R.id.name_et);
-        register_btn = (Button) findViewById(R.id.register_btn);
-        to_login_tv = (TextView) findViewById(R.id.to_login_tv);
+        getSupportActionBar().setTitle(getString(R.string.person_register));
+
         initView();
     }
 
     private void initView() {
-        register_btn.setOnClickListener(this);
-        to_login_tv.setOnClickListener(this);
+        mUsernameEditText = findViewById(R.id.personal_reg_username_et);
+        mPhoneEditText = findViewById(R.id.personal_reg_phone_et);
+        mPasswordEditText = findViewById(R.id.personal_reg_password_et);
+        mPasswordConfirmEditText = findViewById(R.id.personal_reg_password_confirm_et);
+        mConfirmButton = findViewById(R.id.personal_reg_confirm_tv);
+        mPasswordLinearLayout = findViewById(R.id.personal_reg_password_ll);
+        mPasswordLinearLayout.setEnabled(false);
+        mPasswordConfirmLinearLayout = findViewById(R.id.personal_reg_password_confirm_ll);
+        mPasswordConfirmLinearLayout.setEnabled(false);
+        mStrengthView = findViewById(R.id.personal_reg_strength_sv);
+        mSuccessLinearLayout = findViewById(R.id.personal_reg_success_ll);
+        mSuccessButton = findViewById(R.id.personal_reg_success_btn);
+
+        mPhoneEditText.addTextChangedListener(new EnableTextWatcher());
+        mUsernameEditText.addTextChangedListener(new EnableTextWatcher());
+        mPasswordConfirmEditText.addTextChangedListener(new EnableTextWatcher());
+        mPasswordEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                StrengthView.Level passwordLevel = checkPasswordLevel(editable.toString());
+                if (passwordLevel == StrengthView.Level.STRENGTH_NONE) {
+                    mStrengthView.setVisibility(View.GONE);
+                } else {
+                    mStrengthView.setVisibility(View.VISIBLE);
+                    mStrengthView.setLevel(passwordLevel);
+                    if (passwordLevel == StrengthView.Level.STRENGTH_WEAK) {
+                        mConfirmButton.setEnabled(false);
+                    } else {
+                        isConfirmEnable();
+                    }
+                }
+            }
+        });
+
+        mConfirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String phone = mPhoneEditText.getText().toString().trim();
+                if (!TextUtils.isEmpty(phone) && phone.matches(REGEXP_MOBILE_CONTINENT)) {
+                    String password1 = mPasswordEditText.getText().toString();
+                    String password2 = mPasswordConfirmEditText.getText().toString();
+                    if (password1 != null && password1.equals(password2)) {
+                        registerJudge();
+                    } else {
+                        toast("两次输入的密码不一致");
+                    }
+                } else {
+                    if (TextUtils.isEmpty(phone)) {
+                        toast("手机号为空");
+                    } else {
+                        toast("请填写正确的手机号");
+                    }
+                }
+            }
+        });
+
+        mSuccessButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent();
+                intent.setClass(PersonalRegActivity.this, LoginActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.male_et) {
-            //showSelectSexDialog();
+    class EnableTextWatcher implements TextWatcher {
 
-        } else if (i == R.id.birthday_et) {
-            // showSelectBirthdayDialog();
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
 
-        } else if (i == R.id.register_btn) {
-            registerJudge();
+        }
 
-        } else if (i == R.id.to_login_tv) {
-            finish();
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
 
         }
 
+        @Override
+        public void afterTextChanged(Editable editable) {
+            isConfirmEnable();
+        }
     }
 
-    private void registerJudge() {
-        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()) {
-            if (!NetUtils.isNetWorkConnected(this)) {
-                ToastMessage(getString(R.string.common_notlinknet));
-            } else {
-                md5_password = Md5Util.toMD5(password_et.getText().toString());
-                doRegiter();
-            }
+    private void isConfirmEnable() {
+        String phone = mPhoneEditText.getText().toString().trim();
+        String username = mUsernameEditText.getText().toString().trim();
+        String password1 = mPasswordEditText.getText().toString();
+        String password2 = mPasswordConfirmEditText.getText().toString();
+
+        if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(username)) {
+            mPasswordLinearLayout.setEnabled(false);
+            mPasswordEditText.setEnabled(false);
+            mPasswordConfirmLinearLayout.setEnabled(false);
+            mPasswordConfirmEditText.setEnabled(false);
+        } else {
+            mPasswordLinearLayout.setEnabled(true);
+            mPasswordEditText.setEnabled(true);
+            mPasswordConfirmLinearLayout.setEnabled(true);
+            mPasswordConfirmEditText.setEnabled(true);
         }
 
+        if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(username) || TextUtils.isEmpty(password1) || TextUtils.isEmpty(password2)) {
+            mConfirmButton.setEnabled(false);
+        } else {
+            mConfirmButton.setEnabled(true);
+        }
+    }
+
+    private void registerJudge() {
+        if (!NetUtils.isNetWorkConnected(this)) {
+            ToastMessage(getString(R.string.common_notlinknet));
+        } else {
+            md5_password = Md5Util.toMD5(mPasswordEditText.getText().toString());
+            doRegiter();
+        }
     }
 
     private void doRegiter() {
         progressDialog.dismiss();
         String url = Constants.IM_BASE_URL() + "user/appRegister";
         Map<String, Object> params = new HashMap<>();
-        params.put("telephone", phone_et.getText().toString());
+        params.put("telephone", mPhoneEditText.getText().toString());
         params.put("password", md5_password);
         params.put("userType", 0);
         params.put("companyId", 0);
-        params.put("nickname", name_et.getText().toString());
+        params.put("nickname", mUsernameEditText.getText().toString());
         params.put("description", "");
         params.put("sex", male_log);
         params.put("birthday", bir_Timestamp);
@@ -159,19 +254,15 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
         @Override
         public void handleMessage(Message msg) {
             String result = msg.getData().getString("result");
-            Log.i("fanglh",result);
+            Log.i("fanglh", result);
             switch (msg.what) {
                 case 0x01:
                     if (!StringUtil.isEmpty(result)) {
                         if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1) {
                             Toast.makeText(ct, "注册成功", Toast.LENGTH_LONG).show();
-                            PreferenceUtils.putString(PersonalRegActivity.this, LoginActivity.PASS_WORDS, password_et.getText().toString().trim());
-                            CommonUtil.setSharedPreferences(PersonalRegActivity.this, "user_phone", phone_et.getText().toString().trim());
-                            Intent intent = new Intent();
-                            intent.setClass(PersonalRegActivity.this, LoginActivity.class);
-                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            startActivity(intent);
-                            finish();
+                            PreferenceUtils.putString(PersonalRegActivity.this, LoginActivity.PASS_WORDS, mPasswordEditText.getText().toString().trim());
+                            CommonUtil.setSharedPreferences(PersonalRegActivity.this, "user_phone", mPhoneEditText.getText().toString().trim());
+                            mSuccessLinearLayout.setVisibility(View.VISIBLE);
                         } else {
                             ToastMessage(JSON.parseObject(result).getString("resultMsg"));
                         }
@@ -184,9 +275,23 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
                         ToastMessage(result);
                     }
                     progressDialog.dismiss();
-                    register_btn.setEnabled(true);
+                    mConfirmButton.setEnabled(true);
                     break;
             }
         }
     };
+
+    public static StrengthView.Level checkPasswordLevel(String password) {
+        String strongRegex = "^(?=.{8,20})(((?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]))|((?=.*[0-9])((?=.*[a-zA-Z]))(?=.*[^a-zA-Z0-9]))).*$";
+        String mediumRegex = "^(?=.{8,20})(((?=.*[0-9])(?=.*[a-z]))|((?=.*[0-9])(?=.*[A-Z]))).*$";
+        if (TextUtils.isEmpty(password)) {
+            return StrengthView.Level.STRENGTH_NONE;
+        } else if (password.matches(strongRegex)) {
+            return StrengthView.Level.STRENGTH_STRONG;
+        } else if (password.matches(mediumRegex)) {
+            return StrengthView.Level.STRENGTH_MEDIUM;
+        } else {
+            return StrengthView.Level.STRENGTH_WEAK;
+        }
+    }
 }

app_modular/applogin/src/main/java/com/modular/login/activity/RegisterSelectActivity.java

@@ -5,13 +5,13 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.core.app.Constants;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.IntentUtils;
 import com.modular.login.R;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
-public class RegisterSelectActivity extends BaseActivity implements View.OnClickListener {
+public class RegisterSelectActivity extends SupportToolBarActivity implements View.OnClickListener {
     private CircleImageView ivHead;
 
     @Override

app_modular/applogin/src/main/res/layout/activity_modify_password_phone.xml

@@ -31,7 +31,7 @@
                 <com.core.widget.ClearEditText
                     android:id="@+id/modify_password_phone_mobile_et"
                     style="@style/register_edittext_style"
-                    android:hint="手机号"
+                    android:hint="@string/phone_number"
                     android:inputType="number"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
@@ -57,7 +57,7 @@
                     style="@style/register_edittext_style"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:hint="短信验证码"
+                    android:hint="@string/phone_pin_code"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:textColor="@color/black" />
@@ -81,7 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="*密码须为8-20字符的英文、数字混合"
+                android:text="@string/str_password_points"
                 android:textColor="@color/red"
                 android:textSize="12sp" />
 

app_modular/applogin/src/main/res/layout/activity_register_select.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:layout_gravity="center"
+              android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/person_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/ic_personal_register" />
+
+        <TextView
+            style="@style/register_edittext_style"
+            android:layout_height="48dp"
+            android:drawableRight="@drawable/oa_next"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:text="@string/person_register"
+            android:textColor="@color/black" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
+
+    <LinearLayout
+        android:id="@+id/company_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/ic_enterprise_register" />
+
+        <TextView
+            style="@style/register_edittext_style"
+            android:layout_height="48dp"
+            android:drawableRight="@drawable/oa_next"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:text="@string/str_enterprise_register"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
+</LinearLayout>

app_modular/applogin/src/main/res/layout/personal_reg_activity.xml

@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="20dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="@drawable/shape_gray_slight_corner_white_bg"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/ic_personal_register" />
+
+                <com.core.widget.ClearEditText
+                    android:id="@+id/personal_reg_username_et"
+                    style="@style/register_edittext_style"
+                    android:hint="用户名"
+                    android:inputType="number"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/shape_gray_slight_corner_white_bg"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/ic_modify_phone" />
+
+                <com.core.widget.ClearEditText
+                    android:id="@+id/personal_reg_phone_et"
+                    style="@style/register_edittext_style"
+                    android:hint="手机号"
+                    android:inputType="number"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="*密码须为8-20字符的英文、数字混合"
+                android:textColor="@color/red"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:id="@+id/personal_reg_password_ll"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="4dp"
+                android:background="@drawable/selector_edittext_bg"
+                android:enabled="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/ic_password_reset" />
+
+                <com.core.widget.ClearEditText
+                    android:id="@+id/personal_reg_password_et"
+                    style="@style/register_edittext_style"
+                    android:enabled="false"
+                    android:hint="密码"
+                    android:inputType="textPassword"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <com.core.widget.StrengthView
+                android:id="@+id/personal_reg_strength_sv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="10dp"
+                android:paddingLeft="10dp"
+                android:paddingTop="10dp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/personal_reg_password_confirm_ll"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/selector_edittext_bg"
+                android:enabled="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/ic_password_reset" />
+
+                <com.core.widget.ClearEditText
+                    android:id="@+id/personal_reg_password_confirm_et"
+                    style="@style/register_edittext_style"
+                    android:enabled="false"
+                    android:hint="确认密码"
+                    android:inputType="textPassword"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/personal_reg_confirm_tv"
+                style="@style/commonButtonStyle"
+                android:layout_marginTop="20dp"
+                android:enabled="false"
+                android:text="@string/app_dialog_ok"
+                />
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/personal_reg_success_ll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
+            android:src="@drawable/ic_modify_password_success" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="个人注册成功！"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="*请妥善保管好自己的密码，保障自身利益" />
+
+
+        <TextView
+            android:id="@+id/personal_reg_success_btn"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:layout_margin="30dp"
+            android:background="@drawable/selector_confirm_bg"
+            android:gravity="center"
+            android:text="@string/complete"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+</FrameLayout>
+
+<!--
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              xmlns:whatever="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical"
+              android:background="@drawable/personalreg">
+
+<TextView
+    android:textSize="18sp"
+    android:textColor="@color/white"
+    android:gravity="center"
+    android:text="@string/person_register"
+    android:layout_marginTop="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="35dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp" />
+
+<LinearLayout
+    android:layout_marginTop="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:background="@drawable/bg_transparent_btn"
+    >
+
+    <ImageView
+        android:src="@drawable/icon_phone"
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp" />
+
+    <View
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_width="@dimen/line"
+        android:layout_height="30dp"
+        android:background="@color/white" />
+
+    <com.andreabaccega.widget.FormEditText
+        android:id="@+id/phone_et"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:hint="@string/phone_number"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:paddingLeft="50dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp"
+        android:inputType="number"
+        android:maxLength="11"
+        whatever:customRegexp="^((13[1-9])|(15[^4])|(18[0,2,3,5-9])|(17[0-8])|(147))\\d{8}$"
+        whatever:testErrorString="请输入正确的手机号"
+        />
+</LinearLayout>
+
+<LinearLayout
+    android:layout_marginTop="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:background="@drawable/bg_transparent_btn"
+    >
+
+    <ImageView
+        android:src="@drawable/icon_password"
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp" />
+
+    <View
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_width="@dimen/line"
+        android:layout_height="30dp"
+        android:background="@color/white" />
+
+    <com.andreabaccega.widget.FormEditText
+        android:id="@+id/password_et"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:hint="@string/rpassword"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:paddingLeft="50dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp"
+        android:inputType="textPassword"
+        android:maxLength="12"
+        whatever:customRegexp="^[0-9a-zA-Z]{6,12}$"
+        whatever:testErrorString="请输入6-12位密码（仅限数字+字母组合）"
+        />
+</LinearLayout>
+
+<LinearLayout
+    android:layout_marginTop="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:background="@drawable/bg_transparent_btn"
+    >
+
+    <ImageView
+        android:src="@drawable/icon_name"
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp" />
+
+    <View
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_width="@dimen/line"
+        android:layout_height="30dp"
+        android:background="@color/white" />
+
+    <com.andreabaccega.widget.FormEditText
+        android:id="@+id/name_et"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:hint="@string/name"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:paddingLeft="50dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp"
+        android:maxLength="12"
+        whatever:testType="regexp"
+        whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,12}+$"
+        whatever:testErrorString="姓名只能为12个字符之内的中、英文"
+        />
+</LinearLayout>
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginTop="10dp"
+    android:background="@drawable/bg_transparent_btn"
+    android:orientation="horizontal"
+    android:visibility="gone">
+
+    <ImageView
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp"
+        android:src="@drawable/icon_male" />
+
+    <View
+        android:layout_width="@dimen/line"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:background="@color/white" />
+
+    <EditText
+        android:id="@+id/male_et"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@null"
+        android:drawableRight="@drawable/icon_more"
+        android:gravity="center_vertical"
+        android:hint="@string/user_sex"
+        android:paddingLeft="50dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp" />
+
+</LinearLayout>
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginTop="10dp"
+    android:background="@drawable/bg_transparent_btn"
+    android:orientation="horizontal"
+    android:visibility="gone">
+
+    <ImageView
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp"
+        android:src="@drawable/icon_data" />
+
+    <View
+        android:layout_width="@dimen/line"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:background="@color/white" />
+
+    <EditText
+        android:id="@+id/birthday_et"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@null"
+        android:drawableRight="@drawable/icon_more"
+        android:gravity="center_vertical"
+        android:hint="@string/birthday"
+        android:paddingLeft="50dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp" />
+</LinearLayout>
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginTop="10dp"
+    android:background="@drawable/bg_transparent_btn"
+    android:orientation="horizontal"
+    android:visibility="gone">
+
+    <ImageView
+        android:layout_width="30dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="5dp"
+        android:src="@drawable/icon_writing" />
+
+    <EditText
+        android:id="@+id/person_sign_et"
+        android:layout_width="match_parent"
+        android:layout_height="65dp"
+        android:background="@null"
+        android:gravity="left|top"
+        android:hint="@string/input_person_sign"
+        android:maxLength="15"
+        android:padding="10dp"
+        android:textColorHint="@color/white"
+        android:textSize="15sp" />
+</LinearLayout>
+
+<LinearLayout
+    android:layout_marginTop="10dp"
+    android:id="@+id/ly_bottom_submit"
+    style="@style/form_linear_customer"
+    android:background="@null">
+
+    <Button
+        android:id="@+id/register_btn"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginBottom="10dp"
+        android:padding="10dp"
+        android:textColor="@color/black"
+        android:textSize="@dimen/text_main"
+        android:text="@string/register"
+        android:background="@drawable/bg_white_btn" />
+
+    <TextView
+        android:id="@+id/to_login_tv"
+        android:padding="5dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/to_login"
+        android:textColor="@color/yellow" />
+</LinearLayout>
+</LinearLayout>-->

app_modular/applogin/src/main/res/values-en/strings.xml

@@ -7,4 +7,7 @@
     <string name="verify_code_obtaining">验证码获取中...</string>
     <string name="obtain_verify_code_failed">验证码获取失败</string>
     <string name="verify_code_have_sent">验证码已发送，请注意接收</string>
+    <string name="str_enterprise_register">企业注册</string>
+    <string name="phone_pin_code">短信验证码</string>
+    <string name="str_password_points">*密码须为8-20字符的英文、数字混合</string>
 </resources>

app_modular/applogin/src/main/res/values-zh-rCN/strings.xml

@@ -7,4 +7,7 @@
     <string name="verify_code_obtaining">验证码获取中...</string>
     <string name="obtain_verify_code_failed">验证码获取失败</string>
     <string name="verify_code_have_sent">验证码已发送，请注意接收</string>
+    <string name="str_enterprise_register">企业注册</string>
+    <string name="phone_pin_code">短信验证码</string>
+    <string name="str_password_points">*密码须为8-20字符的英文、数字混合</string>
 </resources>

app_modular/applogin/src/main/res/values-zh-rTW/strings.xml

@@ -7,4 +7,7 @@
     <string name="verify_code_obtaining">验证码获取中...</string>
     <string name="obtain_verify_code_failed">验证码获取失败</string>
     <string name="verify_code_have_sent">验证码已发送，请注意接收</string>
+    <string name="str_enterprise_register">企业注册</string>
+    <string name="phone_pin_code">短信验证码</string>
+    <string name="str_password_points">*密码须为8-20字符的英文、数字混合</string>
 </resources>

app_modular/applogin/src/main/res/values/strings.xml

@@ -7,4 +7,7 @@
     <string name="verify_code_obtaining">验证码获取中...</string>
     <string name="obtain_verify_code_failed">验证码获取失败</string>
     <string name="verify_code_have_sent">验证码已发送，请注意接收</string>
+    <string name="str_enterprise_register">企业注册</string>
+    <string name="phone_pin_code">短信验证码</string>
+    <string name="str_password_points">*密码须为8-20字符的英文、数字混合</string>
 </resources>

app_modular/appme/src/main/res/values-en/strings.xml

@@ -1551,7 +1551,7 @@
     <string name="select_client">选择客户</string>
     <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <string name="select_form_phoneablum">从手机相册选择</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
     <string name="Business_license_number">营业执照号</string>
@@ -1571,7 +1571,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>

app_modular/appme/src/main/res/values/strings.xml

@@ -1551,7 +1551,7 @@
     <string name="select_client">选择客户</string>
     <string name="work_business_find">优软商城</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
-    <string name="set_language">切换语言</string>
+    <string name="set_language">语言设置</string>
     <string name="select_form_phoneablum">从手机相册选择</string>
     <string name="please_unput_yourP">请输入您的问题...(400字以内)</string>
     <string name="Business_license_number">营业执照号</string>
@@ -1571,7 +1571,7 @@
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
     <string name="Rated_now">现在去评分</string>
-    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_suggest">用户反馈</string>
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>

app_modular/apputils/src/main/res/layout/common_empty_view.xml

@@ -1,29 +1,31 @@
 <?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="match_parent">
-
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#FFFFFF">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <android.support.v7.widget.AppCompatImageView
+        <pl.droidsonroids.gif.GifImageView
             android:id="@+id/emptyImg"
-            android:layout_width="80dp"
-            android:layout_height="60dp"
-            android:src="@drawable/ic_empty" />
+            android:layout_width="110dp"
+            android:layout_height="110dp"
+            android:scaleType="fitEnd"
+            android:src="@drawable/gif_empty_view" />
 
         <android.support.v7.widget.AppCompatTextView
             android:id="@+id/emptyTv"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="暂无记录"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_main" />
+            android:layout_marginBottom="90dp"
+            android:text="数据为空"
+            android:textSize="14sp"
+            android:textColor="?attr/editTextColor" />
     </LinearLayout>
 
 </RelativeLayout>

app_third/recyclerlibrary/build.gradle

@@ -21,4 +21,5 @@ dependencies {
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.recyclerviewV7
+    compile deps.gif
 }

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/ui/refresh/EmptyRecyclerView.java

@@ -11,11 +11,15 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.module.recyclerlibrary.R;
 
+import java.io.IOException;
+
+import pl.droidsonroids.gif.GifDrawable;
+import pl.droidsonroids.gif.GifImageView;
+
 
 /**
  * Created by Bitlike on 2018/2/28.
@@ -26,7 +30,8 @@ public class EmptyRecyclerView extends FrameLayout {
     private RecyclerView mRecyclerView;
     private int emptyImage;
     private String emptyText;
-
+    private GifDrawable mGifDrawable;
+    private Context mContext;
 
     public EmptyRecyclerView(@NonNull Context context) {
         this(context, null);
@@ -38,6 +43,7 @@ public class EmptyRecyclerView extends FrameLayout {
 
     public EmptyRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        mContext = context;
         mRecyclerView = new RecyclerView(context, attrs, defStyleAttr) {
             @Override
             public void setAdapter(Adapter adapter) {
@@ -59,7 +65,7 @@ public class EmptyRecyclerView extends FrameLayout {
         int emptyView = R.layout.common_empty_view;
         try {
             this.emptyText = array.getString(R.styleable.EmptyRecyclerView_emptyText);
-            this.emptyImage = array.getResourceId(R.styleable.EmptyRecyclerView_emptyImage, R.drawable.ic_list_empty);
+            this.emptyImage = array.getResourceId(R.styleable.EmptyRecyclerView_emptyImage, R.drawable.gif_empty_view);
             emptyView = array.getResourceId(R.styleable.EmptyRecyclerView_emptyLayout, R.layout.common_empty_view);
         } finally {
             array.recycle();
@@ -112,7 +118,7 @@ public class EmptyRecyclerView extends FrameLayout {
     };
 
 
-    private ImageView emptyImg;
+    private GifImageView emptyImg;
     private TextView emptyTv;
 
     private void checkIfEmpty() {
@@ -126,7 +132,12 @@ public class EmptyRecyclerView extends FrameLayout {
                 if (emptyImg == null) {
                     emptyImg = emptyView.findViewById(R.id.emptyImg);
                     if (emptyImage > 0) {
-                        emptyImg.setImageResource(emptyImage);
+                        try {
+                            mGifDrawable = new GifDrawable(mContext.getResources(), emptyImage);
+                            emptyImg.setImageDrawable(mGifDrawable);
+                        } catch (IOException e) {
+                            emptyImg.setImageResource(emptyImage);
+                        }
                     }
                 }
                 if (emptyTv == null) {

app_third/recyclerlibrary/src/main/res/layout/common_empty_view.xml

@@ -1,27 +1,30 @@
 <?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="match_parent">
-
+    android:layout_height="match_parent"
+    android:background="#FFFFFF">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <android.support.v7.widget.AppCompatImageView
+        <pl.droidsonroids.gif.GifImageView
             android:id="@+id/emptyImg"
-            android:layout_width="80dp"
-            android:layout_height="60dp"
-            android:src="@drawable/ic_list_empty" />
+            android:layout_width="110dp"
+            android:layout_height="110dp"
+            android:scaleType="fitEnd"
+            android:src="@drawable/gif_empty_view" />
 
         <android.support.v7.widget.AppCompatTextView
             android:id="@+id/emptyTv"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="暂无记录"
+            android:layout_marginBottom="90dp"
+            android:text="数据为空"
+            android:textSize="14sp"
             android:textColor="?attr/editTextColor" />
     </LinearLayout>
 

build.gradle

@@ -11,6 +11,7 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'me.tatarka:gradle-retrolambda:3.2.2'
+        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.13'
     }
 }