SpringBoots 8 лет назад
Родитель
Сommit
6d4b335d55
23 измененных файлов с 2434 добавлено и 51 удалено
  1. 3 11
      WeiChat/build.gradle
  2. 7 1
      WeiChat/src/main/AndroidManifest.xml
  3. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  4. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java
  6. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java
  7. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java
  8. 0 25
      WeiChat/src/main/java/com/xzjmyk/pm/activity/util/IntentUtils.java
  9. 0 4
      WeiChat/src/main/res/layout/activity_login.xml
  10. 1 0
      WeiChat/src/main/res/values/styles.xml
  11. 11 1
      app_core/common/build.gradle
  12. 15 0
      app_core/common/src/main/java/com/core/utils/IntentUtils.java
  13. 163 0
      app_core/common/src/main/java/com/core/widget/ClearEditText.java
  14. 24 0
      app_core/common/src/main/res/drawable/bg_bule_btn.xml
  15. 249 0
      app_core/common/src/main/res/values/attrs.xml
  16. 329 0
      app_core/common/src/main/res/values/colors.xml
  17. 68 0
      app_core/common/src/main/res/values/dimens.xml
  18. 1213 2
      app_core/common/src/main/res/values/styles.xml
  19. 2 0
      app_modular/applogin/build.gradle
  20. 1 1
      app_modular/applogin/src/main/AndroidManifest.xml
  21. 227 0
      app_modular/applogin/src/main/java/com/modular/login/LoginActivity.java
  22. 115 0
      app_modular/applogin/src/main/res/layout/activity_login.xml
  23. 1 1
      version.gradle

+ 3 - 11
WeiChat/build.gradle

@@ -81,7 +81,7 @@ dependencies {
     compile(deps.stetho) {
         force = true
     }
-    compile deps.circleimageview
+   
     compile deps.jodatime
     compile deps.systembartint
     compile deps.photoView
@@ -99,18 +99,10 @@ dependencies {
     compile project(':common')
     compile project(':network')
     compile project(':imageload')
-    compile project(':applogin')
+  //  compile project(':applogin')
 //    compile project(':message')
     
-    compile project(':pullToRefershLibraryMy')
-    compile project(':MPAndroidChart')
-    compile project(':libedittextformlibrary')
-    compile project(':libfloatingactionbutton')
-    compile project(':libbdupdatesdk')
-    compile project(':library-swipemenu_lv')
-    compile project(':library-viewpager-indicator')
-    compile project(':lib-zxing')
-    compile project(':library-refreshlayout')
+ 
 }
 
 buildscript {

+ 7 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -209,7 +209,13 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.erp.activity.WebViewCommActivity"
-            android:hardwareAccelerated="false" />
+            android:hardwareAccelerated="false" >
+            <intent-filter>
+                <action android:name="com.modular.main.WebViewCommActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -82,7 +82,7 @@ import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
 import com.xzjmyk.pm.activity.util.im.Constants;
 import com.xzjmyk.pm.activity.util.oa.AutoErpService;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -33,7 +33,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.R;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 
 import java.util.HashMap;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java

@@ -10,7 +10,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.PersonalRegActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 
 public class RegisterSelectActivity extends BaseActivity {
     @ViewInject(R.id.person_btn)

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -22,7 +22,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java

@@ -27,7 +27,7 @@ import com.umeng.socialize.media.UMImage;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.IntentUtils;
+import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 public class AboutActivity extends BaseActivity implements View.OnClickListener {

+ 0 - 25
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/IntentUtils.java

@@ -1,25 +0,0 @@
-package com.xzjmyk.pm.activity.util;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
-
-/**
- * Created by Arison on 2017/8/29.
- */
-
-public class IntentUtils {
-
-    /**
-     * @注释:跳转嵌入网页页面
-     * @param: url 经过登录验证之后的URL路径跳转
-     * text 客户端嵌入网页页面动态显示文字
-     */
-    public static void webLinks(Context ct, String url, String text) {
-        Intent intent_web = new Intent(ct, WebViewCommActivity.class);
-        intent_web.putExtra("url", url);
-        intent_web.putExtra("p", text);
-        ct.startActivity(intent_web);
-    }
-}

+ 0 - 4
WeiChat/src/main/res/layout/activity_login.xml

@@ -48,7 +48,6 @@
                     android:background="@color/white"
                     android:hint="@string/please_input_phone_number"
                     android:inputType="phone"
-
                     android:paddingBottom="0dp"
                     android:paddingTop="0dp" />
             </LinearLayout>
@@ -76,7 +75,6 @@
                     android:id="@+id/password_edit"
                     style="@style/IMLineEditPass"
                     android:background="@color/white"
-
                     android:hint="@string/please_input_password" />
             </LinearLayout>
 
@@ -102,7 +100,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/ll_content"
             android:layout_marginLeft="20dp"
-
             android:text="@string/login_losspwd"
             android:textColor="@color/titleBlue" />
 
@@ -113,7 +110,6 @@
             android:layout_alignParentRight="true"
             android:layout_below="@+id/ll_content"
             android:layout_marginRight="20dp"
-
             android:text="@string/login_register"
             android:textColor="@color/titleBlue" />
     </RelativeLayout>

+ 1 - 0
WeiChat/src/main/res/values/styles.xml

@@ -1172,6 +1172,7 @@
         <item name="android:taskToBackEnterAnimation">@null</item>
         <item name="android:taskToBackExitAnimation">@null</item>
     </style>
+
     android:layout_width="0dp"
     android:layout_weight="1"
 

+ 11 - 1
app_core/common/build.gradle

@@ -29,8 +29,18 @@ dependencies {
     compile(deps.stetho) {
         force = true
     }
-
+    compile deps.circleimageview
     compile project(':lib-zxing')
     compile deps.activityOnCrash
     compile 'com.umeng.analytics:analytics:6.1.2'
+
+    compile project(':pullToRefershLibraryMy')
+    compile project(':MPAndroidChart')
+    compile project(':libedittextformlibrary')
+    compile project(':libfloatingactionbutton')
+    compile project(':libbdupdatesdk')
+    compile project(':library-swipemenu_lv')
+    compile project(':library-viewpager-indicator')
+    compile project(':lib-zxing')
+    compile project(':library-refreshlayout')
 }

+ 15 - 0
app_core/common/src/main/java/com/core/utils/IntentUtils.java

@@ -0,0 +1,15 @@
+package com.core.utils;
+
+import android.content.Context;
+import android.content.Intent;
+
+
+public class IntentUtils {
+    
+    public static void webLinks(Context ct, String url, String text) {
+        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
+        intent_web.putExtra("url", url);
+        intent_web.putExtra("p", text);
+        ct.startActivity(intent_web);
+    }
+}

+ 163 - 0
app_core/common/src/main/java/com/core/widget/ClearEditText.java

@@ -0,0 +1,163 @@
+package com.core.widget;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.MotionEventCompat;
+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 android.widget.EditText;
+
+import com.common.R;
+
+
+public class ClearEditText extends EditText 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;
+	}
+
+}

+ 24 - 0
app_core/common/src/main/res/drawable/bg_bule_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/titleBlue" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

+ 249 - 0
app_core/common/src/main/res/values/attrs.xml

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="StickyListHeadersListView">
+        <attr name="stickyListHeadersListViewStyle" format="reference"/>
+
+        <!-- View attributes -->
+        <attr name="android:clipToPadding" />
+        <attr name="android:scrollbars" />
+        <attr name="android:overScrollMode" />
+        <attr name="android:padding" />
+        <attr name="android:paddingLeft" />
+        <attr name="android:paddingTop" />
+        <attr name="android:paddingRight" />
+        <attr name="android:paddingBottom" />
+
+        <!-- ListView attributes -->
+        <attr name="android:fadingEdgeLength" />
+        <attr name="android:requiresFadingEdge" />
+        <attr name="android:cacheColorHint" />
+        <attr name="android:choiceMode" />
+        <attr name="android:drawSelectorOnTop" />
+        <attr name="android:fastScrollEnabled" />
+        <attr name="android:fastScrollAlwaysVisible" />
+        <attr name="android:listSelector" />
+        <attr name="android:scrollingCache" />
+        <attr name="android:scrollbarStyle" />
+        <attr name="android:divider" />
+        <attr name="android:dividerHeight" />
+        <attr name="android:transcriptMode" />
+        <attr name="android:stackFromBottom" />
+
+        <!-- StickyListHeaders attributes -->
+        <attr name="hasStickyHeaders" format="boolean" />
+        <attr name="isDrawingListUnderStickyHeader" format="boolean" />
+    </declare-styleable>
+    
+    
+    <!--shadow Arison-->
+    <declare-styleable name="ShadowLayout">
+        <attr name="sl_cornerRadius" format="dimension"/>
+        <attr name="sl_shadowRadius" format="dimension"/>
+        <attr name="sl_shadowColor" format="color"/>
+        <attr name="sl_dx" format="dimension"/>
+        <attr name="sl_dy" format="dimension"/>
+    </declare-styleable>
+    <!--steps Airsono-->
+    <declare-styleable name="StepsViewIndicator">
+        <attr name="numOfSteps" format="integer" />
+    </declare-styleable>
+    <!-- Defines the custom XML attributes supported for a ChatFaceView(表情布局) -->
+    <declare-styleable name="ChatFaceView">
+        <attr name="hasGif" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="HorizontalListView">
+        <attr name="dividerWidth" format="dimension" />
+        <attr name="android:divider" />
+        <attr name="android:requiresFadingEdge" />
+        <attr name="android:fadingEdgeLength" />
+    </declare-styleable>
+
+
+    <declare-styleable name="TagGroup">
+        <!-- Whether the tag group is in append mode. -->
+        <attr name="atg_isAppendMode" format="boolean" />
+        <!-- If the tag group is in append mode, what the hint of input tag. -->
+        <attr name="atg_inputHint" format="string" />
+
+        <!-- The tag view outline border color. -->
+        <attr name="atg_borderColor" format="color" />
+        <!-- The tag view text color. -->
+        <attr name="atg_textColor" format="color" />
+        <!-- The tag view background color. -->
+        <attr name="atg_backgroundColor" format="color" />
+
+        <!-- The dash outline border color, when in append mode. -->
+        <attr name="atg_dashBorderColor" format="color" />
+        <!-- The input tag hint text color, when in append mode. -->
+        <attr name="atg_inputHintColor" format="color" />
+        <!-- The input tag type text color, when in append mode. -->
+        <attr name="atg_inputTextColor" format="color" />
+
+        <!-- The checked tag view outline border color. -->
+        <attr name="atg_checkedBorderColor" format="color" />
+        <!-- The checked text color. -->
+        <attr name="atg_checkedTextColor" format="color" />
+        <!-- The checked marker color. -->
+        <attr name="atg_checkedMarkerColor" format="color" />
+        <!-- The checked tag view background color. -->
+        <attr name="atg_checkedBackgroundColor" format="color" />
+
+        <!-- The tag view background color, when the tag view is being pressed. -->
+        <attr name="atg_pressedBackgroundColor" format="color" />
+
+        <!-- The tag view outline border stroke width. -->
+        <attr name="atg_borderStrokeWidth" format="dimension" />
+        <!-- The tag view text size. -->
+        <attr name="atg_textSize" format="dimension" />
+
+        <attr name="atg_horizontalSpacing" format="dimension" />
+        <attr name="atg_verticalSpacing" format="dimension" />
+        <attr name="atg_horizontalPadding" format="dimension" />
+        <attr name="atg_verticalPadding" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="Themes">
+        <attr name="tagGroupStyle" format="reference" />
+    </declare-styleable>
+
+
+    <!--end gongpengming-->
+
+    <!--SmoothCheckBox-->
+    <declare-styleable name="SmoothCheckBox">
+        <attr name="duration" format="integer" />
+        <attr name="stroke_width" format="dimension" />
+        <attr name="color_tick" format="color" />
+        <attr name="color_checked" format="color" />
+        <attr name="color_unchecked" format="color" />
+        <attr name="color_unchecked_stroke" format="color" />
+    </declare-styleable>
+    <declare-styleable name="SlidingUpPanelLayout">
+        <attr name="umanoPanelHeight" format="dimension" />
+        <attr name="umanoShadowHeight" format="dimension" />
+        <attr name="umanoParallaxOffset" format="dimension" />
+        <attr name="umanoFadeColor" format="color" />
+        <attr name="umanoFlingVelocity" format="integer" />
+        <attr name="umanoDragView" format="reference" />
+        <attr name="umanoScrollableView" format="reference" />
+        <attr name="umanoOverlay" format="boolean"/>
+        <attr name="umanoClipPanel" format="boolean"/>
+        <attr name="umanoAnchorPoint" format="float" />
+        <attr name="umanoInitialState" format="enum">
+            <enum name="expanded" value="0" />
+            <enum name="collapsed" value="1" />
+            <enum name="anchored" value="2" />
+            <enum name="hidden" value="3" />
+        </attr>
+        <attr name="umanoScrollInterpolator" format="reference" />
+    </declare-styleable>
+    <!-- 圆形图片-->
+    <declare-styleable name="CircleImageView">
+        <attr name="border_width" format="dimension" />
+        <attr name="border_color" format="color" />
+    </declare-styleable>
+
+
+    <declare-styleable name="WeekBarView">
+        <attr name="week_text_color" format="color"/>
+        <attr name="week_text_size" format="integer"/>
+    </declare-styleable>
+
+    <declare-styleable name="MonthCalendarView">
+        <attr name="month_selected_text_color" format="color"/>
+        <attr name="month_selected_circle_color" format="color"/>
+        <attr name="month_selected_circle_today_color" format="color"/>
+        <attr name="month_normal_text_color" format="color"/>
+        <attr name="month_today_text_color" format="color"/>
+        <attr name="month_lunar_text_color" format="color"/>
+        <attr name="month_hint_circle_color" format="color"/>
+        <attr name="month_holiday_color" format="color"/>
+        <attr name="month_last_or_next_month_text_color" format="color"/>
+        <attr name="month_day_text_size" format="integer"/>
+        <attr name="month_day_lunar_text_size" format="integer"/>
+        <attr name="month_show_task_hint" format="boolean"/>
+        <attr name="month_show_lunar" format="boolean"/>
+        <attr name="month_show_holiday_hint" format="boolean"/>
+        <attr name="month_count" format="integer"/>
+    </declare-styleable>
+
+    <declare-styleable name="WeekCalendarView">
+        <attr name="week_selected_text_color" format="color"/>
+        <attr name="week_selected_circle_color" format="color"/>
+        <attr name="week_selected_circle_today_color" format="color"/>
+        <attr name="week_normal_text_color" format="color"/>
+        <attr name="week_today_text_color" format="color"/>
+        <attr name="week_hint_circle_color" format="color"/>
+        <attr name="week_holiday_color" format="color"/>
+        <attr name="week_lunar_text_color" format="color"/>
+        <attr name="week_day_text_size" format="integer"/>
+        <attr name="week_day_lunar_text_size" format="integer"/>
+        <attr name="week_show_task_hint" format="boolean"/>
+        <attr name="week_show_lunar" format="boolean"/>
+        <attr name="week_show_holiday_hint" format="boolean"/>
+        <attr name="week_count" format="integer"/>
+    </declare-styleable>
+
+    <declare-styleable name="ScheduleLayout">
+        <attr name="default_view">
+            <enum name="month" value="0"/>
+            <enum name="week" value="1"/>
+        </attr>
+        <attr name="auto_change_month_row" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="DragDisplayBoard">
+        <attr name="board_select_circle_color" format="color"/>
+        <attr name="board_select_border_color" format="color"/>
+    </declare-styleable>
+
+    <declare-styleable name="DayPickerView">
+        <attr name="colorCurrentDay" format="color"/>
+        <attr name="colorSelectedDayBackground" format="color"/>
+        <attr name="colorSelectedDayText" format="color"/>
+        <attr name="colorPreviousDay" format="color"/>
+        <attr name="colorNormalDay" format="color" />
+        <attr name="colorMonthName" format="color" />
+        <attr name="colorDayName" format="color" />
+        <attr name="textSizeDay" format="dimension"/>
+        <attr name="textSizeMonth" format="dimension" />
+        <attr name="textSizeDayName" format="dimension" />
+        <attr name="headerMonthHeight" format="dimension" />
+        <attr name="selectedDayRadius" format="dimension" />
+        <attr name="calendarHeight" format="dimension" />
+        <attr name="enablePreviousDay" format="boolean" />
+        <attr name="currentDaySelected" format="boolean" />
+        <attr name="drawRoundRect" format="boolean" />
+        <attr name="firstMonth" format="enum">
+            <enum name="january" value="0" />
+            <enum name="february" value="1" />
+            <enum name="march" value="2" />
+            <enum name="april" value="3" />
+            <enum name="may" value="4" />
+            <enum name="june" value="5" />
+            <enum name="july" value="6" />
+            <enum name="august" value="7" />
+            <enum name="september" value="8" />
+            <enum name="october" value="9" />
+            <enum name="november" value="10" />
+            <enum name="december" value="11" />
+        </attr>
+        <attr name="lastMonth" format="enum">
+            <enum name="january" value="0" />
+            <enum name="february" value="1" />
+            <enum name="march" value="2" />
+            <enum name="april" value="3" />
+            <enum name="may" value="4" />
+            <enum name="june" value="5" />
+            <enum name="july" value="6" />
+            <enum name="august" value="7" />
+            <enum name="september" value="8" />
+            <enum name="october" value="9" />
+            <enum name="november" value="10" />
+            <enum name="december" value="11" />
+        </attr>
+    </declare-styleable>
+
+</resources>

+ 329 - 0
app_core/common/src/main/res/values/colors.xml

@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="no_approval">#f10813</color>
+    <color name="approval">#268509</color>
+    <color name="done_approval">#969595</color>
+    <color name="calendar_bg_color">#EBE9E9</color>
+    <color name="week_text_color">#FF000000</color>
+    <color name="select_circle_color">#FF8594</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">#BFD3D3D3</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">#3c3c3c</color>
+    <color name="text_hine">#575757</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">#CD5C5C</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">#B99400</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>
+</resources>

+ 68 - 0
app_core/common/src/main/res/values/dimens.xml

@@ -0,0 +1,68 @@
+<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">1px</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.0dip</dimen>
+    <dimen name="NormalTextSize">16.0dip</dimen>
+    <dimen name="HintTextSize">14.0dip</dimen>
+    <dimen name="SmallerTextSize">13.0dip</dimen>
+    <dimen name="emotion_height">180dp</dimen>
+    <dimen name="padding">8dp</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>
+</resources>

+ 1213 - 2
app_core/common/src/main/res/values/styles.xml

@@ -1,10 +1,523 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <style name="Animation.Popup" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+    </style>
+
+    <style name="style_bg_bar">
+        <item name="android:background">@color/antionbarcolor</item>
+    </style>
+
+    <style name="style_actionbar_title_style">
+        <item name="android:textSize">13sp</item>
+    </style>
+
+    <style name="TreeNodeStyleCustom">
+        <item name="android:paddingLeft">20dp</item>
+        <!--<item name="android:showDividers">middle</item>-->
+        <!--<item name="android:divider">@android:drawable/divider_horizontal_bright</item>-->
+    </style>
+
+    <style name="style_bg_bar_bule">
+        <item name="android:background">@color/titleBlue</item>
+    </style>
+
+    <drawable name="BackBar">@color/antionbarcolor</drawable>
+
+    <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+        <item name="android:buttonStyle">@android:style/Widget.Button</item>
+        <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
+        <item name="actionBarStyle">@style/style_bg_bar</item>
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:listViewStyle">@style/IMListView</item>
+        <item name="actionBarItemBackground">@drawable/actionbar_menu_selector</item>
+        <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <!-- This disables the black preview screen -->
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+
+    </style>
+
+    <!-- Dialog Style -->
+    <style name="IMTheme.DialogStyle" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="IMAnimation.Popwindow" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/pop_slide_right_in</item>
+        <item name="android:windowExitAnimation">@anim/pop_slide_right_out</item>
+    </style>
+
+    <style name="Buttom.Popwindow" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/input_method_enter</item>
+        <item name="android:windowExitAnimation">@anim/input_method_exit</item>
+    </style>
+
+    <style name="IMActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:icon">@drawable/action_bar_divider</item>
+        <item name="titleTextStyle">@style/IMActionBar.TitleTextStyle</item>
+        <item name="subtitleTextStyle">@style/IMActionBar.SubTitleTextStyle</item>
+        <item name="icon">@drawable/action_bar_divider</item>
+        <item name="background">@drawable/tab_bg_u</item>
+        <item name="backgroundStacked">@drawable/actionbar_bg</item>
+        <item name="backgroundSplit">@drawable/actionbar_bg</item>
+        <item name="indeterminateProgressStyle">@style/ActionBarCustomProgressBar</item>
+    </style>
+
+    <style name="IMListView">
+        <item name="android:scrollbars">vertical</item>
+        <item name="android:listSelector">@color/transparent</item>
+        <item name="android:divider">@color/transparent</item>
+        <item name="android:dividerHeight">1px</item>
+    </style>
+
+    <style name="IMAnimationStyle" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/pop_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/anim_not_change</item>
+        <item name="android:activityCloseEnterAnimation">@anim/anim_not_change</item>
+        <item name="android:activityCloseExitAnimation">@anim/pop_out</item>
+    </style>
+
+    <style name="IMTabButton">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:textSize">@dimen/SmallerTextSize</item>
+        <item name="android:textColor">@color/main_tab_btn_text</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:button">@null</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="IMActionBar.TitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textSize">@dimen/BigTextSize</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="IMActionBar.SubTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textSize">@dimen/HintTextSize</item>
+        <item name="android:textColor">@color/hint_text_color</item>
+    </style>
+
+    <style name="ActionBarCustomProgressBar" parent="@style/Widget.AppCompat.ProgressBar">
+        <item name="android:indeterminateDrawable">@drawable/progress_actionbar_holo</item>
+    </style>
+
+    <style name="IMButton">
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">@dimen/BigTextSize</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">@null</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">42dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
+    </style>
+
+    <style name="IMButton.Orange" parent="@style/IMButton">
+        <item name="android:background">@drawable/loginpre</item>
+    </style>
+
+    <style name="IMButton.Green" parent="@style/IMButton">
+        <item name="android:background">@drawable/button_green_bg</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="IMHyperText">
+        <item name="android:textSize">@dimen/NormalTextSize</item>
+        <item name="android:textColor">@color/hyper_text</item>
+        <item name="android:background">@null</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+
+    <style name="IMTbleLine">
+        <item name="android:background">@color/item_color1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+
+    <style name="IMTbleLine1">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+
+    <style name="IMTbleLine2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
+    </style>
+
+    <style name="IMTbleLine_UP_">
+        <item name="android:background">@color/item_color1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_me_height</item>
+        <item name="android:minHeight">60dp</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+
+    <style name="IMTbleLine_UP_Me">
+        <item name="android:background">@color/item_color1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:minHeight">60dp</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">0dp</item>
+    </style>
+
+    <style name="IMTbleLine_UP">
+        <item name="android:background">@color/item_color2</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
+
+    <style name="IMTbleLine_TextKey">
+        <item name="android:textSize">@dimen/NormalTextSize</item>
+        <item name="android:textColor">@color/dark_dark_grey</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+
+    <style name="IMTbleLine_TextValue">
+        <item name="android:textColorHint">@color/grey</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:gravity">right</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+
+    <style name="Doc_Img">
+        <item name="android:layout_width">@dimen/next_width</item>
+        <item name="android:layout_height">@dimen/next_height</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">@drawable/oa_next</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:contentDescription">@string/app_name</item>
+    </style>
+
+    <style name="IMTbleLine_ArrowImg">
+        <item name="android:layout_width">@dimen/next_width</item>
+        <item name="android:layout_height">@dimen/next_height</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">@drawable/oa_next</item>
+    </style>
+
+    <style name="ChattingUISystem">
+        <item name="android:textSize">14.0dip</item>
+        <item name="android:textColor">#fff0f0f0</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="ChattingUISplit">
+        <item name="android:textSize">12.0dip</item>
+        <item name="android:textColor">@color/light_grey</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:background">@null</item>
+        <item name="android:paddingTop">11.0dip</item>
+        <item name="android:paddingBottom">6.0dip</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">6.0dip</item>
+        <item name="android:layout_marginBottom">6.0dip</item>
+        <item name="android:shadowColor">#a0ffffff</item>
+        <item name="android:shadowDx">1.2</item>
+        <item name="android:shadowDy">1.2</item>
+        <item name="android:shadowRadius">1.0</item>
+    </style>
+
+    <style name="ChattingUIContent">
+        <item name="android:orientation">horizontal</item>
+        <item name="android:paddingLeft">6.0dip</item>
+        <item name="android:paddingRight">6.0dip</item>
+        <item name="android:paddingBottom">10.0dip</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="ChooserTheme" parent="android:Theme.Light"/>
+
+    <style name="fileChooserName">
+        <item name="android:drawablePadding">@dimen/list_item_padding</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:paddingLeft">@dimen/list_item_padding</item>
+        <item name="android:paddingRight">@dimen/list_item_padding</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+    </style>
+
+    <!--erp 字体-->
+    <style name="text_black_16">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <!-- erp 自定义对话框 -->
+    <style name="blend_theme_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+    <!--<item name="android:layout_marginTop">20dp</item>-->
+    <!--        <item name="android:layout_marginBottom">15dp</item>-->
+    <style name="form_linear_customer">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/ry_setting_selector</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="form_relative_right_text">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginLeft">130dp</item>
+        <item name="android:background">@drawable/shape_from_edit</item>
+        <item name="android:gravity">left|center_vertical</item>
+        <item name="android:maxWidth">290dp</item>
+        <item name="android:minHeight">35dp</item>
+        <item name="android:maxHeight">150dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:width">160dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textColorHint">@color/gray</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+
+    <style name="item_menu">
+        <item name="android:background">@color/me_menu_item_normal</item>
+        <item name="android:textColor">@color/text_normal</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_marginTop">2px</item>
+        <item name="android:layout_height">@dimen/item_height_min</item>
+        <item name="android:padding">6dp</item>
+    </style>
+
+    <style name="item_edit_long_menu">
+        <item name="android:background">@color/me_menu_item_normal</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_marginTop">2px</item>
+        <item name="android:layout_height">@dimen/item_height_edit</item>
+        <item name="android:padding">6dp</item>
+    </style>
+
+    <style name="item_menu_tag">
+        <item name="android:ellipsize">end</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">@color/text_normal</item>
+        <item name="android:gravity">left|center_vertical</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:minWidth">90dp</item>
+        <item name="android:lines">1</item>
+        <item name="android:maxWidth">100dp</item>
+    </style>
+
+    <style name="item_menu_input">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:background">@null</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">@color/gray</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:gravity">right|center_vertical</item>
+        <item name="android:textColorHint">@color/gray</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+    <!-- 日报详情总结、计划、心得内容显示样式-->
+    <style name="form_relative_right_text1">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">top</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:minHeight">20dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:width">160dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:textColorHint">@color/white</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <!-- 添加日报总结、计划、心得内容显示样式-->
+    <style name="form_relative_right_text2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">top</item>
+        <item name="android:minHeight">120dp</item>
+        <item name="android:maxHeight">800dp</item>
+        <item name="android:textColorHint">#969595</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:paddingTop">1dp</item>
+        <item name="android:background">@null</item>
+
+    </style>
+
+    <!--按钮样式-->
+    <style name="button_style_one">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:background">@drawable/btn_selector_shape_one</item>
+        <item name="android:textColor">@color/light_green</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+    </style>
+
+    <!--基础的Linear风格  -->
+    <style name="basic_linear_style">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+    </style>
+
+    <style name="basic_linear_style_one">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+    <!--任务Task  自定义样式背景 -->
+    <style name="linear_task_background" parent="basic_linear_style">
+        <item name="android:background">@color/white</item>
+    </style>
+
+    <!-- 我的任务 -->
+    <style name="task_text_right">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">3.0</item>
+        <item name="android:maxLines">5</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">center</item>
+        <item name="android:text">未填写</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:textColor">@color/dimgrey</item>
+    </style>
+
+    <!-- 横向线条-->
+    <style name="line_horizontal_style_one">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0.1dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:background">#80008B00</item>
+    </style>
+
+    <!-- form表单  请假单,特殊考勤等单据 -->
+    <style name="form_relative_customer">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <style name="form_relative_customer2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+
+    <style name="Smile">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="Smile.TextView">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Smile.TextView._White">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="form_relative_customer_item">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:background">@drawable/ry_setting_selector</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
     <style name="CustomProgressDialog" parent="@style/CustomDialog">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
     </style>
+
     <style name="CustomDialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
@@ -12,5 +525,703 @@
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
-    
+
+    <style name="text_black_18">
+        <item name="android:textSize">18dp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="horizontal_layout">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <!-- <item name="android:background">@drawable/filemanagermenubg_w</item> -->
+    </style>
+
+    <!-- 表格样式 -->
+    <style name="vertical_layout">
+        <item name="android:layout_width">1dp</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@drawable/domo_toolbar_bg</item>
+    </style>
+
+    <style name="form_relative_left_image">
+        <item name="android:layout_width">30dp</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginTop">15dp</item>
+        <item name="android:layout_marginBottom">15dp</item>
+        <item name="android:contentDescription">@string/app_name</item>
+    </style>
+
+
+    <style name="form_relative_left_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:gravity">right</item>
+        <item name="android:textColor">@color/text_main</item>
+        <item name="android:textSize">@dimen/text_main</item>
+    </style>
+
+    <style name="form_relative_left_text2">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:gravity">right</item>
+        <item name="android:textColor">@color/text_main</item>
+        <item name="android:textSize">@dimen/text_main</item>
+    </style>
+
+    <style name="app_comm_list_line_gray">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1.5dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:background">@drawable/line</item>
+        <item name="android:contentDescription">@string/app_name</item>
+    </style>
+
+    <style name="from_button_base_white">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:textSize">@dimen/text_main</item>
+        <item name="android:textColor">@color/text_main</item>
+    </style>
+
+    <style name="from_button_base_bule">
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:textSize">@dimen/text_main</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">40dp</item>
+        <item name="android:layout_marginRight">40dp</item>
+        <item name="android:background">@drawable/bg_btn</item>
+    </style>
+    <!--适用于考勤单据修改后style-->
+    <style name="from_button_base_bule2">
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:textSize">@dimen/text_main</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">40dp</item>
+        <item name="android:layout_marginRight">40dp</item>
+        <item name="android:background">@drawable/bg_btn</item>
+    </style>
+
+    <style name="item_relative_style_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginBottom">7dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginTop">7dp</item>
+    </style>
+
+    <style name="item_relative_style_value">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:maxWidth">280dip</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/blue</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginBottom">7dp</item>
+        <item name="android:layout_marginTop">7dp</item>
+    </style>
+
+
+    <style name="TagGroup">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="atg_isAppendMode">false</item>
+        <item name="atg_inputHint">@string/add_tag</item>
+        <item name="atg_borderColor">#49C120</item>
+        <item name="atg_textColor">#49C120</item>
+        <item name="atg_backgroundColor">#FFFFFF</item>
+        <item name="atg_dashBorderColor">#AAAAAA</item>
+        <item name="atg_inputHintColor">#80000000</item>
+        <item name="atg_inputTextColor">#DE000000</item>
+        <item name="atg_checkedBorderColor">#49C120</item>
+        <item name="atg_checkedTextColor">#FFFFFF</item>
+        <item name="atg_checkedMarkerColor">#FFFFFF</item>
+        <item name="atg_checkedBackgroundColor">#49C120</item>
+        <item name="atg_pressedBackgroundColor">#EDEDED</item>
+        <item name="atg_borderStrokeWidth">0.5dp</item>
+        <item name="atg_textSize">13sp</item>
+        <item name="atg_horizontalSpacing">8dp</item>
+        <item name="atg_verticalSpacing">4dp</item>
+        <item name="atg_horizontalPadding">12dp</item>
+        <item name="atg_verticalPadding">3dp</item>
+    </style>
+
+    <style name="TagGroup.Small" parent="TagGroup">
+        <item name="atg_textSize">10sp</item>
+        <item name="atg_horizontalSpacing">6dp</item>
+        <item name="atg_verticalSpacing">3dp</item>
+        <item name="atg_horizontalPadding">8dp</item>
+        <item name="atg_verticalPadding">2dp</item>
+    </style>
+
+    <style name="TagGroup.Large" parent="TagGroup">
+        <item name="atg_borderStrokeWidth">0.7dp</item>
+        <item name="atg_textSize">15sp</item>
+        <item name="atg_horizontalSpacing">9dp</item>
+        <item name="atg_verticalSpacing">5dp</item>
+        <item name="atg_horizontalPadding">14dp</item>
+        <item name="atg_verticalPadding">4dp</item>
+    </style>
+
+    <style name="TagGroup.Beauty_Red" parent="TagGroup">
+        <item name="atg_borderColor">#FF3D7F</item>
+        <item name="atg_textColor">#FF3D7F</item>
+        <item name="atg_checkedBorderColor">#FF3D7F</item>
+        <item name="atg_checkedBackgroundColor">#FF3D7F</item>
+    </style>
+
+    <style name="TagGroup.Beauty_Red.Inverse" parent="TagGroup">
+        <item name="atg_borderColor">#FF3D7F</item>
+        <item name="atg_textColor">#FFFFFF</item>
+        <item name="atg_backgroundColor">#FF3D7F</item>
+        <item name="atg_inputHintColor">#80FFFFFF</item>
+        <item name="atg_inputTextColor">#DEFFFFFF</item>
+        <item name="atg_checkedBorderColor">#FF3D7F</item>
+        <item name="atg_checkedTextColor">#FF3D7F</item>
+        <item name="atg_checkedMarkerColor">#FF3D7F</item>
+        <item name="atg_checkedBackgroundColor">#FFFFFF</item>
+        <item name="atg_pressedBackgroundColor">#FF99B1</item>
+    </style>
+
+
+    <!--crm-->
+
+
+    <style name="crm_tv_card_topLeft">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">15dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">0dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginTop">2dp</item>
+        <item name="android:layout_marginBottom">2dp</item>
+        <item name="android:layout_alignParentLeft">true</item>
+    </style>
+
+    <style name="crm_tv_card_topLeftTitle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/gray</item>
+        <item name="android:layout_margin">10dp</item>
+    </style>
+
+    <style name="crm_ib_card_topRight">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">10dp</item>
+        <item name="android:layout_alignParentRight">true</item>
+    </style>
+
+    <style name="crm_ll_card">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">310dp</item>
+
+        <item name="android:orientation">vertical</item>
+        <item name="android:background">@drawable/shape_crm_card</item>
+    </style>
+
+    <style name="crm_ll_card_click">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">310dp</item>
+        <item name="android:layout_margin">10dp</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:background">@drawable/shape_crm_card_click</item>
+    </style>
+
+    <style name="crm_card_round_tv">
+        <item name="android:layout_width">80dp</item>
+        <item name="android:layout_height">50dp</item>
+
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginRight">1dp</item>
+        <item name="android:gravity">center_vertical|left</item>
+
+    </style>
+
+    <style name="crm_ll_card_ranking">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:layout_marginRight">2dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:weightSum">5</item>
+    </style>
+
+    <style name="crm_tv_ranking_left">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginRight">3dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_weight">2</item>
+        <item name="android:text">"第__名"</item>
+    </style>
+
+    <style name="crm_tv_ranking_right">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_marginLeft">3dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:text">"__万元"</item>
+    </style>
+    <!--crm sale-->
+    <style name="crm_ll_sale" parent="LinearLayout_horizontal">
+        <item name="android:weightSum">2</item>
+    </style>
+
+    <style name="crm_ll_sale_item" parent="LinearLayout_horizontal">
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+    </style>
+
+    <style name="crm_tv_sale_title_value" parent="TextView_Basic">
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="crm_tv_sale_title" parent="TextView_Basic">
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <!--crm business-->
+    <style name="crm_business_btn">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_margin">5dp</item>
+        <item name="android:background">@drawable/shape_btn_bussine</item>
+    </style>
+
+    <style name="crm_business_btn_nomargin">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:padding">10dp</item>
+        <item name="android:background">@drawable/shape_btn_nomargin</item>
+    </style>
+
+    <style name="crm_business_btn_single">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">10dp</item>
+        <item name="android:layout_margin">5dp</item>
+        <item name="android:background">@drawable/shape_btn_bussine</item>
+    </style>
+
+    <!--共有style-->
+    <style name="missiion_style" parent="@style/ListViewBasic">
+        <item name="android:dividerHeight">2px</item>
+    </style>
+
+    <style name="ListViewBasic">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:divider">#00000000</item>
+        <item name="android:dividerHeight">20dp</item>
+        <item name="android:headerDividersEnabled">false</item>
+        <item name="android:footerDividersEnabled">true</item>
+        <item name="android:scrollbars">none</item>
+        <item name="android:scrollingCache">false</item>
+        <item name="android:listSelector">@android:color/transparent</item>
+    </style>
+    <!--单据列表显示style-->
+    <style name="ListViewdoc">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:divider">#00000000</item>
+        <item name="android:dividerHeight">5dp</item>
+        <item name="android:scrollingCache">false</item>
+        <item name="android:headerDividersEnabled">false</item>
+        <item name="android:footerDividersEnabled">true</item>
+        <item name="android:scrollbars">none</item>
+        <item name="android:listSelector">@android:color/transparent</item>
+    </style>
+
+    <!--通用PullToRefreshListView列表显示间隙style-->
+    <style name="general_Line_clearance">
+        <item name="android:divider">@drawable/bg_bar</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:dividerHeight">5dp</item>
+        <item name="android:scrollingCache">false</item>
+    </style>
+
+    <style name="GridViewBasic">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:scrollbars">none</item>
+        <item name="android:listSelector">@android:color/transparent</item>
+    </style>
+
+    <style name="GridViewSaleRanking" parent="GridViewBasic">
+        <item name="android:verticalSpacing">10dp</item>
+        <item name="android:horizontalSpacing">10dp</item>
+        <item name="android:numColumns">2</item>
+        <!--  <item name="android:columnWidth"></item>-->
+    </style>
+
+
+    <style name="LinearLayout_horizontal">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+    </style>
+
+    <style name="LinearLayout_vertical">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="TextView_VerticalCenter">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:gravity">left</item>
+    </style>
+
+    <style name="TextView_Basic">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="TextView_Basic_match">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+    <!--横虚线-->
+    <style name="app_line_xuxian_horizontal_05p">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">5dp</item>
+        <item name="android:background">@drawable/shape_line_xuxian</item>
+    </style>
+    <!--横线-->
+    <style name="app_line_gray_1dp">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0.5dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:background">@color/item_line</item>
+    </style>
+    <!--横线-->
+    <style name="app_line_horizontal_05p">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/item_line</item>
+    </style>
+    <!--竖线-->
+    <style name="app_line_v_1dp">
+        <item name="android:layout_width">0.5dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:background">@color/gray_light</item>
+    </style>
+
+    <!--横线-->
+    <style name="expense_table_h_1dp">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/black</item>
+    </style>
+    <!--竖线-->
+    <style name="expense_table_v_1dp">
+        <item name="android:layout_width">1dp</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:background">@color/black</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+    <!--动画-->
+    <style name="Animation.CustomPopup" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/pop_in</item>
+        <item name="android:windowExitAnimation">@anim/pop_out</item>
+    </style>
+
+    <style name="sign_imageview">
+        <item name="android:layout_width">15dp</item>
+        <item name="android:layout_height">15dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:src">@drawable/ic_flag</item>
+    </style>
+
+    <!--TabPageIndicatorStyle-->
+    <style name="StyledIndicators" parent="@style/AppTheme">
+        <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
+        <item name="vpiUnderlinePageIndicatorStyle">@style/CustomUnderlinePageIndicator</item>
+    </style>
+
+    <style name="CustomTabPageIndicator" parent="Widget.TabPageIndicator">
+        <!-- 点击时在不同状态下显示的背景色 -->
+        <!--<item name="android:background">@drawable/vpi__tab_indicator</item>-->
+        <item name="android:background">#00000000</item>
+        <!-- 分割线图片设置 -->
+        <item name="android:divider">@drawable/dividing_line</item>
+        <!-- 设置分割线的显示位置,或是不显示 -->
+        <item name="android:showDividers">middle</item>
+
+        <item name="android:textAppearance">@style/CustomTabPageIndicator.Text</item>
+        <item name="android:textColor">@drawable/selector_subscribe_tab</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:dividerPadding">10dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:fadingEdgeLength">10dp</item>
+        <item name="android:fadingEdge">horizontal</item>
+    </style>
+
+    <style name="CustomTabPageIndicator.Text" parent="android:TextAppearance.Medium">
+        <item name="android:typeface">monospace</item>
+        <!--<item name="android:textColor">@color/selector_subscribe_manage</item>-->
+    </style>
+
+    <style name="CustomUnderlinePageIndicator">
+        <item name="selectedColor">@color/orange</item>
+        <item name="android:background">#FFCCCCCC</item>
+        <!--<item name="android:textColor">@drawable/selector_subscribe_tab</item>-->
+        <!--<item name="fadeLength">1000</item>
+        <item name="fadeDelay">1000</item>-->
+    </style>
+
+    <!-- PopupWindow窗口动画 -->
+    <style name="MenuAnimationFade">
+        <item name="android:windowEnterAnimation">@anim/popup_fade_in</item>
+        <item name="android:windowExitAnimation">@anim/popup_fade_out</item>
+    </style>
+
+    <style name="ACPLDialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <!--umeng-->
+    <style name="umeng_socialize_action_bar_itemlayout">
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="umeng_socialize_action_bar_item_im">
+        <item name="android:layout_width">25dp</item>
+        <item name="android:layout_height">25dp</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+
+    <style name="umeng_socialize_action_bar_item_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:text">999</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="umeng_socialize_popup_dialog_anim" parent="@style/umeng_socialize_popup_dialog">
+        <item name="android:windowAnimationStyle">@style/umeng_socialize_dialog_animations</item>
+    </style>
+
+    <style name="umeng_socialize_popup_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+
+    <style name="umeng_socialize_dialog_animations">
+        <item name="android:windowEnterAnimation">@anim/umeng_socialize_slide_in_from_bottom</item>
+        <item name="android:windowExitAnimation">@anim/umeng_socialize_slide_out_from_bottom</item>
+    </style>
+
+    <style name="umeng_socialize_dialog_anim_fade">
+        <item name="android:windowEnterAnimation">@anim/umeng_socialize_fade_in</item>
+        <item name="android:windowExitAnimation">@anim/umeng_socialize_fade_out</item>
+    </style>
+
+    <style name="umeng_socialize_shareboard_animation">
+        <item name="android:windowEnterAnimation">@anim/umeng_socialize_shareboard_animation_in
+        </item>
+        <item name="android:windowExitAnimation">@anim/umeng_socialize_shareboard_animation_out
+        </item>
+    </style>
+
+    <style name="Theme.UMDialog" parent="android:style/Theme.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.UMDefault" parent="android:style/Theme.NoTitleBar"></style>
+
+    <style name="umeng_socialize_divider">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/umeng_socialize_divider</item>
+    </style>
+
+    <style name="umeng_socialize_list_item">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">55dp</item>
+        <item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:paddingTop">5dp</item>
+    </style>
+
+    <style name="umeng_socialize_edit_padding">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>
+        <item name="android:layout_marginLeft">6dp</item>
+        <item name="android:layout_marginRight">6dp</item>
+        <item name="android:layout_marginTop">6dp</item>
+        <item name="android:layout_marginBottom">6dp</item>
+    </style>
+
+    <!--Button-->
+    <style name="BlueButtonStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">20dp</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:background">@drawable/bg_blue_button</item>
+    </style>
+
+    <!--OA考勤单据修改新-EditView——style-->
+    <style name="Reason_Et">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">250dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
+        <item name="android:gravity">top</item>
+        <item name="android:background">@drawable/shape_from_edit</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="AnimBottom">
+        <item name="android:windowEnterAnimation">@anim/popup_enter</item>
+        <item name="android:windowExitAnimation">@anim/popup_exit</item>
+    </style>
+
+    <style name="noAnimation">
+        <item name="android:activityOpenEnterAnimation">@null</item>
+        <item name="android:activityOpenExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@null</item>
+        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:taskOpenEnterAnimation">@null</item>
+        <item name="android:taskOpenExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@null</item>
+        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskToFrontEnterAnimation">@null</item>
+        <item name="android:taskToFrontExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@null</item>
+        <item name="android:taskToBackExitAnimation">@null</item>
+    </style>
+    android:layout_width="0dp"
+    android:layout_weight="1"
+
+    <style name="calculator_item">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">50dp</item>
+    </style>
+
+    <style name="baseStyle">
+        <item name="android:background">@drawable/bg_main</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="bottomTextStyle">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:lines">1</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/titleBlue</item>
+        <item name="android:textSize">@dimen/BigTextSize</item>
+    </style>
+
+    <style name="approvalStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:orientation">horizontal</item>
+    </style>
+
+    <style name="approvalItemStyle">
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <!--<item name="android:maxLines">2</item>-->
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">top|left</item>
+        <item name="android:textSize">@dimen/text_hine</item>
+        <item name="android:textColor">@color/text_normal</item>
+    </style>
+
+    <style name="commonTextStyle">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:gravity">center|left</item>
+        <item name="android:textSize">@dimen/text_hine</item>
+        <item name="android:textColor">@color/text_normal</item>
+    </style>
+
 </resources>

+ 2 - 0
app_modular/applogin/build.gradle

@@ -21,4 +21,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7
+    
+    compile project(":common")
 }

+ 1 - 1
app_modular/applogin/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="base.android.com.applogin" />
+    package="com.modular.login" />

+ 227 - 0
app_modular/applogin/src/main/java/com/modular/login/LoginActivity.java

@@ -0,0 +1,227 @@
+package com.modular.login;
+
+import android.Manifest;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.android.volley.Response.ErrorListener;
+import com.android.volley.VolleyError;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.common.hmac.Md5Util;
+import com.common.preferences.PreferenceUtils;
+import com.common.system.PermissionUtil;
+import com.common.system.SystemUtil;
+import com.common.ui.ProgressDialogUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.LoginRegisterResult;
+import com.core.net.http.ViewUtil;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.CommonUtil;
+import com.core.utils.IntentUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+
+import java.util.HashMap;
+
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+
+
+public class LoginActivity extends BaseActivity implements View.OnClickListener {
+
+    private String PASS_WORDS = "PASS_WORDS";
+    private CircleImageView mHeader;
+    private EditText mPhoneNumberEdit;
+    private EditText mPasswordEdit;
+
+    private TextView tv_register;
+    private TextView tv_findPwd;
+    private String[] permissions = {Manifest.permission.READ_PHONE_STATE};
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+        getSupportActionBar().hide();
+        initView();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
+            AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (PermissionUtil.lacksPermissions(this, permissions)) {
+            PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permissions);
+        }
+        if (!MyApplication.getInstance().getBdLocationHelper().isLocationUpdate()) {
+            MyApplication.getInstance().getBdLocationHelper().requestLocation();
+        }
+        if (ViewUtil.mdProcessDialog!=null){
+            ViewUtil.mdProcessDialog.cancel();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
+            if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                LogUtil.i("没有获取到权限");
+            } else {
+                LogUtil.i("已经用户赋予权限获取到权限");
+            }
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    private void initView() {
+        mPhoneNumberEdit = (EditText) findViewById(R.id.phone_numer_edit);
+        mPasswordEdit = (EditText) findViewById(R.id.password_edit);
+        mHeader = (CircleImageView) findViewById(R.id.iv_head);
+        tv_findPwd = (TextView) findViewById(R.id.tv_findPwd);
+        tv_register = (TextView) findViewById(R.id.tv_register);
+        if (CommonUtil.getSharedPreferences(this, "user_phone") != null && CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
+            mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
+
+
+        }
+        if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
+            mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
+
+        }
+        //登陆账号
+        findViewById(R.id.login_btn).setOnClickListener(this);
+        tv_findPwd.setOnClickListener(this);
+        tv_register.setOnClickListener(this);
+        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
+            AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.login_btn:
+                login();
+                break;
+            case R.id.tv_register:
+              startActivity(new Intent(mContext,RegisterSelectActivity.class));
+                break;
+            case R.id.tv_findPwd:
+                IntentUtils.webLinks(mContext,
+                        "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
+                        getString(R.string.login_getpwd));
+                break;
+        }
+    }
+
+    private void login() {
+        final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
+        final String password = mPasswordEdit.getText().toString().trim();
+        PreferenceUtils.putString(this, PASS_WORDS, password);
+        if (TextUtils.isEmpty(phoneNumber)) {
+            ToastMessage(getString(R.string.login_account_empty));
+            return;
+        }
+        if (TextUtils.isEmpty(password)) {
+            ToastMessage(getString(R.string.login_pwd_empty));
+            return;
+        }
+        // 加密之后的密码
+        final String digestPwd = new String(Md5Util.toMD5(password));
+        final String requestTag = "login";
+        final ProgressDialog dialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait), true);
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialog) {
+                cancelAll(requestTag);
+            }
+        });
+        dialog.setProgressDrawable(mContext.getResources().getDrawable(R.drawable.progress_color));
+        ProgressDialogUtil.show(dialog);
+
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("telephone", Md5Util.toMD5(phoneNumber));// 账号登陆的时候需要MD5加密,服务器需求
+//		params.put("loginNo", phoneNumber);// 账号登陆的时候需要MD5加密,服务器需求
+        params.put("password", digestPwd);
+        // 附加信息
+        params.put("model", SystemUtil.getModel());
+        params.put("osVersion", SystemUtil.getOsVersion());
+        params.put("serial", SystemUtil.getDeviceId(MyApplication.getInstance()));
+        // 地址信息
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        if (latitude != 0)
+            params.put("latitude", String.valueOf(latitude));
+        if (longitude != 0)
+            params.put("longitude", String.valueOf(longitude));
+        final StringJsonObjectRequest<LoginRegisterResult> request = new StringJsonObjectRequest<LoginRegisterResult>(mConfig.USER_LOGIN,
+                new ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ProgressDialogUtil.dismiss(dialog);
+                        ToastUtil.showErrorNet(mContext);
+                    }
+                }, new StringJsonObjectRequest.Listener<LoginRegisterResult>() {
+
+            @Override
+            public void onResponse(ObjectResult<LoginRegisterResult> result) {
+                if (result == null) {
+                    ProgressDialogUtil.dismiss(dialog);
+                    ToastUtil.showErrorData(mContext);
+                    return;
+                }
+                boolean success = false;
+                if (result.getResultCode() == Result.CODE_SUCCESS) {
+                    success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
+                }
+                if (success) {
+                    login_manage(phoneNumber, password);
+                } else {
+                    String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
+                    ToastUtil.showToast(mContext, message);
+                }
+                ProgressDialogUtil.dismiss(dialog);
+            }
+        }, LoginRegisterResult.class, params);
+        request.setTag(requestTag);
+        addDefaultRequest(request);
+    }
+
+
+
+    private void login_manage(String phone, String password) {
+        if (TextUtils.isEmpty(phone)) {
+            return;
+        }
+        if (TextUtils.isEmpty(password)) {
+            return;
+        }
+        if (mContext == null) {
+            mContext = this;
+            return;
+        }
+        ViewUtil.LoginTask(phone, password, mContext);
+    }
+
+}

+ 115 - 0
app_modular/applogin/src/main/res/layout/activity_login.xml

@@ -0,0 +1,115 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EBE9E9"
+    android:fillViewport="true">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/iv_head"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="20dp"
+            android:layout_marginTop="50dp"
+            android:src="@drawable/login_header" />
+
+        <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="wrap_content"
+                android:background="@color/white"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:text="@string/login_account" />
+                <!--   android:drawableLeft="@drawable/login_user_name"-->
+                <com.core.widget.ClearEditText
+                    android:id="@+id/phone_numer_edit"
+                    style="@style/IMLineEditText"
+                    android:background="@color/white"
+                    android:hint="@string/please_input_phone_number"
+                    android:inputType="phone"
+                    android:paddingBottom="0dp"
+                    android:paddingTop="0dp" />
+            </LinearLayout>
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:text="@string/login_password" />
+                <!--    android:drawableLeft="@drawable/loginpw"-->
+                <com.core.widget.ClearEditText
+                    android:id="@+id/password_edit"
+                    style="@style/IMLineEditPass"
+                    android:background="@color/white"
+                    android:hint="@string/please_input_password" />
+            </LinearLayout>
+
+
+            <Button
+                android:id="@+id/login_btn"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/bg_bule_btn"
+                android:text="@string/login_button"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_findPwd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/ll_content"
+            android:layout_marginLeft="20dp"
+            android:text="@string/login_losspwd"
+            android:textColor="@color/titleBlue" />
+
+        <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:layout_marginRight="20dp"
+            android:text="@string/login_register"
+            android:textColor="@color/titleBlue" />
+    </RelativeLayout>
+</ScrollView>

+ 1 - 1
version.gradle

@@ -8,7 +8,7 @@ ext {
     android = [
             compileSdkVersion: 24,
             buildToolsVersion: '25.0.0',
-            minSdkVersion    : 16,
+            minSdkVersion    :9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 111,