添加集成web组件

gradle.properties

@@ -20,6 +20,7 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 # 这个值一般跟你的AndroidStudio版本号一致
 localGradlePluginVersion=3.0.1
+android.enableAapt2=false
 
 # 每次更改“isModule”的值后，需要点击 "Sync Project" 按钮
 # isModule是“集成开发模式”和“组件开发模式”的切换开关

lib_common/build.gradle

@@ -63,6 +63,7 @@ dependencies {
     api deps.utils
     api deps.glide
     api deps.themvp
+    api deps.grpc
 
     //view
     api deps.photo_view
@@ -71,6 +72,7 @@ dependencies {
     api deps.logger
     api deps.toasty
     api deps.agentweb
+    api deps.circleimageview
 
     //router
     api deps.arouter_api

lib_widget/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.arison.com.lib_widget">
+    package="com.uas.module.widget">
 
     <application>
         <activity android:name="com.uas.module.widget.activity.BaseWebActivity">

lib_widget/src/main/java/com/uas/module/widget/activity/BaseWebActivity.java

@@ -21,8 +21,8 @@ import com.just.agentweb.AgentWeb;
 import com.just.agentweb.DefaultWebClient;
 import com.just.agentweb.WebChromeClient;
 import com.just.agentweb.WebViewClient;
+import com.uas.module.widget.R;
 
-import app.arison.com.lib_widget.R;
 
 public class BaseWebActivity extends AppCompatActivity {
 

lib_widget/src/main/java/com/uas/module/widget/activity/UASWebActivity.java

@@ -7,7 +7,6 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -25,9 +24,9 @@ import com.just.agentweb.AgentWeb;
 import com.just.agentweb.DefaultWebClient;
 import com.just.agentweb.WebChromeClient;
 import com.just.agentweb.WebViewClient;
+import com.uas.module.common.base.BaseActionBarActivity;
 import com.uas.module.common.utils.StringUtils;
-
-import app.arison.com.lib_widget.R;
+import com.uas.module.widget.R;
 
 
 /**
@@ -37,7 +36,7 @@ import app.arison.com.lib_widget.R;
  * @author：Arison on 2019/5/5
  */
 @Route(path = "/app/uas_web")
-public class UASWebActivity extends AppCompatActivity {
+public class UASWebActivity extends BaseActionBarActivity {
 
     @Autowired(name = "url")
     String url;
@@ -50,6 +49,11 @@ public class UASWebActivity extends AppCompatActivity {
     private AlertDialog mAlertDialog;
 
 
+    @Override
+    protected int setTitleId() {
+        return 0;
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -61,8 +65,10 @@ public class UASWebActivity extends AppCompatActivity {
         mToolbar = (Toolbar) this.findViewById(R.id.toolbar);
         mToolbar.setTitleTextColor(Color.WHITE);
         mToolbar.setTitle("");
+        
         mTitleTextView = (TextView) this.findViewById(R.id.toolbar_title);
         this.setSupportActionBar(mToolbar);
+        this.getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back);
         if (getSupportActionBar() != null) {
             // Enable the Up button
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);

lib_widget/src/main/java/com/uas/module/widget/core/ClearEditText.java

@@ -0,0 +1,163 @@
+package com.uas.module.widget.core;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v7.widget.AppCompatEditText;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnFocusChangeListener;
+import android.view.animation.Animation;
+import android.view.animation.CycleInterpolator;
+import android.view.animation.TranslateAnimation;
+
+import com.uas.module.widget.R;
+
+
+public class ClearEditText extends AppCompatEditText implements OnFocusChangeListener, TextWatcher {
+	/**
+	 * 删除按钮的引用
+	 */
+	private Drawable mClearDrawable;
+	private boolean mFocusClear = false;
+
+	public ClearEditText(Context context) {
+		this(context, null);
+	}
+
+	public ClearEditText(Context context, AttributeSet attrs) {
+		this(context, attrs, android.R.attr.editTextStyle);
+	}
+
+	public ClearEditText(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		init();
+	}
+
+	private void init() {
+		// 获取EditText的DrawableRight,假如没有设置我们就使用默认的图片
+		mClearDrawable = getCompoundDrawables()[2];
+		if (mClearDrawable == null) {
+			mClearDrawable = getResources().getDrawable(R.drawable.search_clear);
+		}
+		mClearDrawable.setBounds(0, 0, mClearDrawable.getIntrinsicWidth(), mClearDrawable.getIntrinsicHeight());
+		setClearIconVisible(false);
+		setOnFocusChangeListener(this);
+		addTextChangedListener(this);
+	}
+
+	/**
+	 * 因为我们不能直接给EditText设置点击事件，所以我们用记住我们按下的位置来模拟点击事件 当我们按下的位置 在 EditText的宽度 - 图标到控件右边的间距 - 图标的宽度 和 EditText的宽度 - 图标到控件右边的间距之间我们就算点击了图标，竖直方向没有考虑
+	 */
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		int action = MotionEventCompat.getActionMasked(event);
+		if (action == MotionEvent.ACTION_DOWN) {
+			if (!TextUtils.isEmpty(getError())) {
+				setError(null, null);
+				setClearIconVisible(getText().length() > 0);
+				return false;
+			}
+		}
+
+		if (getCompoundDrawables()[2] != null) {
+			if (event.getAction() == MotionEvent.ACTION_UP) {
+				boolean touchable = event.getX() > (getWidth() - getPaddingRight() - mClearDrawable.getIntrinsicWidth())
+						&& (event.getX() < ((getWidth() - getPaddingRight())));
+				if (touchable) {
+					this.setText("");
+				}
+			}
+		}
+
+		return super.onTouchEvent(event);
+	}
+
+	/**
+	 * 当ClearEditText焦点发生变化的时候，判断里面字符串长度设置清除图标的显示与隐藏
+	 */
+	@Override
+	public void onFocusChange(View v, boolean hasFocus) {
+		if (mFocusClear) {
+			if (hasFocus) {
+				setClearIconVisible(getText().length() > 0);
+			} else {
+				setClearIconVisible(false);
+			}
+		}
+	}
+
+	/**
+	 * 当焦点改变的时候，显示或者隐藏Clear icon
+	 */
+	public void setFocusClear(boolean focusClear) {
+		mFocusClear = focusClear;
+	}
+
+	/**
+	 * 设置清除图标的显示与隐藏，调用setCompoundDrawables为EditText绘制上去
+	 * 
+	 * @param visible
+	 */
+	protected void setClearIconVisible(boolean visible) {
+		if (visible) {
+			if (!TextUtils.isEmpty(getError())) {
+				setError(null);
+			}
+		}
+		if (visible) {
+			if (mFocusClear && !hasFocus()) {
+				visible = false;
+			}
+		}
+		Drawable right = visible ? mClearDrawable : null;
+		if (getCompoundDrawables()[2] != right) {
+			setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], null, getCompoundDrawables()[3]);
+		}
+		setCompoundDrawables(getCompoundDrawables()[0], getCompoundDrawables()[1], right, getCompoundDrawables()[3]);
+	}
+
+	/**
+	 * 当输入框里面内容发生变化的时候回调的方法
+	 */
+	@Override
+	public void onTextChanged(CharSequence s, int start, int count, int after) {
+		setClearIconVisible(s.length() > 0);
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+
+	}
+
+	/**
+	 * 设置晃动动画
+	 */
+	public void setShakeAnimation() {
+		this.setAnimation(shakeAnimation(5));
+	}
+
+	/**
+	 * 晃动动画
+	 * 
+	 * @param counts
+	 *            1秒钟晃动多少下
+	 * @return
+	 */
+	public static Animation shakeAnimation(int counts) {
+		Animation translateAnimation = new TranslateAnimation(0, 10, 0, 0);
+		translateAnimation.setInterpolator(new CycleInterpolator(counts));
+		translateAnimation.setDuration(1000);
+		return translateAnimation;
+	}
+
+}

lib_widget/src/test/java/app/arison/com/lib_widget/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package app.arison.com.lib_widget;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

module_app/build.gradle

@@ -93,6 +93,6 @@ dependencies {
         implementation project(':module_main')
         implementation project(':module_girls')
         implementation project(':module_news')
-        implementation project(':module_test')
+        implementation project(':module_home')
     }
 }

module_test/build.gradle → module_home/build.gradle

@@ -4,17 +4,13 @@ if (isModule.toBoolean()) {
     apply plugin: 'com.android.library'
 }
 
-
 android {
     compileSdkVersion build_versions.target_sdk
-//    buildToolsVersion "28.0.2"
-
     defaultConfig {
         minSdkVersion build_versions.min_sdk
         targetSdkVersion build_versions.target_sdk
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [moduleName: project.getName()]
@@ -52,8 +48,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor deps.arouter_compiler
-    implementation deps.grpc
-    implementation deps.constraint_layout
     implementation project(':lib_common')
-
+  
+compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }

module_test/src/main/AndroidManifest.xml → module_home/src/main/AndroidManifest.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.module.test">
-  
+    package="com.uas.module.home">
+
     <application android:theme="@style/AppTheme">
         <activity
             android:name=".main.TestMainActivity"
             android:label="@string/title_activity_test_main"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.LoginActivity"></activity>
+        <activity android:name=".ui.LoginActivity" />
+        <activity android:name=".ui.RegisterActivity" />
+        <activity android:name=".ui.SettingActivity" />
+        <activity android:name=".main.IndexActivity"></activity>
     </application>
 
 </manifest>

module_test/src/main/java/com/uas/module/test/MyDelegate.java → module_home/src/main/java/com/uas/module/home/MyDelegate.java

@@ -1,4 +1,4 @@
-package com.uas.module.test;
+package com.uas.module.home;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.uas.module.common.base.IApplicationDelegate;

module_home/src/main/java/com/uas/module/home/main/IndexActivity.java

@@ -0,0 +1,17 @@
+package com.uas.module.home.main;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.uas.module.home.R;
+
+@Route(path = "/home/main")
+public class IndexActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_index);
+    }
+}

module_test/src/main/java/com/uas/module/test/main/TestMainActivity.java → module_home/src/main/java/com/uas/module/home/main/TestMainActivity.java

@@ -1,4 +1,4 @@
-package com.uas.module.test.main;
+package com.uas.module.home.main;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -9,9 +9,9 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.LogUtils;
 import com.just.agentweb.AgentWeb;
-import com.uas.module.test.R;
-import com.uas.module.test.network.grpc.Authentication;
-import com.uas.module.test.network.grpc.MobileClientAuthenticationInterceptor;
+import com.uas.module.home.R;
+import com.uas.module.home.network.grpc.Authentication;
+import com.uas.module.home.network.grpc.MobileClientAuthenticationInterceptor;
 import com.usoftchina.uu.mobile.grpc.api.AccountInfo;
 import com.usoftchina.uu.mobile.grpc.api.AccountServiceGrpc;
 import com.usoftchina.uu.mobile.grpc.api.AccountSigninRequest;
@@ -40,7 +40,7 @@ import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
 
 
-@Route(path = "/test/index")
+@Route(path = "/home/index")
 public class TestMainActivity extends AppCompatActivity {
     
     //10.1.81.83

module_test/src/main/java/com/uas/module/test/network/grpc/Authentication.java → module_home/src/main/java/com/uas/module/home/network/grpc/Authentication.java

@@ -1,4 +1,4 @@
-package com.uas.module.test.network.grpc;
+package com.uas.module.home.network.grpc;
 
 public class Authentication {
     private static String authentication;

module_test/src/main/java/com/uas/module/test/network/grpc/MobileClientAuthenticationInterceptor.java → module_home/src/main/java/com/uas/module/home/network/grpc/MobileClientAuthenticationInterceptor.java

@@ -1,4 +1,4 @@
-package com.uas.module.test.network.grpc;
+package com.uas.module.home.network.grpc;
 
 import io.grpc.*;
 public class MobileClientAuthenticationInterceptor implements ClientInterceptor {

module_test/src/main/java/com/uas/module/test/ui/LoginActivity.java → module_home/src/main/java/com/uas/module/home/ui/LoginActivity.java

@@ -1,7 +1,10 @@
-package com.uas.module.test.ui;
+package com.uas.module.home.ui;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.kymjs.themvp.presenter.ActivityPresenter;
 
+
+@Route(path = "/home/login")
 public class LoginActivity extends ActivityPresenter<LoginDelegate> {
 
     

module_test/src/main/java/com/uas/module/test/ui/LoginDelegate.java → module_home/src/main/java/com/uas/module/home/ui/LoginDelegate.java

@@ -1,7 +1,7 @@
-package com.uas.module.test.ui;
+package com.uas.module.home.ui;
 
 import com.kymjs.themvp.view.AppDelegate;
-import com.uas.module.test.R;
+import com.uas.module.home.R;
 
 
 public class LoginDelegate extends AppDelegate {

module_home/src/main/java/com/uas/module/home/ui/RegisterActivity.java

@@ -0,0 +1,19 @@
+package com.uas.module.home.ui;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.uas.module.home.R;
+
+
+@Route(path = "/home/register")
+public class RegisterActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_register);
+       
+    }
+}

module_home/src/main/java/com/uas/module/home/ui/SettingActivity.java

@@ -0,0 +1,18 @@
+package com.uas.module.home.ui;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.uas.module.home.R;
+
+@Route(path = "/home/setting")
+public class SettingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+    }
+}

module_test/src/main/java/debug/LauncherActivity.java → module_home/src/main/java/debug/LauncherActivity.java

@@ -4,7 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import com.uas.module.test.R;
+import com.uas.module.home.R;
 
 /**
  * Created by Arison on 2019/3/27.

module_test/src/main/module/AndroidManifest.xml → module_home/src/main/module/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.module.test">
+    package="com.uas.module.home">
     
     <application
         android:name="debug.TestApplication"

module_home/src/main/res/drawable/oa_next.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="15dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#D4D4D4"
+        android:pathData="M769.79,476.03 L416.48,125.92c-18.85,-18.66 -49.22,-18.53 -67.87,0.32 -18.66,18.82 -18.53,49.22 0.32,67.87l319.46,316.58 -318.18,321.06c-18.66,18.82 -18.53,49.22 0.32,67.87 9.34,9.28 21.57,13.92 33.79,13.92 12.35,0 24.7,-4.74 34.08,-14.21l350.11,-353.31c0.51,-0.51 0.67,-1.25 1.18,-1.79 0.13,-0.13 0.29,-0.16 0.42,-0.29C788.74,525.09 788.64,494.69 769.79,476.03z" />
+</vector>

module_home/src/main/res/drawable/selector_confirm_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_corner_deep_blue_bg" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_corner_shallow_blue_bg" android:state_enabled="true" />
+    <item android:drawable="@drawable/shape_corner_blue_unable_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_corner_shallow_blue_bg" />
+</selector>

module_home/src/main/res/drawable/selector_edittext_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_bg" android:state_selected="true" />
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_bg" android:state_checked="true" />
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_bg" android:state_enabled="true" />
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_unable_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_gray_slight_corner_white_bg" />
+</selector>

module_home/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+    <item android:drawable="@color/me_menu_item_normal"/>
+</selector>

module_home/src/main/res/drawable/shape_corner_blue_unable_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp" />
+    <solid android:color="#8EB2CD" />
+</shape>

module_home/src/main/res/drawable/shape_corner_deep_blue_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp"/>
+    <solid android:color="#2D84C0"/>
+</shape>

module_home/src/main/res/drawable/shape_corner_shallow_blue_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp"/>
+    <solid android:color="#33A2EE"/>
+</shape>

module_home/src/main/res/drawable/shape_edittext_white_cursor.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+    <size android:width="2dp" />
+</shape>

module_home/src/main/res/drawable/shape_gray_slight_corner_white_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#DEDEDE" />
+    <solid android:color="@color/white" />
+</shape>

module_home/src/main/res/drawable/shape_gray_slight_corner_white_unable_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#DEDEDE" />
+    <solid android:color="#F2F2F2" />
+</shape>

module_home/src/main/res/drawable/shape_login_editext.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape
+            android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="#939393" />
+        </shape>
+    </item>
+</layer-list>

module_test/src/main/res/layout/activity_login.xml → module_home/src/main/res/layout/activity_index.xml

@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.uas.module.test.ui.LoginActivity">
+    tools:context="com.uas.module.home.main.IndexActivity">
 
 </android.support.constraint.ConstraintLayout>

module_home/src/main/res/layout/activity_login.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--登录界面-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/ic_login_background"
+    android:fillViewport="true">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:padding="30dp">
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/iv_head"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="20dp"
+                android:layout_marginTop="60dp"
+                android:background="@color/transparent"
+                android:src="@drawable/ic_login_default_header"
+                app:civ_border_color="@color/white"
+                app:civ_border_width="1dp" />
+
+            <LinearLayout
+                android:id="@+id/ll_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/iv_head"
+                android:layout_marginBottom="10dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:background="@drawable/shape_login_editext"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_login_username" />
+
+                    <com.uas.module.widget.core.ClearEditText
+                        android:id="@+id/phone_numer_edit"
+                        style="@style/IMLineEditText"
+                        android:hint="@string/phone_number"
+                        android:inputType="phone"
+                        android:paddingLeft="10dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
+                        android:textCursorDrawable="@drawable/shape_edittext_white_cursor" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/shape_login_editext"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_login_password" />
+
+                    <com.uas.module.widget.core.ClearEditText
+                        android:id="@+id/password_edit"
+                        style="@style/IMLineEditPass"
+                        android:hint="@string/rpassword"
+                        android:paddingLeft="10dp"
+                        android:textColor="@color/white"
+                        android:textColorHint="@color/white"
+                        android:textCursorDrawable="@drawable/shape_edittext_white_cursor" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/login_btn"
+                    style="@style/commonButtonStyle"
+                    android:layout_marginTop="20dp"
+                    android:enabled="false"
+                    android:text="@string/login_button"
+                    />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_findPwd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/ll_content"
+                android:text="@string/login_losspwd"
+                android:textColor="#AADAFB" />
+
+            <TextView
+                android:id="@+id/tv_register"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/ll_content"
+                android:text="@string/login_register"
+                android:textColor="#AADAFB" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <View
+                android:id="@+id/login_toast_head"
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+            <FrameLayout
+                android:id="@+id/login_toast_fl"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </FrameLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+</ScrollView>

module_home/src/main/res/layout/activity_setting.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/oa_bg"
+    android:fillViewport="true"
+    android:scrollbars="none">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+
+     <!--   <RelativeLayout
+            android:id="@+id/language_us_rl"
+            style="@style/commonSettingItem"
+            android:layout_marginTop="12dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="@string/set_language"
+                android:textColor="@color/black"
+                android:textSize="@dimen/commonSettingItemTextSize" />
+
+            <TextView
+                android:id="@+id/tv_language_new"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:background="@drawable/hongdian"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip" />
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>-->
+        <TextView
+            android:id="@+id/exit_btn"
+            style="@style/commonSettingItem"
+            android:layout_marginBottom="40dp"
+            android:layout_marginTop="30dp"
+            android:gravity="center"
+            android:text="@string/set_login_out"
+            android:textColor="@color/red" />
+    </LinearLayout>
+
+   
+</ScrollView>
+

module_home/src/main/res/layout/activity_user_register.xml

@@ -0,0 +1,459 @@
+<?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.uas.module.widget.core.ClearEditText
+                    android:id="@+id/personal_reg_username_et"
+                    style="@style/register_edittext_style"
+                    android:hint="用户名"
+                    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.uas.module.widget.core.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.uas.module.widget.core.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.uas.module.widget.core.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>-->

module_home/src/main/res/values/colors.xml

@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="no_approval">#f10813</color>
+    <color name="approval">#268509</color>
+    <color name="done_approval">#999999</color>
+    <color name="calendar_bg_color">#EBE9E9</color>
+    <color name="week_text_color">#FF000000</color>
+    <color name="select_circle_color">#FF8594</color>
+    <color name="deep_blue">#206390</color>
+    <!--umeng-->
+    <color name="umeng_socialize_comments_bg">#F4F4F4</color>
+    <color name="umeng_socialize_color_group">#2c3035</color>
+    <color name="umeng_socialize_list_item_textcolor">#333333</color>
+    <color name="umeng_socialize_list_item_bgcolor">#FFFFFF</color>
+    <color name="umeng_socialize_divider">#E6E6E6</color>
+    <color name="umeng_socialize_text_time">#999999</color>
+    <color name="umeng_socialize_text_title">#464f61</color>
+    <color name="umeng_socialize_text_friends_list">#959696</color>
+    <color name="umeng_socialize_text_share_content">#666666</color>
+    <color name="umeng_socialize_ucenter_bg">#EEEEEE</color>
+    <color name="umeng_socialize_text_ucenter">#595959</color>
+    <color name="umeng_socialize_edit_bg">#C4C4C4</color>
+    <color name="umeng_socialize_grid_divider_line">#F8F8F8</color>
+    <color name="crm_title_task">#D0A233</color>
+    <!--by gongpengming-->
+    <color name="load_submit">#11CD6E</color><!--下拉成功、提交成功-->
+    <color name="load_error">#A6ff4444</color><!--下拉失败、提交成功-->
+    <color name="load_warning">#D0A233</color>
+    <color name="load_message">#A6454A4B</color>
+
+    <color name="oa_outoffice">#3ac29e</color>
+    <color name="meeting">#d79147</color>
+    <color name="signin">#7292f8</color>
+    <color name="subscrip_text">#60a0a0a0</color>
+    <color name="subscrip_text1">#809b9797</color>
+    <!--#30a0a0a0-->
+    <color name="item_color1">#30F5F5F5</color>
+    <color name="pop_bg">#aeaeae</color>
+    <color name="item_color2">@color/white</color>
+    <color name="item_text">#cca0a0a0</color>
+    <color name="item_line">#CCCCCC</color>
+    <color name="antionbarcolor">#646464</color>
+    <color name="base_bg">#EBE9E9</color>
+    <color name="antionbaritemcolor">#a3b2cf</color>
+    <color name="wirtehine">#a3b2cf</color>
+    <color name="text_main">#333333</color>
+    <color name="text_hine">#575757</color>
+    <color name="text_bule">#1084D1</color>
+
+    <color name="bar_pass">#0096e6</color>
+    <color name="bar_color">#e6e6e6</color>
+    <color name="bg_main">@color/white</color>
+    <color name="refresh">@color/black</color>
+
+    <color name="btn_login_nomarl">#7BB4DC</color>
+    <color name="btn_login_press">#B9D2E3</color>
+
+    <color name="btn_orange_normal">#DD9C57</color>
+    <color name="btn_orange_press">#908f8f</color>
+    <!--end gongpengming-->
+    <color name="shadow">#AA000000</color>
+    <color name="default_shadow_color">#88757575</color>
+    <color name="default_fill_color">#ffffff</color>
+    <color name="crm_basic_bg">#4B4B57</color>
+    <color name="indexnormal">#98FB98</color>
+    <color name="indexpress">#3ACF6C</color>
+    <color name="blend_item_theme_color">#ff005092</color>
+    <color name="yellow_home">#FF8200</color>
+    <color name="light_green">#11CD6E</color> <!-- 绿色 -->
+    <!-- 黄色 tabhost -->
+    <color name="normal_bg">#fff0eff4</color>
+    <color name="main_tab_text_normal_grey">#ff83888e</color>
+    <color name="sub_tab_text_normal_black">#ff2d2f32</color>
+    <color name="actionbar_selector_color">#4d000000</color>
+    <color name="action_bar_tittle_color">#ffcfcfcf</color>
+    <color name="hint_text_color">#ff999999</color>
+    <color name="dark_grey">#ff7a7a7a</color>
+    <color name="dark_dark_grey">#ff505050</color>
+    <color name="black_trans_33">#33000000</color>
+    <color name="black_trans_99">#99000000</color>
+    <color name="chat_black_alpa">#88000000</color>
+    <color name="light_grey">#ffcccccc</color>
+    <color name="dark_orange">#ffd24d0c</color>
+    <color name="text_black">#ff2d2f32</color>
+    <color name="text_select">#fffa6015</color>
+    <color name="light_gray">#ff84828f</color>
+    <color name="circle_add_item_bg">#ffe2e1e6</color>
+    <color name="fade_black">#44000000</color>
+    <color name="replay_text_color_select">#ff352828</color>
+    <color name="operation_more_text_bg_normal">#ff363b3d</color>
+    <color name="operation_more_text_bg_press">#ff282c2e</color>
+    <color name="link_nick_name_color">#ff576b95</color>
+    <color name="dialog_normal">#0079FF</color>
+
+    <!-- PickDialog -->
+    <color name="lightgray">#F7F7F7</color>
+    <color name="lightblack">#696969</color>
+    <color name="blend_item_divider_color">#ffededed</color>
+    <!-- 内容条目按下时的样式 -->
+    <drawable name="pressed_bg">#f2f2f2</drawable>
+    <drawable name="nopressed_bg">#fff</drawable>
+    <!-- 警示性按钮的背景颜色 -->
+    <drawable name="button_caution_pressed">#d1337b</drawable>
+    <drawable name="button_caution_normal">#f559b1</drawable>
+    <!-- 程序主色调 -->
+    <color name="background">#f2f2f2</color>
+    <color name="hine_bg">#ebe9e9</color>
+    <color name="table_background">#cbcbcb</color>
+    <color name="light_white">#fcfcfc</color>
+    <color name="tab_main_color">#1e1d1d</color>
+    <color name="transparent">#00000000</color>
+    <color name="gray_light">#CCCCCC</color>
+    <color name="black_gray">#F5F5F5</color>
+
+    <color name="white">#FFFFFF</color> <!-- 白色 -->
+    <color name="ivory">#FFFFF0</color> <!-- 象牙色 -->
+    <color name="lightyellow">#FFFFE0</color> <!-- 亮黄色 -->
+    <color name="yellow">#FFFF00</color> <!-- 黄色 -->
+    <color name="snow">#FFFAFA</color> <!-- 雪白色 -->
+    <color name="floralwhite">#FFFAF0</color> <!-- 花白色 -->
+    <color name="lemonchiffon">#FFFACD</color> <!-- 柠檬绸色 -->
+    <color name="cornsilk">#FFF8DC</color> <!-- 米绸色 -->
+    <color name="seashell">#FFF5EE</color> <!-- 海贝色 -->
+    <color name="lavenderblush">#FFF0F5</color> <!-- 淡紫红 -->
+    <color name="papayawhip">#FFEFD5</color> <!-- 番木色 -->
+    <color name="blanchedalmond">#FFEBCD</color> <!-- 白杏色 -->
+    <color name="mistyrose">#FFE4E1</color> <!-- 浅玫瑰色 -->
+    <color name="text_color">#717171</color> <!-- 浅玫瑰色 -->
+    <color name="bisque">#FFE4C4</color> <!-- 桔黄色 -->
+    <color name="moccasin">#FFE4B5</color> <!-- 鹿皮色 -->
+    <color name="navajowhite">#FFDEAD</color> <!-- 纳瓦白 -->
+    <color name="peachpuff">#FFDAB9</color> <!-- 桃色 -->
+    <color name="gold">#FFD700</color> <!-- 金色 -->
+    <color name="pink">#FFC0CB</color> <!-- 粉红色 -->
+    <color name="lightpink">#FFB6C1</color> <!-- 亮粉红色 -->
+    <color name="orange">#FFA500</color> <!-- 橙色 -->
+    <color name="lightsalmon">#FFA07A</color> <!-- 亮肉色 -->
+    <color name="darkorange">#FF8C00</color> <!-- 暗桔黄色 -->
+    <color name="coral">#FF7F50</color> <!-- 珊瑚色 -->
+    <color name="hotpink">#FF69B4</color> <!-- 热粉红色 -->
+    <color name="tomato">#FF6347</color> <!-- 西红柿色 -->
+    <color name="orangered">#FF4500</color> <!-- 红橙色 -->
+    <color name="deeppink">#FF1493</color> <!-- 深粉红色 -->
+    <color name="fuchsia">#FF00FF</color> <!-- 紫红色 -->
+    <color name="magenta">#FF00FF</color> <!-- 红紫色 -->
+    <color name="red">#FF0000</color> <!-- 红色 -->
+    <color name="oldlace">#FDF5E6</color> <!-- 老花色 -->
+    <color name="lightgoldenrodyellow">#FAFAD2</color> <!-- 亮金黄色 -->
+    <color name="linen">#FAF0E6</color> <!-- 亚麻色 -->
+    <color name="antiquewhite">#FAEBD7</color> <!-- 古董白 -->
+    <color name="salmon">#FA8072</color> <!-- 鲜肉色 -->
+    <color name="ghostwhite">#F8F8FF</color> <!-- 幽灵白 -->
+    <color name="mintcream">#F5FFFA</color> <!-- 薄荷色 -->
+    <color name="whitesmoke">#F5F5F5</color> <!-- 烟白色 -->
+    <color name="beige">#F5F5DC</color> <!-- 米色 -->
+    <color name="wheat">#F5DEB3</color> <!-- 浅黄色 -->
+    <color name="sandybrown">#F4A460</color> <!-- 沙褐色 -->
+    <color name="azure">#F0FFFF</color> <!-- 天蓝色 -->
+    <color name="honeydew">#F0FFF0</color> <!-- 蜜色 -->
+    <color name="aliceblue">#F0F8FF</color> <!-- 艾利斯兰 -->
+    <color name="khaki">#F0E68C</color> <!-- 黄褐色 -->
+    <color name="lightcoral">#F08080</color> <!-- 亮珊瑚色 -->
+    <color name="palegoldenrod">#EEE8AA</color> <!-- 苍麒麟色 -->
+    <color name="violet">#EE82EE</color> <!-- 紫罗兰色 -->
+    <color name="darksalmon">#E9967A</color> <!-- 暗肉色 -->
+    <color name="lavender">#E6E6FA</color> <!-- 淡紫色 -->
+    <color name="lightcyan">#E0FFFF</color> <!-- 亮青色 -->
+    <color name="burlywood">#DEB887</color> <!-- 实木色 -->
+    <color name="plum">#DDA0DD</color> <!-- 洋李色 -->
+    <color name="gainsboro">#DCDCDC</color> <!-- 淡灰色 -->
+    <color name="crimson">#DC143C</color> <!-- 暗深红色 -->
+    <color name="palevioletred">#DB7093</color>
+    <!-- 苍紫罗兰色 -->
+    <color name="goldenrod">#DAA520</color> <!-- 金麒麟色 -->
+    <color name="orchid">#DA70D6</color> <!-- 淡紫色 -->
+    <color name="thistle">#D8BFD8</color> <!-- 蓟色 -->
+    <color name="lightgrey">#D3D3D3</color> <!-- 亮灰色 -->
+    <color name="tan">#D2B48C</color> <!-- 茶色 -->
+    <color name="chocolate">#D2691E</color> <!-- 巧可力色 -->
+    <color name="peru">#CD853F</color> <!-- 秘鲁色 -->
+    <color name="indianred">#ef613b</color> <!-- 印第安红 -->
+    <color name="mediumvioletred">#C71585</color> <!-- 中紫罗兰色 -->
+    <color name="silver">#C0C0C0</color> <!-- 银色 -->
+    <color name="darkkhaki">#BDB76B</color> <!-- 暗黄褐色 -->
+    <color name="rosybrown">#BC8F8F</color> <!-- 褐玫瑰红 -->
+    <color name="mediumorchid">#BA55D3</color> <!-- 中粉紫色 -->
+    <color name="darkgoldenrod">#B8860B</color> <!-- 暗金黄色 -->
+    <color name="firebrick">#B22222</color> <!-- 火砖色 -->
+    <color name="powderblue">#B0E0E6</color> <!-- 粉蓝色 -->
+    <color name="lightsteelblue">#B0C4DE</color> <!-- 亮钢兰色 -->
+    <color name="paleturquoise">#AFEEEE</color> <!-- 苍宝石绿 -->
+    <color name="greenyellow">#ADFF2F</color> <!-- 黄绿色 -->
+    <color name="lightblue">#ADD8E6</color> <!-- 亮蓝色 -->
+    <color name="darkgray">#A9A9A9</color> <!-- 暗灰色 -->
+    <color name="darkgrey">#A9A9A9</color> <!-- 暗灰色 -->
+    <color name="brown">#A52A2A</color> <!-- 褐色 -->
+    <color name="sienna">#A0522D</color> <!-- 赭色 -->
+    <color name="darkorchid">#9932CC</color> <!-- 暗紫色 -->
+    <color name="palegreen">#98FB98</color> <!-- 苍绿色 -->
+    <color name="darkviolet">#9400D3</color> <!-- 暗紫罗兰色 -->
+    <color name="mediumpurple">#9370DB</color> <!-- 中紫色 -->
+    <color name="lightgreen">#90EE90</color> <!-- 亮绿色 -->
+    <color name="darkseagreen">#8FBC8F</color> <!-- 暗海兰色 -->
+    <color name="saddlebrown">#8B4513</color> <!-- 重褐色 -->
+    <color name="darkmagenta">#8B008B</color> <!-- 暗洋红 -->
+    <color name="darkred">#8B0000</color> <!-- 暗红色 -->
+    <color name="blueviolet">#8A2BE2</color> <!-- 紫罗兰蓝色 -->
+    <color name="lightskyblue">#87CEFA</color> <!-- 亮天蓝色 -->
+    <color name="skyblue">#87CEEB</color> <!-- 天蓝色 -->
+    <color name="gray">#808080</color> <!-- 灰色 -->
+    <color name="grey">#808080</color> <!-- 灰色 -->
+    <color name="olive">#808000</color> <!-- 橄榄色 -->
+    <color name="purple">#800080</color> <!-- 紫色 -->
+    <color name="maroon">#800000</color> <!-- 粟色 -->
+    <color name="aquamarine">#7FFFD4</color> <!-- 碧绿色 -->
+    <color name="chartreuse">#7FFF00</color> <!-- 黄绿色 -->
+    <color name="lawngreen">#7CFC00</color> <!-- 草绿色 -->
+    <color name="mediumslateblue">#7B68EE</color> <!-- 中暗蓝色 -->
+    <color name="lightslategray">#778899</color> <!-- 亮蓝灰 -->
+    <color name="lightslategrey">#778899</color> <!-- 亮蓝灰 -->
+    <color name="slategray">#708090</color> <!-- 灰石色 -->
+    <color name="slategrey">#708090</color> <!-- 灰石色 -->
+    <color name="olivedrab">#6B8E23</color> <!-- 深绿褐色 -->
+    <color name="slateblue">#6A5ACD</color> <!-- 石蓝色 -->
+    <color name="dimgray">#696969</color> <!-- 暗灰色 -->
+    <color name="dimgrey">#696969</color> <!-- 暗灰色 -->
+    <color name="mediumaquamarine">#66CDAA</color>
+    <!-- 中绿色 -->
+    <color name="cornflowerblue">#6495ED</color> <!-- 菊兰色 -->
+    <color name="cadetblue">#5F9EA0</color> <!-- 军兰色 -->
+    <color name="darkolivegreen">#556B2F</color>
+    <!-- 暗橄榄绿 -->
+    <color name="indigo">#4B0082</color> <!-- 靛青色 -->
+    <color name="mediumturquoise">#48D1CC</color> <!-- 中绿宝石 -->
+    <color name="darkslateblue">#483D8B</color> <!-- 暗灰蓝色 -->
+    <color name="steelblue">#4682B4</color> <!-- 钢兰色 -->
+    <color name="royalblue">#4169E1</color> <!-- 皇家蓝 -->
+    <color name="turquoise">#40E0D0</color> <!-- 青绿色 -->
+    <color name="mediumseagreen">#3CB371</color> <!-- 中海蓝 -->
+    <color name="limegreen">#32CD32</color> <!-- 橙绿色 -->
+    <color name="darkslategray">#2F4F4F</color> <!-- 暗瓦灰色 -->
+    <color name="darkslategrey">#2F4F4F</color> <!-- 暗瓦灰色 -->
+    <color name="seagreen">#2E8B57</color> <!-- 海绿色 -->
+    <color name="forestgreen">#228B22</color> <!-- 森林绿 -->
+    <color name="lightseagreen">#20B2AA</color> <!-- 亮海蓝色 -->
+    <color name="dodgerblue">#1E90FF</color> <!-- 闪兰色 -->
+    <color name="midnightblue">#191970</color> <!-- 中灰兰色 -->
+    <color name="aqua">#00FFFF</color> <!-- 浅绿色 -->
+    <color name="cyan">#00FFFF</color> <!-- 青色 -->
+    <color name="springgreen">#00FF7F</color> <!-- 春绿色 -->
+    <color name="lime">#00FF00</color> <!-- 酸橙色 -->
+    <color name="mediumspringgreen">#00FA9A</color> <!-- 中春绿色 -->
+    <color name="darkturquoise">#00CED1</color> <!-- 暗宝石绿 -->
+    <color name="deepskyblue">#00BFFF</color> <!-- 深天蓝色 -->
+    <color name="darkcyan">#008B8B</color> <!-- 暗青色 -->
+    <color name="teal">#008080</color> <!-- 水鸭色 -->
+    <color name="green">#008000</color> <!-- 绿色 -->
+    <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
+    <color name="blue">#0000FF</color> <!-- 蓝色 -->
+    <!--标题栏颜色-->
+    <color name="titleBlue">#BF2F95DD</color> <!-- 青蓝色 -->
+    <color name="titleCustomer">#DF8339</color>
+    <color name="titleVisit">#6FB660</color>
+    <color name="titleTask">#D0A233</color>
+    <color name="titleRank">#D0A233</color>
+
+
+    <color name="mediumblue">#0000CD</color> <!-- 中兰色 -->
+    <color name="darkblue">#00008B</color> <!-- 暗蓝色 -->
+    <color name="navy">#000080</color> <!-- 海军色 -->
+    <!-- WHI defined colors -->
+    <color name="dark_red">#F2837B</color>
+    <color name="dark_red_select">#ffa02d38</color>
+    <color name="black">#000000</color> <!-- 黑色 -->
+    <color name="GhostWhite">#fff8f8ff</color>
+    <color name="Transpant">#00000000</color>
+    <color name="HalfBlack">#aa000000</color>
+    <color name="LightGreen">#ff002200</color>
+    <color name="LightBlue">#ff0000ff</color>
+    <color name="TextRed">#ffc68753</color>
+    <color name="calendar_topbg">#ff836244</color>
+    <color name="calendar_cellbg">#ff373737</color>
+    <color name="hintColor">#969595</color>
+    <color name="approvaling">#3BAE7E</color>
+    <color name="main_red">#ffbe2e15</color>
+    <color name="main_grey">#ff5f5f5f</color>
+    <color name="huangTuSe">#ff995e2d</color>
+    <color name="sc_transparent_background">#00111111</color>
+    <color name="dark">#ff494949</color>
+    <color name="ash">#ff78736d</color>
+    <color name="mainList1">#fff46e64</color>
+    <color name="mainList2">#fffeb355</color>
+    <color name="mainList3">#ff7daee8</color>
+    <color name="mainList4">#ff7fd373</color>
+    <color name="mainList5">#ffde7ab8</color>
+    <color name="bright_foreground_light">#ff000000</color>
+    <color name="bright_foreground_light_inverse">#ffffffff</color>
+    <color name="bright_foreground_light_disabled">#80000000</color>
+    <color name="dim_foreground_light">#808080</color>
+    <color name="dim_foreground_light_disabled">#80323232</color>
+    <color name="dim_foreground_light_inverse">#ff006eaa</color>
+    <color name="dim_foreground_light_inverse_disabled">#80bebebe</color>
+
+    <color name="replay_text_color_normal">#ffa19992</color>
+    <color name="oa_background_orange">#DC9A54</color>
+
+    <color name="toast_bg">#60808080</color><!--自定义toast背景色-->
+
+    <color name="button_normal">#7AB9EE</color>
+    <color name="button_invalid">#C0C0C0</color>
+    <color name="button_focus">#2475FB</color>
+    <color name="text_normal">#808A87</color>
+
+    <color name="me_menu_item_normal">#FAF9F9</color>
+    <color name="me_menu_item_press">#DFDEDE</color>
+    <color name="bg_underlying">#ebe9e9</color>
+    <color name="orange_text">#f17e21</color>
+    <color name="oa_bg">#EBE9E9</color>
+    <color name="oa_item_bg">#f9f9f9</color>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="light_blue">#44CDC5</color>
+    <color name="main_text_color">#333333</color>
+    <color name="gray_default_dark">#666666</color>
+
+    <color name="normal_day">#ff999999</color>
+    <color name="selected_day_background">#E75F49</color>
+    <color name="selected_day_text">#fff2f2f2</color>
+    <color name="new_waitting_approvel">#F4A460</color>
+
+    <color name="item_drag_color">#66a6a1a1</color>
+
+    <!--数据查询，报表统计菜单项颜色-->
+    <color name="data_inquiry_gird_menu_color1">#2f95dd</color>
+    <color name="data_inquiry_gird_menu_color2">#9b7dc9</color>
+    <color name="data_inquiry_gird_menu_color3">#de935b</color>
+    <color name="data_inquiry_gird_menu_color4">#f57474</color>
+    <color name="data_inquiry_gird_menu_color5">#8bd67f</color>
+    <color name="data_inquiry_gird_menu_color6">#68d2c9</color>
+    <color name="data_inquiry_caption_textcolor">#999999</color>
+    <color name="data_inquiry_value_textcolor">#333333</color>
+
+    <!--服务预约-->
+    <color name="blue_seats_num">#2E94DD</color>
+
+    <!--B2B商务-->
+    <color name="b2b_tab_bg">#f2f8fc</color>
+    <color name="b2b_tab_selected">#2F95DD</color>
+    <color name="b2b_btn_todo">#19CD25</color>
+    <color name="b2b_btn_done">#62B1CB</color>
+    <color name="b2b_btn_end">#AAAAAA</color>
+
+    <color name="common_pop_item_normal">#CCFFFFFF</color>
+    <color name="common_pop_item_pressed">#D8D8D8</color>
+    <color name="meeting_end_status">#9B9B9B</color>
+    <color name="meeting_start_status">#3BAE7E</color>
+    <color name="meeting_before_status">#FF0000</color>
+    <color name="empty_text_color">#999999</color>
+    <color name="dark_gray_97">#979797</color>
+
+    <color name="b2b_quote_tab_selected">#4084f1</color>
+    <color name="customer_tab_selected">#1084D1</color>
+
+    <color name="business_rank_no1">#FF830C</color>
+    <color name="business_rank_no2">#01E83A</color>
+    <color name="business_rank_no3">#0C46FF</color>
+    <color name="business_rank_no4">#333333</color>
+</resources>

module_home/src/main/res/values/dimens.xml

@@ -0,0 +1,75 @@
+<resources>
+    <!--OA\-->
+    <dimen name="item_margin_top">12dp</dimen>
+    <dimen name="misson_item_height">40dp</dimen>
+    <dimen name="item_aims_height">250dp</dimen>
+    <dimen name="misson_item_pl">15dp</dimen>
+    <dimen name="misson_item_pr">10dp</dimen>
+    <dimen name="sub_padding">15dp</dimen>
+    <dimen name="week_bar_height">36dp</dimen>
+    <dimen name="week_calendar_height">48dp</dimen>
+    <dimen name="month_calendar_height">288dp</dimen>
+    <dimen name="calendar_min_distance">5dp</dimen>
+    <dimen name="auto_scroll_distance">15dp</dimen>
+    <integer name="calendar_text_size">13</integer>
+    <!--end OA-->
+    <!--view show-->
+    <dimen name="default_corner_radius">4dp</dimen>
+    <dimen name="default_shadow_radius">4dp</dimen>
+    <!-- oa 考勤统计页面-->
+    <dimen name="oa_statistics_line">15dp</dimen>
+    <dimen name="oa_statistics_date_minWidth">100dp</dimen>
+    <dimen name="oa_statistics_date_minheight">30dp</dimen>
+    <!-- end oa 考勤统计页面-->
+    <dimen name="next_width">10.0dip</dimen>
+    <dimen name="line">3px</dimen>
+    <dimen name="line_big">7.0dip</dimen>
+    <dimen name="line_min">2.0dip</dimen>
+    <dimen name="next_height">15.0dip</dimen>
+    <dimen name="text_main">16.0sp</dimen>
+    <dimen name="text_hine">14.0sp</dimen>
+    <dimen name="text_min">12.0sp</dimen>
+    <dimen name="item_height_edit">100.0dip</dimen>
+    <dimen name="item_height">60.0dip</dimen>
+    <dimen name="item_height_min">45.0dip</dimen>
+    <dimen name="item_me_height">80.0dip</dimen>
+    <dimen name="item_img_height">48dp</dimen>
+    <dimen name="item_img_width">48dp</dimen>
+    <dimen name="BigTextSize">17.0dp</dimen>
+    <dimen name="NormalTextSize">16.0dp</dimen>
+    <dimen name="HintTextSize">14.0dp</dimen>
+    <dimen name="SmallerTextSize">13.0sp</dimen>
+    <dimen name="emotion_height">180dp</dimen>
+    <dimen name="paddingMax">12dp</dimen>
+    <dimen name="padding">8dp</dimen>
+    <dimen name="paddingMin">4dp</dimen>
+    <dimen name="paddingApp">8dp</dimen>
+    <dimen name="pmsg_media_view_height">255dp</dimen>
+    <dimen name="list_item_padding">16dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+
+    <dimen name="text_size_day">16sp</dimen>
+    <dimen name="text_size_month">16sp</dimen>
+    <dimen name="text_size_day_name">10sp</dimen>
+    <dimen name="header_month_height">50dip</dimen>
+    <dimen name="selected_day_radius">18dip</dimen>
+    <dimen name="calendar_height">270dip</dimen>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+
+    <dimen name="text_margin">16dp</dimen>
+
+    <dimen name="top_actionbar_height">42dp</dimen>
+    <dimen name="buttom_actionbar_height">38dp</dimen>
+
+    <dimen name="folder_cover_size">72dp</dimen>
+    <dimen name="recyclerview_fast_scroller_width">16dp</dimen>
+
+    <dimen name="commonSettingItemHeight">42dp</dimen>
+    <dimen name="commonSettingItemPaddingL">10dp</dimen>
+    <dimen name="commonSettingItemPaddingR">10dp</dimen>
+    <dimen name="commonSettingItemTextSize">14sp</dimen>
+</resources>

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

@@ -0,0 +1,40 @@
+<resources>
+    <string name="test_name">module_test</string>
+    <string name="title_activity_test_main">TestMainActivity</string>
+
+
+    <!--登录-->
+    <string name="login_button">登  录</string>
+    <string name="login_account">账号    |</string>
+    <string name="login_password">密码    |</string>
+    <string name="login_losspwd">忘记密码?</string>
+    <string name="login_getpwd">密码找回</string>
+    <string name="login_register">新用户注册</string>
+
+    <string name="person_register">个人注册</string>
+    <string name="phone_number">手机号</string>
+    <string name="rpassword">密码</string>
+    <string name="input_person_sign">请输入个性签名</string>
+    <string name="to_login">已有账户？登录</string>
+    <string name="input_phone_number">请输入手机号</string>
+    <string name="input_name">请输入姓名</string>
+
+
+    <!--对话框-->
+    <string name="app_dialog_title">系统提示</string>
+    <string name="app_dialog_ok">确认</string>
+    <string name="app_dialog_cancle">取消</string>
+    <string name="app_dialog_close">关闭</string>
+
+    <string name="complete">完成</string>
+
+    <!--设置-->
+    <string name="set_sport">UU运动</string>
+    <string name="set_push">允许推送</string>
+    <string name="set_clear">清除缓存</string>
+    <string name="set_sigin">打卡设置</string>
+    <string name="set_suggest">问题反馈</string>
+    <string name="set_about">关于UU互联</string>
+    <string name="set_version">当前版本</string>
+    <string name="set_login_out">退出登录</string>
+</resources>

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--新的通用按钮样式-->
+    <style name="commonButtonStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">42dp</item>
+        <item name="android:background">@drawable/selector_confirm_bg</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+
+    <style name="IMEditText">
+        <item name="android:textSize">@dimen/NormalTextSize</item>
+        <item name="android:textColorHint">@color/grey</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">44dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:singleLine">true</item>
+    </style>
+
+    <style name="IMLineEditText" parent="@style/IMEditText">
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">5dp</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+    
+
+    <style name="IMLineEditPass" parent="@style/IMLineEditText">
+        <item name="android:password">true</item>
+        <item name="android:inputType">textPassword</item>
+    </style>
+
+
+    <style name="register_edittext_style">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">40dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:drawablePadding">16dp</item>
+    </style>
+
+    <!--设置页面通用item-->
+    <style name="commonSettingItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/commonSettingItemHeight</item>
+        <item name="android:paddingLeft">@dimen/commonSettingItemPaddingL</item>
+        <item name="android:paddingRight">@dimen/commonSettingItemPaddingR</item>
+        <item name="android:background">@drawable/selector_me_menu_item_bg</item>
+    </style>
+
+</resources>

module_main/build.gradle

@@ -50,5 +50,4 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor deps.arouter_compiler
     implementation project(':lib_common')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }

module_main/src/main/java/com/uas/module/main/MainActivity.java

@@ -33,14 +33,21 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
             ARouter.getInstance().build("/news/center").navigation();
         } else if (view.getId() == R.id.girls_button) {
             //跳转到GirlsActivity
-            ARouter.getInstance().build("/girls/list").navigation();
+//            ARouter.getInstance().build("/girls/list").navigation();
+
+            ARouter.getInstance().build("/home/register").navigation();
+            
         } else if (view.getId() == R.id.fragment_button) {
             startActivity(new Intent(this, BottomNavigationActivity.class));
         }  else if(view.getId()==R.id.test_button){
-            ARouter.getInstance().build("/app/uas_web")
-                    .withString("url","https://www.baidu.com")
-                    .withString("title","阿里云云栖社区")
+            
+            ARouter.getInstance().build("/home/setting")
                     .navigation();
+    
+//            ARouter.getInstance().build("/app/uas_web")
+//                    .withString("url","https://www.baidu.com")
+//                    .withString("title","阿里云云栖社区")
+//                    .navigation();
         }
     }
 

module_test/src/androidTest/java/com/uas/module/test/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.uas.module.test;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.uas.module.test.test", appContext.getPackageName());
-    }
-}

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

@@ -1,4 +0,0 @@
-<resources>
-    <string name="test_name">module_test</string>
-    <string name="title_activity_test_main">TestMainActivity</string>
-</resources>

module_test/src/test/java/com/uas/module/test/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.uas.module.test;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

settings.gradle

@@ -1,4 +1,4 @@
-include ':lib_common', ':module_test', ':lib_widget',
+include ':lib_common', ':module_home', ':lib_widget',
         ':module_app',
         ':module_main',
         ':module_girls',

versions.gradle

@@ -30,12 +30,13 @@ versions.litepal = "1.6.1"
 versions.toasty = "1.1.3"
 versions.logger = "1.15"
 versions.material_dialog = "0.9.6.0"
-//Arouter
+versions.circleimageview="3.0.0"
+
 versions.arouter_compiler = "1.1.4"
 versions.arouter_api = "1.3.1"
-//MVP
+
 versions.themvp="1.0.6"
-//GRPC
+
 versions.grpc_api="1.0.0-SNAPSHOT"
 versions.fastjson="1.2.57"
 versions.agentweb="4.0.3-alpha@aar"
@@ -89,6 +90,8 @@ deps.easy_recycler = "com.jude:easyrecyclerview:$versions.easy_recycler"
 deps.photo_view = "com.github.chrisbanes:PhotoView:$versions.photo_view"
 deps.material_dialog = "com.afollestad.material-dialogs:core:$versions.material_dialog"
 deps.agentweb="com.just.agentweb:agentweb:$versions.agentweb"
+deps.circleimageview="de.hdodenhof:circleimageview:$versions.circleimageview"
+
 
 deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"