11-10,样式大调 备份。

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UU5.5.1/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -26,9 +26,9 @@ public class WorkDailyAdapter extends BaseAdapter {
         this.mContext = mContext;
     }
 
-    public List<WorkDailyBean> getmWorkDailyBeanList() {
-        return mWorkDailyBeanList;
-    }
+//    public List<WorkDailyBean> getmWorkDailyBeanList() {
+//        return mWorkDailyBeanList;
+//    }
 
     public void setmWorkDailyBeanList(List<WorkDailyBean> mWorkDailyBeans) {
         this.mWorkDailyBeanList = mWorkDailyBeans;
@@ -65,11 +65,11 @@ public class WorkDailyAdapter extends BaseAdapter {
         }
 
     //时间返回为空时显示今日时间
-        if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
+      /*  if(mWorkDailyBeanList.get(position).getWD_DATE() == null){
             viewHolder.WorkDailyDate.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
-        }else{
+        }else{*/
             viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
-        }
+       // }
         //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
         if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
             viewHolder.WorkDailyStatus.setTextColor(Color.GREEN);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java

@@ -36,7 +36,8 @@ public class DailydetailsActivity extends BaseActivity {
     private String plan;
     private String experience;
     private String status;
-    private MyListView work_tasklv;
+    private MyListView complete_tasklv;
+    private MyListView uncomplete_tasklv;
     private MyListView approval_flowlv;
     private LinearLayout plan_ll;
     private LinearLayout experience_ll;
@@ -47,7 +48,6 @@ public class DailydetailsActivity extends BaseActivity {
     private EmptyLayout mEmptyLayput_approvalflow;
     private EmptyLayout mEmptyLayput_Task;
     private TextView no_task;
-    private RelativeLayout task_rl;
 
 
     @Override
@@ -68,10 +68,10 @@ public class DailydetailsActivity extends BaseActivity {
         wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
         plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
         experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
-        work_tasklv = (MyListView) findViewById(R.id.work_daily_detail_task_lv);
+        complete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_completedtask_lv);
+        uncomplete_tasklv = (MyListView) findViewById(R.id.work_daily_detail_uncompletedtask_lv);
         approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
         no_task = (TextView) findViewById(R.id.work_daily_detail_no_task);
-        task_rl = (RelativeLayout) findViewById(R.id.work_daily_detail_task_rl);
 
         //加载审批流的适配器
         mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
@@ -93,7 +93,7 @@ public class DailydetailsActivity extends BaseActivity {
 //        }
 
         //加载我的任务的适配器
-        mEmptyLayput_Task = new EmptyLayout(this, work_tasklv);
+        mEmptyLayput_Task = new EmptyLayout(this, complete_tasklv);
         mEmptyLayput_Task.setShowEmptyButton(false);
         mEmptyLayput_Task.setShowErrorButton(false);
         mEmptyLayput_Task.setShowLoadingButton(false);
@@ -108,7 +108,7 @@ public class DailydetailsActivity extends BaseActivity {
             mWorkTaskBeanList.add(workTaskBean);
         }
             mDailyDetailsWorkTaskAdapter.setmWorkTaskBeanList(mWorkTaskBeanList);
-            work_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
+            complete_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
 //        }
 
         //获取、处理、赋值从日报列表界面点击跳转传来的数据
@@ -116,7 +116,6 @@ public class DailydetailsActivity extends BaseActivity {
         date = intent.getStringExtra("Date");
         summary = intent.getStringExtra("Content");
         status = intent.getStringExtra("Status");
-
         if (!TextUtils.isEmpty(intent.getStringExtra("Plan"))) {
             plan = intent.getStringExtra("Plan");
         } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -14,6 +14,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
 
@@ -36,10 +37,10 @@ import java.util.Map;
  */
 public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchListener {
 
-    private FormEditText add_summary;
-    private FormEditText add_plan;
-    private FormEditText add_experience;
-    private Button add_submit;
+    private EditText add_summary;
+    private EditText add_plan;
+    private EditText add_experience;
+    private ImageView add_submit;
     private ImageView share_experience;
     private boolean imOk = false;
     private boolean erpOk = false;
@@ -108,10 +109,10 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        setContentView(R.layout.activity_add_work_daily);
        getSupportActionBar().setTitle("工作日报");
 
-       add_summary = (FormEditText) findViewById(R.id.add_work_daily_summary_et);
-       add_plan = (FormEditText) findViewById(R.id.add_work_daily_plan_et);
-       add_experience = (FormEditText) findViewById(R.id.add_work_daily_experience_et);
-       add_submit = (Button) findViewById(R.id.add_work_daily_submitted_btn);
+       add_summary = (EditText) findViewById(R.id.add_work_daily_summary_et);
+       add_plan = (EditText) findViewById(R.id.add_work_daily_plan_et);
+       add_experience = (EditText) findViewById(R.id.add_work_daily_experience_et);
+       add_submit = (ImageView) findViewById(R.id.add_work_daily_submit_iv);
        share_experience = (ImageView) findViewById(R.id.add_work_daily_sharing_experience_im);
 /*
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java

@@ -9,6 +9,7 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
@@ -21,6 +22,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -36,7 +38,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Created by FANGlh on 2016/11/1.
  */
@@ -59,7 +60,8 @@ public class WorkDailyShowActivity extends BaseActivity {
     public void initView() {
         setContentView(R.layout.activity_work_daily);
         getSupportActionBar().setTitle("日报记录");
-        mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
+        mSearchEt = (ClearEditText) findViewById(R.
+                id.work_daily_search_edit);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
 
         mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
@@ -91,13 +93,18 @@ public class WorkDailyShowActivity extends BaseActivity {
 
                 List<WorkDailyBean> chche = new ArrayList<>();
 
-                if (mWorkDailyList == null || mWorkDailyList.size() <= 0) return;
-                for (WorkDailyBean wd : mWorkDailyList) {
-                    boolean b = getResult(wd.getWD_DATE() + wd.getWD_COMMENT() + wd.getSTATUS(), strChche.trim());
-                    if (b) {
-                        chche.add(wd);
+                if (mWorkDailyList == null || mWorkDailyList.size() <= 0) {
+                    mEmptyLayout.showEmpty();
+                    return;
+                }else{
+                    for (WorkDailyBean wd : mWorkDailyList) {
+                        boolean b = getResult(wd.getWD_DATE() + wd.getWD_COMMENT() + wd.getSTATUS(), strChche.trim());
+                        if (b) {
+                            chche.add(wd);
+                        }
                     }
                 }
+
                 mWorkDailyAdapter.setmWorkDailyBeanList(chche);
                 mWorkDailyAdapter.notifyDataSetChanged();
             }
@@ -171,11 +178,9 @@ public class WorkDailyShowActivity extends BaseActivity {
                         if (mCurrentPage == 1 && dailydataArray == null && mWorkDailyList.isEmpty()) {
                             mEmptyLayout.showEmpty();
                         } else {
-                            for (int i = 0; i < dailydataArray.length(); i++) {
-                                JSONObject currentObject = dailydataArray.getJSONObject(i);
-                                WorkDailyBean workDailyBean = JSON.parseObject(currentObject.toString(), WorkDailyBean.class);
-                                mWorkDailyList.add(workDailyBean);
-                            }
+                          //  Log.i("aaaaa",dailydataArray.toString());
+                            mWorkDailyList=JSON.parseArray(dailydataArray.toString(),WorkDailyBean.class);
+                            mWorkDailyAdapter.setmWorkDailyBeanList(mWorkDailyList);
                             mWorkDailyAdapter.notifyDataSetChanged();
                         }
                     } catch (JSONException e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/AutoCreateChatFragment.java

@@ -51,6 +51,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -103,7 +104,6 @@ public class AutoCreateChatFragment extends EasyFragment {
         setHasOptionsMenu(true);
         getActivity().registerReceiver(mUpdateReceiver,
                 MucgroupUpdateUtil.getUpdateActionFilter());
-
     }
 
     @Override
@@ -149,7 +149,7 @@ public class AutoCreateChatFragment extends EasyFragment {
         mPullToRefreshListView.setAdapter(mAdapter);
 
         View emptyView = LayoutInflater.from(getActivity()).inflate(
-                R.layout.layout_list_empty_view, null);
+                R.layout.view_empty, null);
         mPullToRefreshListView.setEmptyView(emptyView);
 
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -36,6 +36,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -73,6 +74,7 @@ public class GroupChatFragment extends EasyFragment {
 
     public GroupChatFragment() {
         mMucRooms = new ArrayList<MucRoom>();
+
         mAdapter = new MucRoomAdapter();
     }
 
@@ -82,7 +84,6 @@ public class GroupChatFragment extends EasyFragment {
         setHasOptionsMenu(true);
         getActivity().registerReceiver(mUpdateReceiver,
                 MucgroupUpdateUtil.getUpdateActionFilter());
-
     }
 
     @Override
@@ -134,7 +135,7 @@ public class GroupChatFragment extends EasyFragment {
     private void initView() {
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         View emptyView = LayoutInflater.from(getActivity()).inflate(
-                R.layout.layout_list_empty_view, null);
+                R.layout.view_empty, null);
         mPullToRefreshListView.setEmptyView(emptyView);
 
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
@@ -306,6 +307,7 @@ public class GroupChatFragment extends EasyFragment {
                             }
                         }
                     }
+
                     mAdapter.notifyDataSetChanged();
                 }
                 if (!b) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -427,6 +427,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
         } else {
             String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
+            Log.i("bbb",masterlist);
             List<Master> mList = JSON.parseArray(masterlist, Master.class);
             if (CommonUtil.isDialogShowing(mDialog)) {
                 return;

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

@@ -28,70 +28,58 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
                     android:layout_marginTop="8dp"
-                    android:background="@color/item_line" />
+                    android:background="@color/gainsboro" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作总结"
                     android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="8dp"
                     />
-                <com.andreabaccega.widget.FormEditText
+                <EditText
                     android:id="@+id/add_work_daily_summary_et"
-                    style="@style/form_relative_right_text"
+                    style="@style/form_relative_right_text2"
                     android:hint="请输入今日工作总结(必填)"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginTop="1dp"
-                    android:gravity="top"
-                    android:minHeight="120dp"
-                    android:padding="5dp"
-                    android:maxHeight="1000dp"
-
                     />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/lightgrey" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作计划"
                     android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"/>
-                <com.andreabaccega.widget.FormEditText
+                    android:layout_marginTop="8dp"/>
+                <EditText
                     android:id="@+id/add_work_daily_plan_et"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
+                    style="@style/form_relative_right_text2"
                     android:hint="请输入明日工作计划(非必填)"
-                    android:layout_marginTop="1dp"
-                    android:minHeight="120dp"
-                    android:padding="5dp"
-                    android:maxHeight="1000dp"/>
-
+                    />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/lightgrey" />
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     >
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="工作心得"
                         android:paddingLeft="20dp"
-                        android:layout_marginTop="1dp"
+                        android:layout_marginTop="8dp"
                         android:textSize="18sp"
                         />
                     <ImageButton
                         android:id="@+id/add_work_daily_sharing_experience_im"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
                         android:src="@drawable/icon_app_share"
                         android:layout_alignParentRight="true"
                         android:layout_marginTop="1dp"
@@ -100,31 +88,31 @@
                         android:visibility="visible"
                         />
                 </RelativeLayout>
-                <com.andreabaccega.widget.FormEditText
+                <EditText
                     android:id="@+id/add_work_daily_experience_et"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
+                    style="@style/form_relative_right_text2"
                     android:hint="点击分享按钮可将工作心得分享到工作圈(非必填)"
-                    android:minHeight="120dp"
-                    android:maxHeight="1000dp"
-                    android:layout_marginTop="1dp"
-                    android:padding="5dp" />
+                    />
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/ly_bottom_submit"
-                style="@style/form_linear_customer">
 
-                <Button
-                    android:id="@+id/add_work_daily_submitted_btn"
-                    style="@style/from_button_base_bule"
-                    android:layout_marginTop="10dp"
-                    android:textSize="20sp"
-                    android:text="提    交" />
-            </LinearLayout>
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+    <LinearLayout
+        android:id="@+id/ly_bottom_submit"
+        style="@style/form_linear_customer">
+
+        <ImageView
+            android:id="@+id/add_work_daily_submit_iv"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/submit3"
+            android:layout_marginTop="10dp"
+            android:textSize="20sp"
+            android:text="提    交"/>
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -30,6 +30,7 @@
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
+            android:paddingBottom="0dp"
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
@@ -38,7 +39,8 @@
     </RelativeLayout>
     <View
         style="@style/app_line_horizontal_05p"
-        android:layout_width="match_parent"></View>
+        android:layout_width="match_parent"
+        android:visibility="gone"></View>
     <LinearLayout
         android:id="@+id/ll_top_state"
         android:layout_width="match_parent"
@@ -98,6 +100,7 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         android:headerDividersEnabled="false"
+        android:dividerHeight ="10dp"
         style="@style/ListViewBasic">
     </com.handmark.pulltorefresh.library.PullToRefreshListView>
 

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

@@ -31,7 +31,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_margin="5dp"
+                    android:layout_margin="8dp"
                     android:background="@drawable/tab_icon4" />
 
                 <TextView
@@ -53,7 +53,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_margin="5dp"
+                    android:layout_margin="8dp"
                     android:background="@drawable/tab_icon1" />
 
                 <TextView
@@ -75,7 +75,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_margin="5dp"
+                    android:layout_margin="8dp"
                     android:background="@drawable/tab_icon2" />
 
                 <TextView
@@ -97,7 +97,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_margin="5dp"
+                    android:layout_margin="8dp"
                     android:background="@drawable/tab_icon3" />
 
                 <TextView
@@ -108,6 +108,12 @@
                     android:textColor="#ffffff" />
             </LinearLayout>
         </LinearLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </ScrollView>
         <!--我的排名-->
         <LinearLayout
             style="@style/crm_ll_card"

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

@@ -4,13 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:layout_marginRight="10dp"
+    android:layout_marginLeft="10dp"
     tools:context=".ui.erp.activity.oa.AlarmaActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
-        android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">
 
         <TextView
@@ -22,17 +23,19 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/auto_signin_sw"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />
     </RelativeLayout>
-
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/line"
+        android:background="@color/lightgrey" />
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
-        android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">
 
         <TextView
@@ -44,17 +47,19 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/isalarma_sw"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />
     </RelativeLayout>
-
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/line"
+        android:background="@color/lightgrey" />
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
-        android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">
 
         <TextView
@@ -84,12 +89,14 @@
             android:text="提前5分钟"
             android:textSize="@dimen/text_main" />
     </RelativeLayout>
-
-    <RelativeLayout
+    <View
         android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/lightgrey" />
+    <RelativeLayout
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
-        android:background="@drawable/oa_signin_tv_bg"
         android:padding="8dp">
 
         <TextView
@@ -119,5 +126,8 @@
             android:textSize="@dimen/text_main" />
     </RelativeLayout>
 
-
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/lightgrey" />
 </LinearLayout>

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

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:layout_marginLeft="20dp"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity">
 
     <RelativeLayout
@@ -21,8 +22,8 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/isImage"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp" />
@@ -48,8 +49,8 @@
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/allow_chance_location"
-            android:layout_width="50dp"
-            android:layout_height="35dp"
+            android:layout_width="40dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp" />
@@ -83,7 +84,8 @@
             android:drawableRight="@drawable/oa_next"
             android:gravity="center_vertical"
             android:text="500米"
-            android:textColor="@color/text_main" />
+            android:textColor="@color/text_main"
+            android:layout_marginRight="20dp"/>
     </RelativeLayout>
 
     <View

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

@@ -17,7 +17,8 @@
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:paddingTop="5dp">
+        android:paddingTop="5dp"
+        android:visibility="gone">
 
         <com.xzjmyk.pm.activity.view.ClearEditText
             android:id="@+id/search_edit"
@@ -29,12 +30,17 @@
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="15sp"
+            />
     </RelativeLayout>
 
     <ListView
         android:id="@+id/listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/gainsboro" />
 
 </LinearLayout>

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

@@ -31,6 +31,7 @@
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
+
     </RelativeLayout>
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView

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

@@ -60,7 +60,6 @@
                         android:text="待审批"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="20dp"
-                        android:textColor="@color/red"
                         android:layout_marginTop="5dp"
                         android:layout_marginBottom="0dp"
                         android:textSize="@dimen/text_hine"/>
@@ -77,7 +76,6 @@
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作总结"
-                    android:paddingLeft="5dp"
                     android:textColor="#575757"
                     android:layout_marginTop="5dp"
                     />
@@ -104,7 +102,7 @@
                     android:textSize="18sp"
                     android:text="工作计划"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="5dp"
                     android:textColor="#575757"
                     />
                 <TextView
@@ -131,7 +129,7 @@
                         android:layout_height="wrap_content"
                         android:text="工作心得"
                         android:paddingLeft="5dp"
-                        android:layout_marginTop="1dp"
+                        android:layout_marginTop="5dp"
                         android:textSize="18sp"
                         android:textColor="#575757"
                         />
@@ -158,9 +156,9 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="工作任务"
+                    android:text="已完成任务"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="5dp"
                     android:textSize="18sp"
                     android:textColor="#575757"
                     android:visibility="visible"
@@ -172,46 +170,37 @@
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
                     android:textColor="#575757"
-                    android:padding="0dp"
+                    android:padding="8dp"
                     android:visibility="visible"
                     />
 
-                <RelativeLayout
-                    android:id="@+id/work_daily_detail_task_rl"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible"
-                    >
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="标  题"
-                        android:textColor="@color/text_hine"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="15sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="发起人"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="20dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="15sp"/>
-                </RelativeLayout>
-
 
                 <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_task_lv"
+                    android:id="@+id/work_daily_detail_completedtask_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#f6f5f5"
                     android:visibility="visible">
                 </com.xzjmyk.pm.activity.view.MyListView>
 
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="未完成任务"
+                        android:paddingLeft="5dp"
+                        android:layout_marginTop="5dp"
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        android:visibility="visible"
+                        />
 
+                    <com.xzjmyk.pm.activity.view.MyListView
+                        android:id="@+id/work_daily_detail_uncompletedtask_lv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#f6f5f5"
+                        android:visibility="visible">
+                    </com.xzjmyk.pm.activity.view.MyListView>
 
                 <View
                     android:layout_width="match_parent"

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

@@ -38,10 +38,12 @@
         android:layout_marginRight="10dp"
         android:layout_height="1dp"
         android:background="#FBFAFA"
-        android:layout_marginTop="2dp"/>
+        android:layout_marginTop="2dp"
+        android:visibility="gone"/>
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         >
 
         <TextView
@@ -52,8 +54,8 @@
             android:text="2016-11-02"
             android:textColor="#000000"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -64,8 +66,8 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:textColor="@color/red"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
             android:textSize="@dimen/text_hine"/>
     </RelativeLayout>
 
@@ -103,8 +105,8 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:background="#EBE9E9"
-        android:layout_marginTop="2dp"/>
+        android:layout_height="8dp"
+        android:background="#F5F5F5"
+        />
 
 </LinearLayout>

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

@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
     <LinearLayout
         android:descendantFocusability="blocksDescendants"
         android:layout_height="wrap_content"
         style="@style/crm_ll_card"
-        android:id="@+id/business_detail_ll">
+        android:id="@+id/business_detail_ll"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp">
 
         <LinearLayout style="@style/crm_ll_sale_item">
 
             <TextView
                 android:text="商机编号"
                 android:minWidth="90dp"
+                android:layout_marginTop="5dp"
+
                 style="@style/TextView_Basic" />
             <TextView
                 android:id="@+id/tv_crm_business_num"
                 android:text="XXXXXXX"
-                style="@style/TextView_Basic" />
+                style="@style/TextView_Basic"
+                android:layout_marginTop="5dp"/>
         </LinearLayout>
 
         <LinearLayout style="@style/crm_ll_sale_item">
@@ -83,7 +89,8 @@
 
         <RelativeLayout
             style="@style/crm_ll_sale_item"
-            android:layout_gravity="right">
+            android:layout_gravity="right"
+            >
 
             <TextView
                 android:minWidth="90dp"
@@ -117,9 +124,10 @@
         android:id="@+id/iv_business_qiang"
         android:layout_width="100dp"
         android:layout_height="30dp"
+        android:layout_marginRight="20dp"
         android:layout_alignParentRight="true"
         android:src="@drawable/ic_qiang"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="10dp"
         android:layout_alignBottom="@id/business_detail_ll"/>
 </RelativeLayout>
 

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

@@ -12,7 +12,8 @@
         android:button="@null"
         android:checked="false"
         android:drawableLeft="@drawable/oa_rb_button_bg"
-        android:padding="10dp" />
+        android:padding="10dp"
+        android:visibility="gone"/>
 
 
     <TextView
@@ -20,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
+       android:padding="10dp"
         android:layout_toRightOf="@+id/select_scb"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />

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

@@ -331,18 +331,33 @@
     <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:layout_marginRight">10dp</item>
-        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">top</item>
         <item name="android:minHeight">20dp</item>
         <item name="android:padding">5dp</item>
         <item name="android:width">160dp</item>
-        <item name="android:layout_marginTop">1dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginTop">5dp</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">15sp</item>
+        <item name="android:layout_marginTop">1dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</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>