Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -38,7 +38,6 @@ import com.uas.appworks.CRM.erp.activity.UserSelectActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -149,7 +148,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         switch (item.getItemId()) {
             case R.id.btn_save:
                 if (!isPower) {
-                    Crouton.makeText(ct, "您没有查看列表的权限");
+                    showToast( "您没有查看列表的权限");
                     return true;
                 }
                 if (tv_name.testValidity() &&
@@ -185,14 +184,14 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
                 String curtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
                 if (curtime.compareTo(time) > 0){
-                    Crouton.makeText(ct, "不能选择过去时间");
+                    showToast( "不能选择过去时间");
                     return;
                 }
                 if (b) {
                     tv_date_start.setText(time);
                 } else {
                     if (time.compareTo(tv_date_start.getText().toString()) < 0) {
-                        Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        showToast( "结束时间不能小于开始时间");
                     } else {
                         tv_date.setText(time);
                     }

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

@@ -24,7 +24,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -49,7 +50,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -75,7 +77,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -103,7 +106,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <EditText

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

@@ -35,8 +35,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="19dp"
                     android:layout_toRightOf="@id/name_tv"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -82,8 +82,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="8dp"
                     android:layout_toRightOf="@id/type_left"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -133,8 +133,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="8dp"
                     android:layout_toRightOf="@id/reimbursement_type"
                     android:text="*"
                     android:textColor="@color/red" />

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

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/oa_main"
-                tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetDetailsActivity">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
 
 
     <LinearLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/oa_background_orange"
+        android:background="#F4F4F4"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="10dp">
@@ -22,10 +20,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/padding"
             android:drawableTop="@drawable/oa_save_meet"
             android:gravity="center"
             android:text="@string/meet_details"
-            android:textColor="@color/white"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/add_task_ll"
@@ -33,10 +32,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/padding"
             android:drawableTop="@drawable/oa_add_task"
             android:gravity="center"
             android:text="@string/push_task"
-            android:textColor="@color/white"/>
+            android:textColor="#666666" />
     </LinearLayout>
 
     <RelativeLayout
@@ -45,24 +45,34 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/top"
         android:background="@color/white"
-        android:padding="10dp">
+        android:paddingRight="10dp"
+        android:paddingLeft="10dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="@dimen/padding">
 
         <TextView
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#333333"
+            android:textStyle="bold"
+            android:text="标题"
+            android:textSize="@dimen/text_main" />
 
         <TextView
             android:id="@+id/status_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
             android:textColor="@color/hintColor"
-            android:textSize="@dimen/text_hine"/>
+            android:textSize="@dimen/text_hine" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.1dp"
+            android:layout_below="@id/name_tv"
+            android:layout_marginTop="@dimen/padding"
+            android:background="@color/base_bg" />
 
         <TextView
             android:id="@+id/oa_meeting_start"
@@ -70,18 +80,23 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/name_tv"
             android:layout_marginTop="20dp"
+            android:drawableLeft="@drawable/ic_meeting_time"
+            android:drawablePadding="5dp"
             android:text="06月13日"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#666666"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/oa_meeting_start_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/oa_meeting_start"
             android:layout_below="@id/oa_meeting_start"
+            android:layout_marginLeft="18dp"
             android:layout_marginTop="5dp"
             android:text="16:00"
-            android:textColor="@color/powderblue"
-            android:textSize="30sp"/>
+            android:textColor="#000000"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/oa_meeting_line"
@@ -92,7 +107,8 @@
             android:layout_marginRight="5dp"
             android:layout_toRightOf="@+id/oa_meeting_start_date"
             android:text="—"
-            android:textSize="30sp"/>
+            android:textSize="30sp"
+            android:visibility="invisible" />
 
         <TextView
             android:id="@+id/oa_meeting_end_date"
@@ -101,8 +117,8 @@
             android:layout_alignTop="@+id/oa_meeting_start_date"
             android:layout_toRightOf="@+id/oa_meeting_line"
             android:text="18:00"
-            android:textColor="@color/powderblue"
-            android:textSize="30sp"/>
+            android:textColor="#000000"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/oa_meeting_end"
@@ -112,7 +128,8 @@
             android:layout_alignLeft="@+id/oa_meeting_end_date"
             android:layout_marginBottom="5dp"
             android:text="06月13日"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#666666"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/addr"
@@ -120,8 +137,10 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/oa_meeting_start_date"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_meeting_address"
+            android:drawablePadding="5dp"
             android:text="@string/meet_position"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/addr_tv"
@@ -133,38 +152,18 @@
             android:ellipsize="end"
             android:lines="1"
             android:text="@string/not_edit"
-            android:textColor="@color/text_hine"/>
-
-
-        <TextView
-            android:id="@+id/sub"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/addr_tv"
-            android:layout_marginTop="10dp"
-            android:text="@string/meet_show"
-            android:textColor="@color/hintColor"/>
-
-        <TextView
-            android:id="@+id/sub_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/sub"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@id/sub"
-            android:ellipsize="end"
-            android:lines="1"
-            android:text="无"
-            android:textColor="@color/text_hine"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/user"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/sub_tv"
+            android:layout_below="@id/addr_tv"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_people"
+            android:drawablePadding="5dp"
             android:text="@string/recorder"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/user_tv"
@@ -172,16 +171,17 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addr_tv"
             android:layout_alignTop="@id/user"
-            android:textColor="@color/text_hine"/>
-
+            android:textColor="@color/text_hine" />
         <TextView
             android:id="@+id/tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/user_tv"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_sub"
+            android:drawablePadding="5dp"
             android:text="@string/meet_tag"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/tag_tv"
@@ -190,58 +190,51 @@
             android:layout_alignLeft="@id/addr_tv"
             android:layout_alignTop="@id/tag"
             android:text="无"
-            android:textColor="@color/text_hine"/>
+            android:textColor="#666666" />
+        <TextView
+            android:id="@+id/sub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tag_tv"
+            android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_label"
+            android:drawablePadding="5dp"
+            android:text="@string/meet_show"
+            android:textColor="#666666" />
+
+        <TextView
+            android:id="@+id/sub_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/sub"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/sub"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="无"
+            android:textColor="#666666" />
+
+
+
+
     </RelativeLayout>
 
     <Button
         android:id="@+id/click_btn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/commonButtonStyle"
         android:layout_below="@+id/info"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/bg_orange_btn"
-        android:padding="10dp"
-        android:text="@string/signin_new"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main"/>
+        android:text="@string/signin_new" />
 
 
-    <RelativeLayout
-        android:id="@+id/baidu_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/click_btn"
-        android:layout_marginTop="10dp">
-
-        <TextView
-            android:id="@+id/location_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginRight="20dp"
-            android:layout_toLeftOf="@id/location_tag"
-            android:ellipsize="end"
-            android:lines="1"/>
-
-        <TextView
-            android:id="@+id/location_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="30dp"
-            android:clickable="true"
-            android:text="@string/agare"
-            android:textColor="@color/blue"/>
-    </RelativeLayout>
-
     <LinearLayout
         android:id="@+id/click_ll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/baidu_ll"
-        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/click_btn"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:orientation="horizontal">
 
@@ -249,25 +242,52 @@
             android:id="@+id/num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/signin_number"/>
+            android:text="@string/signin_number" />
 
         <View
             android:layout_width="6dp"
-            android:layout_height="1dp"/>
+            android:layout_height="1dp" />
 
         <TextView
             android:id="@+id/num_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/click_finds"
-            android:textColor="@color/blue"/>
+            android:textColor="#1084D1" />
     </LinearLayout>
 
+    <RelativeLayout
+        android:id="@+id/baidu_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/click_ll"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            android:id="@+id/location_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:lines="1" />
+
+        <TextView
+            android:id="@+id/location_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_toRightOf="@id/location_tv"
+            android:clickable="true"
+            android:text="@string/agare"
+            android:textColor="#1084D1" />
+    </RelativeLayout>
+
     <TextView
         android:id="@+id/end_meet_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/endmeeting"/>
+        android:background="@drawable/endmeeting" />
 
 </RelativeLayout>

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

@@ -10,8 +10,12 @@
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/item_color1"
         app:tabGravity="fill"
+        android:background="@color/white"
+        app:tabIndicatorColor="#33A2EE"
+        app:tabIndicatorHeight="4dp"
+        app:tabSelectedTextColor="#1084D1"
+        app:tabTextColor="#666666"
         app:tabMode="fixed" />
 
     <android.support.v4.view.ViewPager

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

@@ -274,7 +274,6 @@
                     android:layout_height="wrap_content"
                     android:visibility="visible"
                     android:dividerHeight="0dp"
-                    android:background="#ebe9e9"
                     >
                 </com.core.widget.MyListView>
 

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

@@ -55,8 +55,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="70dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
         <TextView
@@ -102,8 +102,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="70dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
         <TextView
@@ -146,8 +146,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="70dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
         <TextView
@@ -394,8 +394,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="100dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginLeft="96dp"
+            android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
         <TextView

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

@@ -16,7 +16,8 @@
         <TextView
             android:id="@+id/tv_less_key"
             style="@style/TextView_Basic"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
+            android:maxWidth="60dp"
             android:layout_gravity="center_vertical"
             android:layout_marginBottom="10dp"
             android:layout_marginLeft="10dp"
@@ -30,7 +31,7 @@
             android:id="@+id/muchInputTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="10dp"
             android:text="*"
             android:textColor="@color/red"
             android:visibility="gone" />

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

@@ -16,8 +16,8 @@
         android:src="@drawable/ic_loading" /> -->
       <ProgressBar
         android:id="@+id/imageViewLoading"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_centerInParent="true"
         android:indeterminateDrawable="@drawable/frame_loading" />
 

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

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--String-->
-
-    <!--end String-->
-
-    <!--Color-->
-    <color name="oa_main">#f4f4f5</color>
-    <!--listView 中对于 contentView的settag方法参数定义 -->
-    <item name="position" type="id"></item>
-    <!--end Color-->
-
-
-    <!--Style-->
-    <!--共有对象-->
-    <style name="oa_btn_style">
-        <item name="android:layout_width">40dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:clickable">false</item>
-    </style>
-
-    <!-- 进度条-->
-    <style name="StyleProgressBarMini" parent="@android:style/Widget.ProgressBar.Horizontal">
-        <item name="android:maxHeight">50dip</item>
-        <item name="android:minHeight">14dip</item>
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:indeterminateDrawable">
-            @android:drawable/progress_indeterminate_horizontal
-        </item>
-        <item name="android:progressDrawable">@drawable/shape_progressbar_mini</item>
-    </style>
-
-    <!-- 考勤统计通通用属性-->
-    <style name="statistics_style">
-        <item name="android:layout_height">20dp</item>
-    </style>
-
-    <!-- 会议-->
-    <style name="add_meeting">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">50dp</item>
-        <item name="android:clickable">true</item>
-    </style>
-    <!-- 添加考勤组-->
-    <style name="add_signin">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/item_height</item>
-        <item name="android:background">@color/item_color2</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
-    </style>
-
-    <style name="add_signin_item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/item_height</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:background">@drawable/oa_signin_rl</item>
-        <item name="android:padding">10dp</item>
-    </style>
-
-    <style name="add_signin_tv">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-
-    <style name="add_signin_tv_main" parent="@style/add_signin_tv">
-        <item name="android:textSize">@dimen/text_main</item>
-        <item name="android:textColor">@color/text_main</item>
-        <item name="android:drawablePadding">8dp</item>
-
-    </style>
-
-    <style name="add_signin_tv_hine" parent="@style/add_signin_tv">
-        <item name="android:textSize">@dimen/text_hine</item>
-        <item name="android:textColor">@color/text_hine</item>
-        <item name="android:layout_marginLeft">10dp</item>
-    </style>
-
-    <style name="add_meet_tv">
-        <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_marginRight">10dp</item>
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:gravity">left</item>
-        <item name="android:padding">5dp</item>
-        <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <!--工作日志-->
-    <style name="style0">  
-            <item name="android:textSize">19dip</item>  
-            <item name="android:textColor">@color/text_main</item>  
-    </style>
-
-    <style name="style1">  
-            <item name="android:textSize">23dip</item>  
-            <item name="android:textColor">@color/text_hine</item>  
-            <item name="android:textStyle">italic</item>  
-    </style>
-
-    <style name="style_calender">  
-        <item name="android:layout_width">0dp</item>
-
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:divider">@null</item>
-        <item name="android:dividerHeight">0dp</item>
-        <item name="android:scrollbars">none</item>
-        <item name="android:scrollbarSize">0dp</item>
-    </style><!--end Style-->
-
-    <dimen name="drawable_padding">5dp</dimen>
-
-    <style name="text_color">  
-        <item name="android:textColor">#268508</item>
-        <item name="android:textSize">@dimen/text_main</item>
-    </style>
-</resources>

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

@@ -567,7 +567,7 @@
         <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:layout_marginLeft">10dp</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>
@@ -576,7 +576,7 @@
     <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_marginLeft">10dp</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>

app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.MenuItem;
 
 import com.core.base.StackActivity;
+import com.core.utils.CommonUtil;
 
 
 public class ActionBackActivity extends StackActivity {
@@ -108,6 +109,7 @@ public class ActionBackActivity extends StackActivity {
 
     @Override
     public void finish() {
+        CommonUtil.closeKeybord(this);
         super.finish();
         overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
     }

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -106,7 +106,7 @@ public class CommonUtil {
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
 //        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.41:8080/ERP/";
+//            baseUrl="http://192.168.253.243:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.52:9000/ERP/";
 

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

@@ -26,8 +26,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="6dp"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_title"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -50,15 +50,14 @@
                 android:id="@+id/detailsTV"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
                 android:gravity="bottom"
                 android:text="@string/task_detail" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="6dp"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="10dp"
                 android:layout_toRightOf="@id/detailsTV"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -98,8 +97,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"      
-                android:layout_marginLeft="2dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="31dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@id/tv_task_peoples"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -154,8 +153,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="6dp"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_startime"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -192,8 +191,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="6dp"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_task_startime"
                 android:text="*"
                 android:textColor="@color/red" />

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

@@ -3,7 +3,7 @@
     xmlns:editTextFormExample="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/line"
+    android:background="#f2f2f2"
     android:fillViewport="true">
 
     <LinearLayout
@@ -14,22 +14,22 @@
         <RelativeLayout
             android:id="@+id/ry_leave_man"
             style="@style/add_meeting"
-            android:background="@color/item_color2">
+            android:background="@color/white">
 
             <TextView
                 android:id="@+id/name_tag"
                 style="@style/form_relative_left_text"
                 android:text="@string/meeting_name"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <ImageView
                 android:id="@+id/voice_name_iv"
                 android:layout_width="10dp"
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/name_tag"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="@dimen/padding"
                 android:background="@drawable/btn_yuyin_nor"
                 android:visibility="visible" />
 
@@ -38,13 +38,18 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/name_tag"
-                android:hint="@string/common_input"
+                android:layout_toLeftOf="@+id/voice_name_iv"
+                android:hint="@string/common_input2"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_hine"
+                android:gravity="right|center"
                 android:inputType="text" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/start_rl"
@@ -57,11 +62,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/task_starttime"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/start_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -72,12 +77,15 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/start_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
+                android:gravity="center|right"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
+                android:hint="@string/common_select1" />
         </RelativeLayout>
-
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/end_rl"
@@ -89,11 +97,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/task_endtime"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/end_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -103,14 +111,17 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/end_tag"
+                android:gravity="center|right"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
+                android:hint="@string/common_select1" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
-
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
         <RelativeLayout
             android:id="@+id/location_rl"
             style="@style/add_meeting"
@@ -121,11 +132,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_position"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/location_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -134,9 +145,12 @@
                 android:id="@+id/location_et"
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
+                android:textSize="@dimen/text_hine"
                 android:layout_toRightOf="@id/location_tag"
+                android:textColor="@color/text_main"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select"
+                android:gravity="center|right"
+                android:hint="@string/common_select1"
                 android:lines="1" />
         </RelativeLayout>
 
@@ -171,11 +185,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/join_numer"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/users_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -183,11 +197,14 @@
             <TextView
                 android:id="@+id/users_tv"
                 style="@style/add_meet_tv"
+                android:textSize="@dimen/text_hine"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/users_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:gravity="center|right"
+                android:textColor="@color/text_main"
                 android:ellipsize="end"
-                android:hint="@string/common_select"
+                android:hint="@string/common_select1"
                 android:maxLines="4"
                 android:minLines="1"
 
@@ -196,7 +213,8 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/user_rl"
@@ -208,12 +226,15 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/administrators"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/user_tv"
                 style="@style/add_meet_tv"
+                android:textColor="@color/text_main"
                 android:layout_marginLeft="40dp"
+                android:textSize="@dimen/text_hine"
+                android:gravity="center|right"
                 android:layout_toRightOf="@id/user_tag" />
         </RelativeLayout>
 
@@ -221,9 +242,7 @@
             android:layout_width="match_parent"
             android:layout_height="10dp" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
+
 
         <RelativeLayout
             android:id="@+id/tag_rl"
@@ -233,7 +252,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1px"
+                android:layout_height="0.1dp"
                 android:background="@color/item_line" />
 
             <TextView
@@ -241,17 +260,23 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_tag"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/tag_et"
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_hine"
                 android:layout_toRightOf="@+id/tag_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select_not_must" />
+                android:gravity="center|right"
+                android:hint="@string/common_select1" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.1dp"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/meet_about"
             style="@style/add_meeting"
@@ -262,24 +287,29 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_show"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
-            <EditText
-                android:id="@+id/about_et"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@id/about_tag"
-                android:hint="@string/common_input1" />
 
             <ImageView
                 android:id="@+id/voice_introduce_iv"
                 android:layout_width="10dp"
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/about_tag"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="@dimen/padding"
                 android:background="@drawable/btn_yuyin_nor"
                 android:visibility="visible" />
+            <EditText
+                android:id="@+id/about_et"
+                style="@style/add_meet_tv"
+                android:layout_marginLeft="20dp"
+                android:gravity="center|right"
+                android:layout_toLeftOf="@+id/voice_introduce_iv"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
+                android:layout_toRightOf="@id/about_tag"
+                android:hint="@string/common_input2" />
+
         </RelativeLayout>
 
         <View
@@ -294,7 +324,7 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/add_schedule_for_meeter"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <com.core.widget.view.SwitchView
                 android:id="@+id/create_ric_sv"
@@ -307,7 +337,9 @@
 
         <Button
             android:id="@+id/bt_save"
-            style="@style/from_button_base_bule"
+            style="@style/commonButtonStyle"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:layout_marginBottom="30dp"
             android:layout_marginTop="20dp"
             android:text="@string/common_save_button"

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

@@ -53,25 +53,16 @@
                 android:paddingRight="@dimen/padding"
                 android:paddingTop="@dimen/paddingMin">
 
-
-                <ImageView
-                    android:id="@+id/oa_meeting_start_tag"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/padding"
-                    android:drawablePadding="5dp"
-                    android:src="@drawable/ic_meeting_time" />
-
                 <TextView
                     android:id="@+id/oa_meeting_start"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_toRightOf="@id/oa_meeting_start_tag"
                     android:drawablePadding="5dp"
                     android:gravity="center_vertical"
+                    android:text="06月13日"
+                    android:drawableLeft="@drawable/ic_meeting_time"
                     android:textColor="#666666"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="13sp"  />
 
                 <TextView
                     android:id="@+id/oa_meeting_start_date"
@@ -80,9 +71,11 @@
                     android:layout_alignLeft="@id/oa_meeting_start"
                     android:layout_below="@id/oa_meeting_start"
                     android:layout_marginTop="5dp"
+                    android:layout_marginLeft="18dp"
                     android:gravity="center_vertical"
+                    android:text="16:00"
                     android:textColor="#000000"
-                    android:textSize="30sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/oa_meeting_line"
@@ -94,19 +87,20 @@
                     android:layout_toRightOf="@+id/oa_meeting_start_date"
                     android:text="  "
                     android:textSize="30sp"
-                    android:visibility="gone" />
+                    android:visibility="invisible" />
 
                 <TextView
                     android:id="@+id/oa_meeting_end_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignTop="@+id/oa_meeting_start_date"
-                    android:layout_marginLeft="@dimen/padding"
+                    android:layout_marginLeft="30dp"
                     android:layout_toRightOf="@+id/oa_meeting_start_date"
                     android:drawableLeft="@null"
+                    android:text="16:00"
                     android:gravity="center_vertical"
                     android:textColor="#000000"
-                    android:textSize="30sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/oa_meeting_end"
@@ -117,8 +111,9 @@
                     android:layout_alignTop="@id/oa_meeting_start"
                     android:layout_marginBottom="5dp"
                     android:gravity="center_vertical"
+                    android:text="06月13日"
                     android:textColor="#666666"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="13sp"/>
 
                 <TextView
                     android:id="@+id/oa_meeting_addr"

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

@@ -1873,7 +1873,7 @@
     <string name="schedule_title_must_input">日程标题为必填项</string>
     <string name="schedule_detail_must_input">日程详情为必填项</string>
     <string name="not_camera_permission">摄像头权限被禁用，请到设置中开启权限！</string>
-    <string name="empty_more_visio">多见一个客户就多一个机会,\n现在就去做客户拜访吧 </string>
+    <string name="empty_more_visio">多见一个客户就多一个机会,\n现在就去做客户拜访吧！ </string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>

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

@@ -581,7 +581,7 @@
         <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:layout_marginLeft">10dp</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>

app_modular/appbooking/src/main/res/layout/activity_bbooking_add.xml

@@ -32,7 +32,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -59,7 +60,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -86,7 +88,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -116,7 +119,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -147,7 +151,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <EditText

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/SubscribeDetailActivity.java

@@ -39,7 +39,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.widget.crouton.Crouton;
+import com.core.utils.ToastUtil;
 import com.modular.appmessages.R;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -92,7 +92,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case REMOVE_MY_SUBSCRIPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, getString(R.string.subscribe_cancled));
+                   ToastUtil.showToast(mContext, getString(R.string.subscribe_cancled));
                     Intent myIntent = new Intent();
                     setResult(44, myIntent);
                     mApplyButton.setText(getString(R.string.subscribe_detail_commit));
@@ -100,7 +100,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, msg.getData().getString("result"));
+                    ToastUtil.showToast(mContext, msg.getData().getString("result"));
                     break;
             }
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionAdapter.java

@@ -20,8 +20,8 @@ import com.core.dao.DBManager;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
-import com.core.widget.crouton.Crouton;
 import com.modular.appmessages.R;
 
 import java.util.ArrayList;
@@ -156,7 +156,7 @@ public class AllSubscriptionAdapter extends BaseAdapter {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, msg.getData().getString("result"));
+                    ToastUtil.showToast(mContext, msg.getData().getString("result"));
                     break;
             }
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionNumbersAdapter.java

@@ -15,8 +15,8 @@ import com.core.app.Constants;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
-import com.core.widget.crouton.Crouton;
 import com.modular.appmessages.R;
 
 import java.util.HashMap;
@@ -142,7 +142,7 @@ public class AllSubscriptionNumbersAdapter extends BaseAdapter {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext,msg.getData().getString("result"));
+                   ToastUtil.showToast(mContext,msg.getData().getString("result"));
                     break;
             }
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/SubscriptionAllFragment.java

@@ -21,8 +21,8 @@ import com.core.dao.DBManager;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.EmptyLayout;
-import com.core.widget.crouton.Crouton;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.modular.appmessages.R;
@@ -121,13 +121,13 @@ public class SubscriptionAllFragment extends BaseFragment {
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete(500);
                     }
-                    Crouton.makeText(getActivity(), getString(R.string.common_notlinknet), 0xffff4444, 1500).show();
+                    ToastUtil.showToast(getActivity(), getString(R.string.common_notlinknet));
                 }
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-                Crouton.makeText(getActivity(), "上拉加载", 0xffff4444, 1500).show();
+                ToastUtil.showToast(getActivity(), "上拉加载" );
                 mPullToRefreshListView.postDelayed(new Runnable() {
                     @Override
                     public void run() {
@@ -433,7 +433,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                             mEmptyLayout.showEmpty();
                             if (mPullToRefreshListView.isRefreshing()) {
                                 mPullToRefreshListView.onRefreshComplete();
-                                Crouton.makeText(getActivity(), "没有未订阅数据", 0xff99cc00, 1500).show();
+                                ToastUtil.showToast(getActivity(), "没有未订阅数据");
                             }
                             keyStrings.clear();
                             mAllKeyStrings.clear();
@@ -548,14 +548,14 @@ public class SubscriptionAllFragment extends BaseFragment {
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete();
                         if (getActivity() != null)
-                            Crouton.makeText(getActivity(), "刷新成功", 0xff99cc00, 1500).show();
+                            ToastUtil.showToast(getActivity(), "刷新成功");
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     if (msg.getData().getString("result") != null)
                         if (getActivity() != null)
-                            Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xffff4444, 1500).show();
+                            ToastUtil.showToast(getActivity(), msg.getData().getString("result"));
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete();
                     } else {

app_modular/appmessages/src/main/res/layout/activity_approval_list.xml

@@ -39,8 +39,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="top|right"
-                    android:layout_marginRight="15dp"
-                    android:visibility="gone"
+                    android:layout_marginRight="25dp"
+                    android:visibility="visible"
                     android:background="@drawable/tab_unread_bg"
                     android:gravity="center"
                     android:text="99"

app_modular/appmessages/src/main/res/layout/item_message_header.xml

@@ -6,7 +6,7 @@
     android:background="@drawable/selector_item_white_pass"
     android:descendantFocusability="blocksDescendants"
     android:minHeight="@dimen/item_height"
-    android:paddingLeft="15dp"
+    android:paddingLeft="10dp"
     android:paddingRight="15dp">
 
     <FrameLayout

app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -62,6 +62,7 @@ public class SignUtils implements OnHttpResultListener {
             return;
         }
         lastTime = System.currentTimeMillis();
+        MyApplication.getInstance().getBdLocationHelper().requestLocation();
         final float dis = isSubmitAble();
         if (dis > 0) {
             final Bundle bundle = new Bundle();

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

@@ -7,18 +7,19 @@
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
-        app:cardElevation="@dimen/paddingMin"
+        app:cardElevation="1dp"
+        app:cardMaxElevation="1dp"
         app:cardCornerRadius="@dimen/paddingMin"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
         android:layout_marginLeft="@dimen/padding"
         android:layout_marginRight="@dimen/padding"
+        android:background="@color/white"
         android:layout_marginTop="5dp">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/white"
             android:padding="@dimen/padding">
 
             <de.hdodenhof.circleimageview.CircleImageView

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessLessActivity.java

@@ -29,7 +29,6 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.CommonInterface;
 import com.core.utils.CommonUtil;
 import com.core.widget.SingleDialog;
-import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
 import com.core.widget.view.ListViewInScroller;
 import com.uas.appworks.R;
@@ -178,7 +177,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result") + " type:" + type);
-                    Crouton.makeText(activity, 30, "操作成功!", Style.holoGreenLight, 2000).show();
+                    showToast("操作成功!" );
                     if (type == 2) {
                         updataSchedule(0x16);
                     } else {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -191,7 +191,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         setContentView(R.layout.activity_add_meeting);
         AndroidBug5497Workaround.assistActivity(this);
         ViewUtils.inject(this);
-
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         ct = this;
         initView();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetDetailsActivity.java

@@ -146,9 +146,9 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
 
     private void setSigninAble(boolean b) {
         if (b) {
-            click_btn.setBackgroundResource(R.drawable.bg_orange_btn);
+            click_btn.setBackgroundResource(R.drawable.selector_confirm_bg);
         } else {
-            click_btn.setBackgroundResource(R.drawable.bg_orange_btn_pass);
+            click_btn.setBackgroundResource(R.drawable.shape_corner_blue_unable_bg);
             click_btn.setText(R.string.signined);
             click_btn.setClickable(false);
             click_btn.setFocusable(false);
@@ -189,7 +189,20 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             else
                 str = getResources().getString(R.string.doing);
         }
-        status_tv.setText(str);
+
+        if (str!=null){
+            int statusColor=R.color.meeting_end_status;
+            if (getResources().getString(R.string.doing).equals(str)){
+                statusColor=R.color.meeting_start_status;
+            }else {
+                statusColor=R.color.meeting_end_status;
+            }
+            status_tv.setTextColor(getResources().getColor(statusColor));
+            status_tv.setText(str);
+        }else{
+            status_tv.setText("");
+        }
+
         //设置开始和结束时间的显示
         name_tv.setText(entity.getMa_theme() == null ? "" : entity.getMa_theme());
         long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetingActivity.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
@@ -41,7 +42,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-public class MeetingActivity extends BaseActivity  {
+public class MeetingActivity extends BaseActivity {
     private static final int PAGE_SIZE = 10;
     private final int whatLoad = 0x11;
     private int requestCode = 0x13;
@@ -90,6 +91,9 @@ public class MeetingActivity extends BaseActivity  {
                 entities = listdata;
             else entities.addAll(listdata);
         }
+        if (ListUtils.isEmpty(entities)){
+            mEmptyLayout.showEmpty();
+        }
         adapter.setData(entities);
     }
 
@@ -98,7 +102,7 @@ public class MeetingActivity extends BaseActivity  {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meeting);
         list_business = (PullToRefreshListView) findViewById(R.id.list_business);
-        voiceSearchView= (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         mEmptyLayout = new EmptyLayout(this, list_business.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
@@ -116,7 +120,6 @@ public class MeetingActivity extends BaseActivity  {
     }
 
     private void listener() {
-        list_business.setEmptyView(R.layout.view_empty);
         list_business.setMode(PullToRefreshBase.Mode.BOTH);
         list_business.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -142,9 +145,9 @@ public class MeetingActivity extends BaseActivity  {
                 if (entities == null || entities.size() <= 0) return;
                 for (MeetEntity e : entities) {
                     boolean b = false;
-                    try{
+                    try {
                         b = getResult(e.getMa_theme() + e.getMa_recorder(), strChche.trim());
-                    }catch (PatternSyntaxException r){
+                    } catch (PatternSyntaxException r) {
                         r.printStackTrace();
                     }
                     if (b) {
@@ -214,7 +217,6 @@ public class MeetingActivity extends BaseActivity  {
     }
 
 
-
     class MesstingAdapter extends BaseAdapter {
 
         private List<MeetEntity> entities;
@@ -273,20 +275,24 @@ public class MeetingActivity extends BaseActivity  {
             // 当会议开始时间<系统时间会议状态为进行中，当会议发起人点击结束会议按钮，
             // 状态更新为已结束，否则即使超过会议结束时间状态也是进行中
             String status = entities.get(i).getMa_stage();
-            int statusColor=R.color.meeting_end_status;
             if (status == null || status.trim().length() <= 0) {
-                if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime())<= System.currentTimeMillis()){
+                if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime()) <= System.currentTimeMillis()) {
                     status = getResources().getString(R.string.doing);
-                    statusColor=R.color.meeting_start_status;
-                }
-                else{
+                } else {
                     status = getResources().getString(R.string.not_bigan);
-                    statusColor=R.color.meeting_end_status;
                 }
+                entities.get(i).setMa_stage(status);
+            }
+            if (status != null) {
+                int statusColor = R.color.meeting_end_status;
+                if (getResources().getString(R.string.doing).equals(status)) {
+                    statusColor = R.color.meeting_start_status;
+                } else {
+                    statusColor = R.color.meeting_end_status;
+                }
+                viewholder.oa_meeting_status_tv.setText(status);
+                viewholder.oa_meeting_status_tv.setTextColor(getResources().getColor(statusColor));
             }
-            entities.get(i).setMa_stage(status);
-            viewholder.oa_meeting_status_tv.setTextColor(getResources().getColor(statusColor));
-            viewholder.oa_meeting_status_tv.setText(entities.get(i).getMa_stage());
             long startLong = TimeUtils.f_str_2_long(entities.get(i).getMa_starttime());
             long endLong = TimeUtils.f_str_2_long(entities.get(i).getMa_endtime());
             viewholder.oa_meeting_start.setText(DateFormatUtil.long2Str(startLong, "MM月dd日"));