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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java
#	WeiChat/src/main/res/layout/activity_client.xml

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/AndroidManifest.xml

@@ -2,13 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="71"
-    android:versionName="5.5.7">
+    android:versionCode="72"
+    android:versionName="5.5.9">
 
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
-    <!--share umeng-->
+    <!-- share umeng -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -103,7 +103,6 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme">
-
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="baidu" />
@@ -115,10 +114,11 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
                 <action android:name="cat.ereza.customactivityoncrash.RESTART" />
             </intent-filter>
         </activity>
-        <!--异常跳转页面-->
+        <!-- 异常跳转页面 -->
         <activity
             android:name=".CustomCrashActivity"
             android:process=":error_activity">
@@ -144,6 +144,7 @@
         <activity android:name=".ui.erp.activity.WorkExtraActivity" />
         <activity android:name=".ui.erp.activity.TravelActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
+        <activity android:name=".ui.erp.activity.oa.SelectAlarmTimeActivity"/>
         <activity android:name=".ui.message.SelectActivity" />
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />
@@ -569,22 +570,22 @@
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
         <activity
             android:name=".ui.erp.activity.oa.DailydetailsActivity"
-
             android:theme="@style/OAThemeSignin" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" />
         <activity android:name=".ui.erp.activity.oa.SuperSetActivity" />
-        <!--<activity
+        <!--
+            <activity
             android:name=".ui.erp.activity.oa.AddDailyActivity"
-            android:theme="@style/OAThemeSignin" />-->
+            android:theme="@style/OAThemeSignin" />
+        -->
         <activity
             android:name=".ui.erp.activity.oa.WorkDailyAddActivity"
             android:theme="@style/OAThemeSignin" />
         <activity
             android:name=".ui.erp.activity.oa.WorkDailyShowActivity"
             android:theme="@style/OAThemeSignin" />
-
         <activity
             android:name=".ui.erp.activity.oa.WorkLogsActivity"
             android:theme="@style/OAThemeSignin" />
@@ -652,7 +653,7 @@
         <!-- umeng api key -->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="57ea27bb67e58e088c003bbf"></meta-data>
+            android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -710,6 +711,11 @@
         <activity
             android:name=".ui.erp.activity.message.ProcessMsgActivity"
             android:label="@string/title_activity_process_msg" />
+
+        <service
+            android:name=".ui.erp.util.alarm.AlarmService"
+            android:enabled="true"
+            android:exported="true"></service>
     </application>
 
 </manifest>

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

@@ -2,6 +2,7 @@
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -25,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;
@@ -64,13 +65,17 @@ 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);
+        }else {
+            viewHolder.WorkDailyStatus.setTextColor(Color.RED);
         }
-
-        //为日报列表界面赋值（状态，总结）
         viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
         return convertView;

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

@@ -142,7 +142,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_date_start.setText(getJSONString(object, "vr_visittime"));
             tv_date_end.setText(getJSONString(object, "vr_visitend"));
             tv_customer_login.setText(getJSONString(object, "custname"));
-            tv_linksman_login.setText(getJSONString(object, "vr_cucontact"));
+            tv_linksman_login.setText(getJSONString(object, "vr_contact"));
             tv_address_login.setText(getJSONString(object, "address"));
             tv_visit_theme.setText(getJSONString(object, "vr_title"));
             tv_visit_steps.setText(getJSONString(object, "vr_nichestep"));

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

@@ -34,7 +34,7 @@ import java.util.Map;
 
 public class AddMeetTaskActivity extends BaseActivity {
     private PullToRefreshListView listView;
-    private boolean isPower=true;
+    private boolean isPower = true;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -55,7 +55,7 @@ public class AddMeetTaskActivity extends BaseActivity {
                         Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
                     }
                     if (StringUtils.isInclude(message, "查看列表的权限")) {
-                        isPower=false;
+                        isPower = false;
                     }
                     break;
             }
@@ -78,7 +78,7 @@ public class AddMeetTaskActivity extends BaseActivity {
             Intent intent = new Intent(ct, TaskAddActivity.class);
             intent.putExtra("reid", R.style.OAThemeMeet);
             intent.putExtra("type", 2);
-            intent.putExtra("isPower", isPower);
+            intent.putExtra("isPower", true);
             intent.putExtra("meetname", meetName);
             startActivityForResult(intent, 0x11);
         }
@@ -95,7 +95,15 @@ public class AddMeetTaskActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x20) {
-            loadNetData();
+            if (!isPower)
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        Crouton.makeText(ct, "您没有查看单据的权限");
+                    }
+                }, 1000);
+            else
+                loadNetData();
         }
     }
 

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

@@ -105,6 +105,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         switch (view.getId()) {
             case R.id.isalarma_sw:
                 CommonUtil.setSharedPreferences(ct, ALARMA_CLICK, isChecked);
+                setTextColor(isChecked);
                 break;
             case R.id.auto_signin_sw:
                 CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
@@ -148,4 +149,17 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         return -1;
     }
 
+    public void setTextColor(boolean clicked) {
+        int id = 0;
+        if (clicked) {
+            id = R.color.text_color;
+        } else {
+            id = R.color.hintColor;
+        }
+        tv_alar.setFocusable(clicked);
+        tv_ualar.setFocusable(clicked);
+        tv_alar.setTextColor(getResources().getColor(id));
+        tv_ualar.setTextColor(getResources().getColor(id));
+
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -35,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;
@@ -46,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
@@ -67,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);
@@ -92,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);
@@ -107,7 +108,7 @@ public class DailydetailsActivity extends BaseActivity {
             mWorkTaskBeanList.add(workTaskBean);
         }
             mDailyDetailsWorkTaskAdapter.setmWorkTaskBeanList(mWorkTaskBeanList);
-            work_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
+            complete_tasklv.setAdapter(mDailyDetailsWorkTaskAdapter);
 //        }
 
         //获取、处理、赋值从日报列表界面点击跳转传来的数据
@@ -115,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 {
@@ -133,6 +133,11 @@ public class DailydetailsActivity extends BaseActivity {
         if (!TextUtils.isEmpty(summary) && !TextUtils.isEmpty(status) && !TextUtils.isEmpty(date)) {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
+            if(status.equals("已审批")){
+                wdd_status.setTextColor(Color.GREEN);
+            }else{
+                wdd_status.setTextColor(Color.RED);
+            }
             wdd_status.setText(status);
             wdd_plan.setText(plan);
             wdd_experience.setText(experience);

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

@@ -51,6 +51,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 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.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
@@ -184,11 +185,21 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         chaneTAG(true);
                     }
                     break;
-                case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                default:
                     if (mPullToRefreshScrollView.isRefreshing()) {
                         loadSuccess();
                         mPullToRefreshScrollView.onRefreshComplete();
+                    }
+                    try {
+                        JsonValidator validator = new JsonValidator();
+                        if (validator.validate(message)) {
+                            JSONObject object1 = JSON.parseObject(message);
+                            Crouton.makeText(ct, StringUtils.isEmpty(object1.getString("exceptionInfo")) ? "程序错误" : object1.getString("exceptionInfo"));
+                        } else {
+                            Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
+                        }
+                    }catch (Exception e){
+
                     }
                     break;
             }

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);
 /*
 
@@ -161,9 +162,9 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        add_submit.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-               if(add_summary.testValidity()){
+             //  if(add_summary.testValidity()){
                    sendAble();
-               }
+           //    }
            }
        });
        share_experience.setOnClickListener(new View.OnClickListener() {

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/erp/fragment/SigninFragment.java

@@ -126,7 +126,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                         CommonUtil.setSharedPreferences(ct, "companyX", (float) companyX);
                         CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
-                        CommonUtil.setSharedPreferences(ct, "distance",  companyDistance);
+                        CommonUtil.setSharedPreferences(ct, "distance", companyDistance);
                         unoffice_mm.setText(setDistance());
                     }
                     if (jsonObject.getBoolean("success")) {
@@ -230,7 +230,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 default:
                     JsonValidator validator = new JsonValidator();
                     if (validator.validate(message)) {
-                        ViewUtil.ToastMessage(ct,message,Style.holoRedLight,3000);
+                        ViewUtil.ToastMessage(ct, message, Style.holoRedLight, 3000);
                     }
                     if (loginNum < 3 && StringUtils.isInclude(message, getResources().getString(R.string.session_out)) || StringUtils.isInclude(message, "程序错误")) {
                         returnLogin();
@@ -280,7 +280,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             if (poi == null) return;
             loaction = poi.name == null ? "" : poi.name;
             addr = poi.address == null ? "" : poi.address;
-            office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+            office_addr.setText(addr);
             latitude = poi.location.latitude;
             longitude = poi.location.longitude;
             unoffice_mm.setText(setDistance());
@@ -306,7 +306,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.signin_btn:
                 if (isPlay()) {
                     if (!CommonUtil.isNetWorkConnected(ct)) {
-                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接",Style.holoRedLight,2000);
+                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接", Style.holoRedLight, 2000);
                         return;
                     }
                     //TODO 上传文件
@@ -330,7 +330,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.title:
                 showDateDialog();
                 break;
-            case R.id.unoffice_mm:
+            case R.id.unoffice_:
                 intent = new Intent(ct, LocationMapActivity.class);
                 intent.putExtra("action", "SigninFragment");
                 //已选择此时定位到的地点传递
@@ -338,7 +338,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 startActivityForResult(intent, 0x14);
                 break;
             default:
-                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理",Style.holoRedLight,2000);
+                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理", Style.holoRedLight, 2000);
                 ct.finish();
                 break;
         }
@@ -379,7 +379,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         back.setOnClickListener(this);
         signin_btn.setOnClickListener(this);
         title.setOnClickListener(this);
-        unoffice_mm.setOnClickListener(this);
+        findViewById(R.id.unoffice_).setOnClickListener(this);
     }
 
     private void init() {
@@ -406,7 +406,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     setBaiduLocation();
                 } else {
                     if (resultCode == 62) {
-                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", Style.holoRedLight,2000);
+                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", Style.holoRedLight, 2000);
                     }
                 }
             }
@@ -436,7 +436,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         loaction = MyApplication.getInstance().getBdLocationHelper().getName();
         addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
         unoffice_mm.setText(setDistance());
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+        office_addr.setText(addr);
     }
 
     private void initView() {
@@ -444,7 +444,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         listview.setLayoutManager(new LinearLayoutManager(ct));
         adapter = new SigninAdapter(ct);
         listview.setAdapter(adapter);
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+        office_addr.setText(addr);
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
         getMacByNet();
         //判断是否有定位权限
@@ -573,7 +573,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         try {
             if (!StringUtils.isEmpty(dis)) {
                 distance = (int) Double.parseDouble(dis);
-                re = Html.fromHtml("<font color=\'#575757\'>距离考勤地点" + (distance == -1 ? -1 : distance) + "米&#160&#160&#160&#160&#160" + "</font><font color=\'#000000\'><U>地点微调</U></font>");
+                re = Html.fromHtml("<font color=\'#575757\'>约" + (distance == -1 ? -1 : distance) + "米&#160&#160&#160&#160&#160" + "</font><font color=\'#000000\'></font>");
             }
         } catch (ClassCastException e) {
             e.printStackTrace();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmService.java

@@ -0,0 +1,41 @@
+package com.xzjmyk.pm.activity.ui.erp.util.alarm;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class AlarmService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {//第一次进来
+        super.onCreate();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {//每次启动服务
+
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {//服务关闭
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onLowMemory() {//低内存关闭
+        super.onLowMemory();
+    }
+
+    public void alarm() {
+
+
+    }
+
+
+}

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

@@ -23,69 +23,69 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/gainsboro" />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:layout_marginTop="8dp"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="18sp"
+                    android:textSize="16sp"
                     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="8dp"
+                    android:background="@color/gainsboro" />
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="18sp"
+                    android:textSize="16sp"
                     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"
-                    android:hint="请输入明日工作计划(非必填)"
-                    android:layout_marginTop="1dp"
-                    android:minHeight="120dp"
-                    android:padding="5dp"
-                    android:maxHeight="1000dp"/>
+                    style="@style/form_relative_right_text2"
+                    android:hint="请输入明日工作计划(非必填)"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    android:background="@color/gainsboro" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
+                    android:background="@color/HalfBlack" />
 
                 <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:textSize="18sp"
+                        android:textSize="16sp"
+                        android:layout_marginTop="8dp"
                         />
                     <ImageButton
                         android:id="@+id/add_work_daily_sharing_experience_im"
@@ -93,37 +93,37 @@
                         android:layout_height="30dp"
                         android:src="@drawable/icon_app_share"
                         android:layout_alignParentRight="true"
-                        android:layout_marginTop="1dp"
+                        android:layout_marginTop="0dp"
                         android:layout_marginRight="20dp"
-                        android:background="#7191F7"
+                        android:background="@color/lightskyblue"
                         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.xml

@@ -79,5 +79,5 @@
             style="@style/crm_business_btn"
             android:text="商机跟进" />
     </LinearLayout>
-    </RelativeLayout>
+</RelativeLayout>
 

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_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,8 +47,8 @@
 
         <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>
@@ -54,7 +57,6 @@
         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 +86,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 +123,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_work_daily.xml

@@ -13,17 +13,17 @@
         android:background="@drawable/bg_bar"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
         android:paddingTop="5dp">
 
         <com.xzjmyk.pm.activity.view.ClearEditText
             android:id="@+id/work_daily_search_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
@@ -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

@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none">
@@ -59,8 +59,6 @@
                         android:layout_height="wrap_content"
                         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 +75,6 @@
                     android:layout_height="wrap_content"
                     android:textSize="18sp"
                     android:text="工作总结"
-                    android:paddingLeft="5dp"
                     android:textColor="#575757"
                     android:layout_marginTop="5dp"
                     />
@@ -104,7 +101,7 @@
                     android:textSize="18sp"
                     android:text="工作计划"
                     android:paddingLeft="5dp"
-                    android:layout_marginTop="1dp"
+                    android:layout_marginTop="5dp"
                     android:textColor="#575757"
                     />
                 <TextView
@@ -131,7 +128,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"
                         />
@@ -153,16 +150,17 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:background="#f6f5f5">
+                    android:background="#f6f5f5"
+                    android:visibility="gone">
                 <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="gone"
+                    android:visibility="visible"
                     />
                 <TextView
                     android:id="@+id/work_daily_detail_no_task"
@@ -171,56 +169,50 @@
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
                     android:textColor="#575757"
-                    android:padding="0dp"
-                    android:visibility="gone"
+                    android:padding="8dp"
+                    android:visibility="visible"
                     />
 
-                <RelativeLayout
-                    android:id="@+id/work_daily_detail_task_rl"
-                    android:layout_width="wrap_content"
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/work_daily_detail_completedtask_lv"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    >
+                    android:background="#f6f5f5"
+                    android:visibility="visible">
+                </com.xzjmyk.pm.activity.view.MyListView>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="标  题"
-                        android:textColor="@color/text_hine"
-                        android:layout_marginLeft="20dp"
+                        android:text="未完成任务"
+                        android:paddingLeft="5dp"
                         android:layout_marginTop="5dp"
-                        android:textSize="15sp" />
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        android:visibility="visible"
+                        />
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <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:text="发起人"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginRight="20dp"
-                        android:layout_marginTop="5dp"
-                        android:textSize="15sp"/>
-                </RelativeLayout>
+                        android:background="#f6f5f5"
+                        android:visibility="visible">
+                    </com.xzjmyk.pm.activity.view.MyListView>
 
-                </LinearLayout>
-                <com.xzjmyk.pm.activity.view.MyListView
-                    android:id="@+id/work_daily_detail_task_lv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#f6f5f5"
-                    android:visibility="gone">
-                </com.xzjmyk.pm.activity.view.MyListView>
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:background="#EBE9E9"
                     android:layout_marginTop="2dp"
-                    android:visibility="gone"/>
+                    android:visibility="visible"/>
 
                 <com.xzjmyk.pm.activity.view.MyListView
                     android:id="@+id/work_daily_detail_approval_flow_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
+                    android:visibility="visible"
                     >
                 </com.xzjmyk.pm.activity.view.MyListView>
             <View
@@ -230,9 +222,9 @@
                 android:layout_marginBottom="8dp"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
-                android:background="@color/item_line"
-                android:visibility="gone"/>
-        </LinearLayout>
+                android:background="@color/item_line" />
+                 </LinearLayout>
+             </LinearLayout>
         </LinearLayout>
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 

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

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    >
 
     <View
         android:layout_width="match_parent"
@@ -30,30 +31,37 @@
         android:layout_height="40dp"
         android:layout_below="@id/tag_tv"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp" />
-
+        android:layout_marginTop="10dp"
+        android:adjustViewBounds="true"
+        />
+<LinearLayout
+    android:id="@+id/em_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_alignTop="@id/header_img"
+    android:layout_marginLeft="10dp"
+    android:layout_toRightOf="@id/header_img"
+    android:gravity="center_vertical">
     <TextView
         android:id="@+id/name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/header_img"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="3dp"
-        android:layout_toRightOf="@id/header_img"
-        android:text="aaa"
+        android:text="陈虎"
+        android:layout_marginBottom="2dp"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:textSize="15sp" />
 
     <TextView
         android:id="@+id/sub_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name_tv"
-        android:layout_below="@id/name_tv"
-        android:layout_marginTop="2dp"
-        android:text="aaa"
+        android:text="优软产品规划部>部长"
         android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
+        android:layout_marginTop="2dp"
+        android:textSize="12sp" />
+</LinearLayout>
+
 
     <TextView
         android:id="@+id/time_tv"
@@ -66,8 +74,8 @@
 
     <ImageView
         android:id="@+id/phone_img"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
         android:layout_alignParentRight="true"
         android:layout_alignRight="@id/time_tv"
         android:layout_alignTop="@id/header_img"

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

@@ -11,33 +11,78 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="15dp"
         android:orientation="vertical"
+
         android:padding="5dp">
 
-        <TextView
-            android:id="@+id/office_addr"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:drawableLeft="@drawable/oa_signin"
-            android:drawablePadding="5dp"
-            android:gravity="center_horizontal"
-            android:textColor="@color/text_hine" />
-
-        <TextView
-            android:id="@+id/unoffice_mm"
-            android:layout_width="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:drawableLeft="@drawable/oa_signin"
+                android:text="当前位置"
+                android:textColor="#000000"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/office_addr"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:drawablePadding="5dp"
+                android:textSize="12dp"
+                android:gravity="center_horizontal"
+                android:textColor="@color/text_hine" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_marginTop="5dp"
-            android:text="地点微调"
-            android:textColor="@color/text_hine"
-            android:textSize="15dp" />
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:textColor="#000000"
+                android:drawableLeft="@drawable/oa_signin"
+                android:text="距离公司"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/unoffice_mm"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:textColor="@color/text_hine"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/unoffice_"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:text="@string/unoffice"
+                android:textColor="#f17e21"
+                android:textSize="12dp" />
+        </LinearLayout>
+
+
     </LinearLayout>
 
     <ImageView
         android:id="@+id/signin_btn"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="110dp"
+        android:layout_height="110dp"
         android:layout_above="@+id/oa_range_addr_rl"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="8dp"
@@ -50,6 +95,7 @@
         android:layout_height="match_parent"
         android:layout_above="@+id/signin_btn"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="25dp"
         android:background="@color/item_line" />
 
     <android.support.v7.widget.RecyclerView
@@ -62,8 +108,8 @@
         android:divider="@null"
         android:dividerHeight="0dp"
         android:focusable="false"
-        android:paddingTop="20dp"
-        android:longClickable="false" />
+        android:longClickable="false"
+        android:paddingTop="20dp" />
 
 
 </RelativeLayout>

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

@@ -20,7 +20,6 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"

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

@@ -5,43 +5,27 @@
     android:background="@color/item_color2"
     android:orientation="vertical"
     >
-<RelativeLayout
-    android:layout_width="wrap_content"
+<LinearLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="5dp"
-    android:visibility="gone">
-
-    <ImageView
-        android:id="@+id/avatar_img"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:background="@drawable/avatar_normal"
-        android:contentDescription="@string/app_name"
-        android:layout_marginLeft="10dp" />
-
-    <TextView
-        android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/avatar_img"
-        android:text="方龙海"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:orientation="vertical"
+    >
 
-</RelativeLayout>
 
     <View
         android:layout_width="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_height="1dp"
-        android:background="#FBFAFA"
-        android:layout_marginTop="2dp"/>
+        android:background="@color/gainsboro"
+        android:layout_marginTop="2dp"
+        android:visibility="gone"/>
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         >
 
         <TextView
@@ -52,9 +36,9 @@
             android:text="2016-11-02"
             android:textColor="#000000"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
-            android:textSize="@dimen/text_main" />
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/item_activity_workdaily_status"
@@ -64,9 +48,9 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:textColor="@color/red"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="0dp"
-            android:textSize="@dimen/text_hine"/>
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:textSize="15sp"/>
     </RelativeLayout>
 
     <View
@@ -74,7 +58,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_height="1dp"
-        android:background="#FBFAFA"
+        android:background="@color/lightgray"
         android:layout_marginTop="2dp"/>
     <TextView
         android:layout_width="wrap_content"
@@ -83,7 +67,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="0dp"
-        android:textSize="@dimen/text_main"
+        android:textSize="16sp"
         android:textColor="#575757"
         />
     <TextView
@@ -97,14 +81,14 @@
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:paddingBottom="5dp"
-        android:textSize="@dimen/text_hine"
+        android:textSize="14sp"
         android:textColor="#575757"
         />
-
+</LinearLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:background="#EBE9E9"
-        android:layout_marginTop="2dp"/>
+        android:layout_height="10dp"
+        android:background="@color/gainsboro"
+        />
 
 </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="visible"/>
 
 
     <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/layout/signin_header.xml

@@ -3,12 +3,12 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize">
+
     <ImageView
         android:id="@+id/back"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:padding="10dp"
-        android:src="@drawable/back" />
+        android:src="@drawable/actionbar_up_indicator" />
 
     <TextView
         android:id="@+id/title"
@@ -17,13 +17,12 @@
         android:layout_centerInParent="true"
         android:drawableRight="@drawable/down"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_main" />
+        android:textSize="14sp" />
 
     <ImageView
         android:id="@+id/seting"
-        android:layout_width="40dp"
+        android:layout_width="20dp"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
-        android:padding="8dp"
         android:src="@drawable/setting" />
 </RelativeLayout>

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

@@ -19,6 +19,7 @@
     <string name="add_summed">请添加工作总结(必填项)!</string>
     <string name="change_mobile_ok">申请变更成功，待系统审批完即可正常打卡!</string>
     <string name="submit">提交</string>
+    <string name="unoffice"><u>地点微调</u></string>
     <string name="change_mobile">手机变更单</string>
     <string name="play_phone">拨打电话</string>
     <string name="send_mail">发送短信</string>

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

@@ -331,18 +331,32 @@
     <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_marginBottom">5dp</item>
         <item name="android:textColorHint">@color/white</item>
         <item name="android:textSize">15sp</item>
     </style>
 
+    <!-- 添加日报总结、计划、心得内容显示样式-->
+    <style name="form_relative_right_text2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">top</item>
+        <item name="android:minHeight">120dp</item>
+        <item name="android:maxHeight">800dp</item>
+        <item name="android:textColorHint">#969595</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_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>
@@ -520,7 +534,6 @@
     </style>
     <!--适用于考勤单据修改后style-->
     <style name="from_button_base_bule2">
-
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">45dp</item>
@@ -734,10 +747,10 @@
     <!--crm business-->
     <style name="crm_business_btn">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:padding">6dp</item>
-        <item name="android:layout_margin">10dp</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:layout_margin">5dp</item>
         <item name="android:background">@drawable/shape_btn_bussine</item>
     </style>