2016/9/14 发布版本

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

@@ -91,7 +91,6 @@ public class OutofficeSetActivity extends BaseActivity {
     }
 
     private void updataSet(String key, String value) {
-
         String formStore = "{\"" + key + "\":\"" + value + "\"}";
         Map<String, Object> param = new HashMap<>();
         param.put("formStore", formStore);

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

@@ -43,8 +43,8 @@ import java.util.regex.Pattern;
  */
 public class WorkLogsActivity extends BaseActivity {
     private WorkLogsActivity ct;
-    private List<PublicMessage> mMessages;//消息对象
-    private List<PublicMessage> messages;//消息对象
+    private List<PublicMessage> allMag;//消息对象
+    private List<PublicMessage> showMag;//消息对象
     private PMsgBottomView bottom_view;
     private CommentItemChche itemChche;
     private static int requestCode = 0x21;
@@ -58,10 +58,13 @@ public class WorkLogsActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_work_logs);
         ct = this;
-        mMessages = new ArrayList<>();
+        allMag = new ArrayList<>();
+        showMag = new ArrayList<>();
         initView();
+        listener();
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -89,7 +92,7 @@ public class WorkLogsActivity extends BaseActivity {
 
     //获取数据后更新界面
     private void upDataUi() {
-        mAdapter.setData(messages);
+        mAdapter.setData(showMag);
         mAdapter.notifyDataSetChanged();
     }
 
@@ -100,10 +103,7 @@ public class WorkLogsActivity extends BaseActivity {
         return m.find();
     }
 
-    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);
+    private void listener() {
         context_rv.setOnScrollListener(new AbsListView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(AbsListView absListView, int i) {
@@ -115,7 +115,6 @@ public class WorkLogsActivity extends BaseActivity {
             public void onScroll(AbsListView absListView, int i, int i1, int i2) {
             }
         });
-        context_rv.setMode(PullToRefreshBase.Mode.BOTH);
         bottom_view.setPMsgBottomListener(new PMsgBottomView.PMsgBottomListener() {
             @Override
             public void sendText(String text) {
@@ -141,15 +140,15 @@ public class WorkLogsActivity extends BaseActivity {
             public void afterTextChanged(Editable editable) {
                 String strChche = editable.toString();
                 //TODO 正则
-                messages.clear();
+                showMag.clear();
 
-                for (PublicMessage e : mMessages) {
+                for (PublicMessage e : allMag) {
                     boolean b = getResult(e.getNickName() + e.getBody().getText(), strChche);
                     if (b) {
-                        messages.add(e);
+                        showMag.add(e);
                     }
                 }
-                mAdapter.setData(messages);
+                mAdapter.setData(showMag);
                 mAdapter.notifyDataSetChanged();
             }
         });
@@ -164,9 +163,6 @@ public class WorkLogsActivity extends BaseActivity {
                 requestMyBusiness(false);
             }
         });
-        if (mMessages == null)
-            mMessages = new ArrayList<>();
-        mAdapter = new WorkLogAdapter(ct, mMessages);
         mAdapter.setButtonViewListener(new WorkLogAdapter.ButtonViewListener() {
             @Override
             public void onClick(int i, String messageId, String toUserId, String toName) {
@@ -180,6 +176,14 @@ public class WorkLogsActivity extends BaseActivity {
                 bottom_view.show();
             }
         });
+    }
+
+    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);
+        context_rv.setMode(PullToRefreshBase.Mode.BOTH);
+        mAdapter = new WorkLogAdapter(ct, showMag);
         context_rv.setAdapter(mAdapter);
         initData();
     }
@@ -194,8 +198,8 @@ public class WorkLogsActivity extends BaseActivity {
         }
         HashMap<String, String> params = new HashMap<>();
         String messageId = null;
-        if (!isPullDwonToRefersh && mMessages.size() > 0) {
-            messageId = mMessages.get(mMessages.size() - 1).getMessageId();
+        if (!isPullDwonToRefersh && allMag.size() > 0) {
+            messageId = allMag.get(allMag.size() - 1).getMessageId();
             params.put("messageId", messageId);
         }
         params.put("access_token", MyApplication.getInstance().mAccessToken);
@@ -213,21 +217,21 @@ public class WorkLogsActivity extends BaseActivity {
             public void onResponse(ArrayResult<PublicMessage> result) {
                 boolean success = Result.defaultParser(mContext, result, true);
                 if (success) {
-                    if (mMessages == null) {
-                        mMessages = new ArrayList<>();
+                    if (allMag == null) {
+                        allMag = new ArrayList<>();
                     }
-                    if (messages == null) {
-                        messages = new ArrayList<>();
+                    if (showMag == null) {
+                        showMag = new ArrayList<>();
                     }
                     if (isPullDwonToRefersh) {
-                        mMessages.clear();
-                        messages.clear();
+                        showMag.clear();
+                        allMag.clear();
                     }
                     if (context_rv.isRefreshing()) {
                         context_rv.onRefreshComplete();
                     }
-                    mMessages.addAll(result.getData());
-                    messages.addAll(result.getData());
+                    showMag.addAll(result.getData());
+                    allMag.addAll(result.getData());
                     upDataUi();
                 }
             }
@@ -241,7 +245,6 @@ public class WorkLogsActivity extends BaseActivity {
         params.put("access_token", MyApplication.getInstance().mAccessToken);
         params.put("messageId", itemChche.messageId);
         params.put("body", itemChche.body);
-
         StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_COMMENT_ADD, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
@@ -256,8 +259,8 @@ public class WorkLogsActivity extends BaseActivity {
                     comment.setBody(itemChche.body);
                     comment.setNickName(MyApplication.getInstance().mLoginUser.getNickName());
                     comment.setToBody(itemChche.body);
-                    mMessages.get(itemChche.option).getComments().add(comment);
-                    mAdapter.setData(mMessages);
+                    showMag.get(itemChche.option).getComments().add(comment);
+                    mAdapter.setData(showMag);
                     mAdapter.notifyDataSetChanged();
                 }
             }

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

@@ -105,11 +105,11 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/comment_tag"
-        android:background="@color/item_line" />
+    <!--<View-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="2px"-->
+        <!--android:layout_below="@+id/comment_tag"-->
+        <!--android:background="@color/item_line" />-->
 
     <RelativeLayout
         android:id="@+id/operate_tag"