工作日报列表界面 备份1

WeiChat/src/main/AndroidManifest.xml

@@ -561,18 +561,28 @@
             android:name=".ui.erp.activity.crm.CustomerListSelectActivity"
             android:theme="@style/CrmThemeCustomer" />
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
-        <activity
-            android:name=".ui.erp.activity.oa.WorkLogsActivity"
-
-            android:theme="@style/OAThemeSignin" />
+       <!-- <activity
+            android:name=".ui.erp.activity.oa.DailydetailsActivity"
+            android:label="日报详情"
+            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
-            android:name=".ui.erp.activity.oa.AddLogActivity"
+            android:name=".ui.erp.activity.oa.AddDailyActivity"
 
             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"
+            />
         <activity android:name=".ui.circle.view.SelectLocationActivity" />
         <activity
             android:name=".ui.erp.activity.oa.SigninTimeSetActivity"

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -34,6 +35,9 @@ public class CustomCrashActivity extends Activity {
         /*if (stackTraceString != null){
             Toast.makeText(this,stackTraceString,Toast.LENGTH_LONG).show();
         }*/
+        if (AppConfig.DEBUG){
+            Log.i("appexception",stackTraceString);
+        }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);
 

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

@@ -0,0 +1,74 @@
+package com.xzjmyk.pm.activity.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.WorkDailyBean;
+
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2016/11/1.
+ */
+public class WorkDailyAdapter extends BaseAdapter {
+    private List<WorkDailyBean> mWorkDailyBeans;
+    private Context mContext;
+
+    //获取上下文对象
+    public WorkDailyAdapter(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    public List<WorkDailyBean> getmWorkDailyBeans() {
+        return mWorkDailyBeans;
+    }
+
+    public void setmWorkDailyBeans(List<WorkDailyBean> mWorkDailyBeans) {
+        this.mWorkDailyBeans = mWorkDailyBeans;
+    }
+
+    @Override
+    public int getCount() {
+        return mWorkDailyBeans.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mWorkDailyBeans.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder = null;
+        if (convertView == null){
+            convertView = View.inflate(mContext, R.layout.item_activity_workdaily,null);
+            viewHolder = new ViewHolder();
+            viewHolder.WorkDailyDate = (TextView) convertView.findViewById(R.id.item_activity_workdaily_time_tv);
+            viewHolder.WorkDailyContent = (TextView) convertView.findViewById(R.id.item_activity_workdaily_content_tv);
+            viewHolder.WorkDailyStatus = (TextView) convertView.findViewById(R.id.item_activity_workdaily_status);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+
+        viewHolder.WorkDailyDate.setText(mWorkDailyBeans.get(position).getWD_DATE());
+        viewHolder.WorkDailyStatus.setText(mWorkDailyBeans.get(position).getSTATUS());
+        viewHolder.WorkDailyContent.setText(mWorkDailyBeans.get(position).getWD_COMMENT());
+        return convertView;
+    }
+
+   public class ViewHolder{
+        TextView WorkDailyDate;
+        TextView WorkDailyContent;
+        TextView WorkDailyStatus;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/WorkDailyBean.java

@@ -0,0 +1,70 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+/**
+ * Created by FANGlh on 2016/11/1.
+ */
+public class WorkDailyBean {
+    private String WD_ID;//单据id
+    private String WD_EMP;//员工姓名
+    private String WD_DATE;//日期
+    private String WD_COMMENT;//日报内容
+    private String WD_DEPART;//部门
+    private String WD_JONAME;//职位
+    private String STATUS;//状态
+
+    public String getWD_ID() {
+        return WD_ID;
+    }
+
+    public void setWD_ID(String WD_ID) {
+        this.WD_ID = WD_ID;
+    }
+
+    public String getWD_EMP() {
+        return WD_EMP;
+    }
+
+    public void setWD_EMP(String WD_EMP) {
+        this.WD_EMP = WD_EMP;
+    }
+
+    public String getWD_DATE() {
+        return WD_DATE;
+    }
+
+    public void setWD_DATE(String WD_DATE) {
+        this.WD_DATE = WD_DATE;
+    }
+
+    public String getWD_COMMENT() {
+        return WD_COMMENT;
+    }
+
+    public void setWD_COMMENT(String WD_COMMENT) {
+        this.WD_COMMENT = WD_COMMENT;
+    }
+
+    public String getWD_DEPART() {
+        return WD_DEPART;
+    }
+
+    public void setWD_DEPART(String WD_DEPART) {
+        this.WD_DEPART = WD_DEPART;
+    }
+
+    public String getWD_JONAME() {
+        return WD_JONAME;
+    }
+
+    public void setWD_JONAME(String WD_JONAME) {
+        this.WD_JONAME = WD_JONAME;
+    }
+
+    public String getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(String STATUS) {
+        this.STATUS = STATUS;
+    }
+}

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

@@ -30,7 +30,6 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
-import com.xzjmyk.pm.activity.ui.erp.model.NewsEntity;
 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;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddLogActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddDailyActivity.java

@@ -27,12 +27,13 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class AddLogActivity extends BaseActivity{
+public class AddDailyActivity extends BaseActivity{
     private EditText sum_tv;
     private EditText plan_tv;
     private EditText learned_tv;
@@ -86,7 +87,7 @@ public class AddLogActivity extends BaseActivity{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_add_log);
+        setContentView(R.layout.activity_add_work_daily);
         getSupportActionBar().setTitle("工作日报");
         initView();
     }
@@ -100,7 +101,8 @@ public class AddLogActivity extends BaseActivity{
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            startActivity(new Intent(activity, WorkLogsActivity.class));
+//            startActivity(new Intent(activity, WorkLogsActivity.class));
+            startActivity(new Intent(activity, WorkDailyShowActivity.class));
             //sendAble();
         }
         return super.onOptionsItemSelected(item);

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

@@ -630,7 +630,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 startActivity(new Intent(activity, MeetingActivity.class));
                 break;
             case R.id.worklog://工作日志
-                startActivity(new Intent(activity, AddLogActivity.class));
+                startActivity(new Intent(activity, AddDailyActivity.class));
                 break;
             case R.id.subord_log://我的下属工作日志
                 if (isMe)

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

@@ -0,0 +1,115 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.adapter.WorkDailyAdapter;
+import com.xzjmyk.pm.activity.bean.oa.WorkDailyBean;
+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.view.EmptyLayout;
+import com.xzjmyk.pm.activity.view.ClearEditText;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Created by FANGlh on 2016/11/1.
+ */
+public class WorkDailyShowActivity extends BaseActivity {
+    private ClearEditText mSearchEt;
+    private PullToRefreshListView mPullToRefreshListView;
+    private int mCurrentPage = 1;
+    private final static int WORK_DAILY_REQUEST = 101;
+    private WorkDailyAdapter mWorkDailyAdapter;
+    private List<WorkDailyBean> mWorkDailyBeans;  //实体类一般以Bean或Entity结尾
+    public EmptyLayout mEmptyLayout;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        setContentView(R.layout.activity_work_daily);
+        getSupportActionBar().setTitle("日报记录");
+        mWorkDailyBeans = new ArrayList<>();
+        mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
+        mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
+        mWorkDailyAdapter = new WorkDailyAdapter(this);
+        mPullToRefreshListView.setAdapter(mWorkDailyAdapter);
+        mWorkDailyAdapter.setmWorkDailyBeans(mWorkDailyBeans);
+
+        mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
+
+        mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
+        mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                WorkDailyAdapter.ViewHolder model =  ( WorkDailyAdapter.ViewHolder) view.getTag();
+               // Intent intent = new Intent(WorkDailyShowActivity.this,.class);
+               // intent.putExtra("Date",model.);
+            }
+        });
+        mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                mCurrentPage = 1;
+                initData();
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                mCurrentPage++;
+                initData();
+            }
+        });
+    }
+
+    public void initData() {
+        String url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/getWorkDaily.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("emcode", CommonUtil.getSharedPreferences(getApplicationContext(), "erp_username"));
+        param.put("pageIndex", mCurrentPage);
+
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, WORK_DAILY_REQUEST, null, null, "post");
+
+    }
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case WORK_DAILY_REQUEST:
+                    String result = msg.getData().getString("result");
+                    Log.i("handleMessage: ",result);
+                    // TODO: 2016/11/1 json数据解析
+                    
+            }
+
+        }
+    };
+
+}

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

@@ -4,8 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.ListView;
@@ -16,7 +14,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.WorkDailyPaperAdapter;
+import com.xzjmyk.pm.activity.adapter.WorkLogAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -49,14 +47,14 @@ public class WorkLogsActivity extends BaseActivity {
     private CommentItemChche itemChche;
     private static int requestCode = 0x21;
     public static int resultCode = 0x22;
-    private WorkDailyPaperAdapter mAdapter;
+    private WorkLogAdapter mAdapter;
     private ClearEditText search_edit;
     private PullToRefreshListView context_rv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_work_logs);
+        setContentView(R.layout.activity_work_daily);
         getSupportActionBar().setTitle("日报记录");
         ct = this;
         allMag = new ArrayList<>();
@@ -70,7 +68,7 @@ public class WorkLogsActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.add_item:
-                startActivityForResult(new Intent(ct, AddLogActivity.class), requestCode);
+                startActivityForResult(new Intent(ct, AddDailyActivity.class), requestCode);
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -164,7 +162,7 @@ public class WorkLogsActivity extends BaseActivity {
                 requestMyBusiness(false);
             }
         });
-        mAdapter.setButtonViewListener(new WorkDailyPaperAdapter.ButtonViewListener() {
+        mAdapter.setButtonViewListener(new WorkLogAdapter.ButtonViewListener() {
             @Override
             public void onClick(int i, String messageId, String toUserId, String toName) {
                 if (itemChche == null)
@@ -177,24 +175,37 @@ public class WorkLogsActivity extends BaseActivity {
                 bottom_view.show();
             }
         });
+
+       /* context_rv.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(WorkLogsActivity.this,DailydetailsActivity.class);
+                startActivityForResult(intent, 0x99);
+            }
+        });*/
     }
 
     private void initView() {
         bottom_view = (PMsgBottomView) findViewById(R.id.bottom_view);
-        search_edit = (ClearEditText) findViewById(R.id.search_edit);
-        context_rv = (PullToRefreshListView) findViewById(R.id.context_rv);
+        search_edit = (ClearEditText) findViewById(R.id.work_daily_search_edit);
+        context_rv = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
         context_rv.setMode(PullToRefreshBase.Mode.BOTH);
-        mAdapter = new WorkDailyPaperAdapter(ct, showMag);
+        mAdapter = new WorkLogAdapter(ct, showMag);
         context_rv.setAdapter(mAdapter);
         initData();
     }
     private void initData() {
         requestMyBusiness(true);
     }
+
+
+
     private void requestMyBusiness(final boolean isPullDwonToRefersh) {
         if (!StringUtils.isEmpty(search_edit.getText().toString())) {
             search_edit.setText("");
         }
+
+
         HashMap<String, String> params = new HashMap<>();
         String messageId = null;
         if (!isPullDwonToRefersh && allMag.size() > 0) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -13,7 +13,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 57;//数据库版本号(每添加一个表要增加版本号)
+    private static final int DATABASE_VERSION = 58;//数据库版本号(每添加一个表要增加版本号)
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 

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

@@ -114,21 +114,21 @@
                     android:background="@color/item_line" />
             </LinearLayout>
 
-
+            <LinearLayout
+                android:id="@+id/ly_bottom_submit"
+                style="@style/form_linear_customer">
+
+                <Button
+                    android:id="@+id/btn_Daily_submitted"
+                    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">
-
-        <Button
-            android:id="@+id/btn_Daily_submitted"
-            style="@style/from_button_base_bule"
-            android:layout_marginTop="10dp"
-            android:textSize="20sp"
-            android:text="提    交" />
-    </LinearLayout>
+
 
     <include layout="@layout/item_work_view" />
 

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

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:whatever="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/ly_head_display"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:layout_marginTop="8dp"
+                    android:background="@color/item_line" />
+                <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:id="@+id/sum_tv"
+                    style="@style/form_relative_right_text"
+                    android:hint="请输入今日工作总结(必填)"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginTop="1dp"
+                    android:gravity="top"
+                    android:minHeight="120dp"
+                    android:maxHeight="300dp"
+                    android:padding="5dp"
+                    />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <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:id="@+id/plan_tv"
+                    style="@style/form_relative_right_text"
+                    android:layout_marginLeft="20dp"
+                    android:gravity="top"
+                    android:hint="请输入明日工作计划(非必填)"
+                    android:layout_marginTop="1dp"
+                    android:minHeight="120dp"
+                    android:maxHeight="300dp"
+                    android:padding="5dp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
+                <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"
+                        />
+                    <ImageButton
+                        android:id="@+id/im_Experience_sharing"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:src="@drawable/icon_app_share"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="1dp"
+                        android:layout_marginRight="20dp"
+                        android:background="#7191F7"
+                        />
+                </RelativeLayout>
+                <com.andreabaccega.widget.FormEditText
+                    android:id="@+id/learned_tv"
+                    style="@style/form_relative_right_text"
+                    android:layout_marginLeft="20dp"
+                    android:gravity="top"
+                    android:hint="点击分享按钮可将工作心得分享到工作圈(非必填)"
+                    android:minHeight="120dp"
+                    android:maxHeight="300dp"
+                    android:layout_marginTop="1dp"
+                    android:padding="5dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ly_bottom_submit"
+                style="@style/form_linear_customer">
+
+                <Button
+                    android:id="@+id/btn_Daily_submitted"
+                    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>
+
+
+
+    <include layout="@layout/item_work_view" />
+
+
+
+    <!--gone-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:gravity="center_vertical"
+            android:text="日志类型"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/type_tv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:drawableRight="@drawable/oa_next"
+            android:gravity="center_vertical"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+    </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:padding="20dp"
+        android:text="选择点评人（默认指向自己领导）"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main"
+        android:visibility="gone" />
+</LinearLayout>

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

@@ -2,10 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@drawable/bg_main"
+    >
 
     <RelativeLayout
-        android:id="@+id/seach_top"
+        android:id="@+id/work_daily_seach_top"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@drawable/bg_bar"
@@ -16,7 +17,7 @@
         android:paddingTop="5dp">
 
         <com.xzjmyk.pm.activity.view.ClearEditText
-            android:id="@+id/search_edit"
+            android:id="@+id/work_daily_search_edit"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerVertical="true"
@@ -32,7 +33,7 @@
     </RelativeLayout>
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/context_rv"
+        android:id="@+id/work_daily_context_ptlv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/seach_top"

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

@@ -8,7 +8,8 @@
 <RelativeLayout
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="5dp">
+    android:layout_marginTop="5dp"
+    android:visibility="gone">
 
     <ImageView
         android:id="@+id/avatar_img"
@@ -28,18 +29,9 @@
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
-    <TextView
-        android:id="@+id/time_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="5dp"
-        android:gravity="left|top"
-        android:text="1月12日 19:40"
-        android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_min" />
+
 </RelativeLayout>
+
     <View
         android:layout_width="wrap_content"
         android:layout_marginLeft="10dp"
@@ -51,34 +43,54 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         >
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="工作总结"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="0dp"
-        android:textSize="@dimen/text_main"/>
+
+        <TextView
+            android:id="@+id/item_activity_workdaily_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="left|top"
+            android:text="2016-11-02"
+            android:textColor="@color/text_hine"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="0dp"
+            android:textSize="@dimen/text_main" />
+
         <TextView
-            android:id="@+id/tv_Pending_approval"
+            android:id="@+id/item_activity_workdaily_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="待审批"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="10dp"
             android:textColor="@color/red"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="0dp"
-            android:textSize="@dimen/text_main"/>
+            android:textSize="@dimen/text_hine"/>
     </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"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="工作总结"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="0dp"
+        android:textSize="@dimen/text_main"/>
     <TextView
-        android:id="@+id/content_tv"
+        android:id="@+id/item_activity_workdaily_content_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="0dp"
         android:layout_toRightOf="@id/avatar_img"
-        android:minLines="3"
-        android:maxLines="6"
+        android:lines="3"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:textSize="@dimen/text_hine"

settings.gradle

@@ -1,2 +1,2 @@
-include ':pullToRefershLibraryMy', ':materialdialogs', ':MPAndroidChart', ':libedittextformlibrary', ':libfloatingactionbutton', ':libbdupdatesdk', ':library-viewpager-indicator', ':library-swipemenu_lv', ':lib-zxing', ':alarmtest'
+include ':pullToRefershLibraryMy', ':materialdialogs', ':MPAndroidChart', ':libedittextformlibrary', ':libfloatingactionbutton', ':libbdupdatesdk', ':library-viewpager-indicator', ':library-swipemenu_lv', ':lib-zxing'
 include ':WeiChat'