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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SubscriptionDao.java

@@ -9,8 +9,10 @@ import android.util.Log;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by gongpm on 2016/6/7.
@@ -34,7 +36,7 @@ public class SubscriptionDao {
     }
 
     //添加多个数据
-    public long addMessage(ArrayList<SubscriptionMessage> messages, String name) {
+    public long addMessage(List<SubscriptionMessage> messages, String name) {
         long k = 0;
         SQLiteDatabase db = sqliteHelper.getWritableDatabase();
         db.beginTransaction();
@@ -85,12 +87,12 @@ public class SubscriptionDao {
     public long deleteMessage(long date, long endDate, String name) {
         long k = 0;
         SQLiteDatabase db = sqliteHelper.getWritableDatabase();
-        String sql = "DELETE FROM SubscriptionMessage WHERE createdate_ > " + date + " and   createdate_ <" + endDate + " and name=" + name;
         try {
-            String where = "createdate_>?,createdate_<=?";
+            String where = "createdate_>? and createdate_<=?";
             String[] whereArg = {date + "", endDate + ""};
             k = db.delete(titleName, where, whereArg);
         } catch (SQLException e) {
+            e.printStackTrace();
         } finally {
             db.close();
         }

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

@@ -610,6 +610,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 viewholder.item_remak.setText(chche.getDepartment());
             } else if (chche.getRemark() != null) {
                 viewholder.item_remak.setText(chche.getRemark());
+                viewholder.item_remak.setVisibility(View.GONE);
             } else {
                 viewholder.item_remak.setText("");
             }

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

@@ -115,7 +115,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                     }
                     break;
                 default:
-                    ToastUtil.showToast(ct, "网络连接失败，请稍后再试");
+                    ct.ToastMessage(message);
                     break;
             }
         }
@@ -421,6 +421,7 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                 intent = new Intent(ct, LocationMapActivity.class);
                 startActivityForResult(intent, RECODE);
                 break;
+
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -93,7 +93,6 @@ public class MessageFragment extends EasyFragment {
     private boolean isRefeshed;
     private MainActivity mActivity;
     public static final int REQUESTCODE = 0xa1;
-    public static final String REQUESTCODERe = "MessageFragment";
     //界面更新广播
     private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
         @Override
@@ -175,7 +174,6 @@ public class MessageFragment extends EasyFragment {
     }
 
     private void initView() {
-
         mClearEditText = (ClearEditText) findViewById(R.id.search_edit);
         mClearEditText.addTextChangedListener(new TextWatcher() {
             @Override
@@ -332,6 +330,7 @@ public class MessageFragment extends EasyFragment {
         loadNoticeCount(mActivity);
         loadERPNewsNum(mActivity);
         loadB2bMessageNum();
+        loadNetData(mActivity);
     }
 
 
@@ -680,6 +679,18 @@ public class MessageFragment extends EasyFragment {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.SUCCESS_INITDATA, null, null, "get");
     }
 
+    public void loadNetData(Context ct) {
+        //获取网络数据
+        String url = Constants.getAppBaseUrl(ct) + "common/desktop/subs/getSubs.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("count", 100);
+        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + TimeUtils.int_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x16, null, null, "get");
+    }
+
     /**
      * @功能:加载商务信息-本地数据库
      * @author:Arisono
@@ -712,6 +723,27 @@ public class MessageFragment extends EasyFragment {
         @Override
         public void handleMessage(final Message msg) {
             switch (msg.what) {
+                case 0x16:
+                    String message = (String) msg.getData().get("result");
+                    int num = 0;
+                    if (JSON.parseObject(message).containsKey("data")) {
+                        List<SubscriptionMessage> messages = JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toJSONString(), SubscriptionMessage.class);
+                        for (SubscriptionMessage e : messages) {
+                            if (e.getSTATUS_() == 0)
+                                num += 1;
+                        }
+                    }
+                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
+                    if (num > 0) {
+                        num_tv.setText(num + "");
+                        num_tv.setVisibility(View.VISIBLE);
+                        content_tv.setText("您有" + num + "条订阅消息未阅读");
+                        time_tv.setText("刚刚");
+                    } else {
+                        num_tv.setVisibility(View.GONE);
+                        content_tv.setText("您暂无未阅读订阅消息");
+                    }
+                    break;
                 case Constants.SUCCESS_LOGIN://公告
                     updateGongGao(msg);
                     break;
@@ -758,18 +790,18 @@ public class MessageFragment extends EasyFragment {
                         schedule_content_tv.setText("您暂无未阅读审批流程");
                     }
                     break;
-                case SUBRICE_MSG:
-                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
-                    if (SUBRICE_count > 0) {
-                        num_tv.setText(SUBRICE_count + "");
-                        num_tv.setVisibility(View.VISIBLE);
-                        content_tv.setText("您有" + SUBRICE_count + "条订阅消息未阅读");
-                        time_tv.setText("刚刚");
-                    } else {
-                        num_tv.setVisibility(View.GONE);
-                        content_tv.setText("您暂无未阅读订阅消息");
-                    }
-                    break;
+//                case SUBRICE_MSG:
+//                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
+//                    if (SUBRICE_count > 0) {
+//                        num_tv.setText(SUBRICE_count + "");
+//                        num_tv.setVisibility(View.VISIBLE);
+//                        content_tv.setText("您有" + SUBRICE_count + "条订阅消息未阅读");
+//                        time_tv.setText("刚刚");
+//                    } else {
+//                        num_tv.setVisibility(View.GONE);
+//                        content_tv.setText("您暂无未阅读订阅消息");
+//                    }
+//                    break;
             }
         }
     };
@@ -925,8 +957,8 @@ public class MessageFragment extends EasyFragment {
                 }
                 TASK_count = task_num;
                 handler.sendEmptyMessage(TASK_MSG);
-                DAIBAN_count = daiban_num;
-                handler.sendEmptyMessage(DAIBAN_MSG);
+//                DAIBAN_count = daiban_num;
+//                handler.sendEmptyMessage(DAIBAN_MSG);
                 SUBRICE_count = pagin_num;
                 handler.sendEmptyMessage(SUBRICE_MSG);
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -20,7 +20,6 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 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.bean.message.SortSubsrciprion;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
@@ -32,26 +31,24 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
 import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 
 public class SubscriptionActivity extends BaseActivity {
-    private int type = -1;
-    private static final int DINGYUE = 0x1, DINGYUE_DEF = 0x2, DINGYUE_SELECT = 0x3;
+    private static final int LOAD_NET = 0x15;
     private int requestCode = 0x01;
+    private String emCode;
     private String baseUrl;
     private PullToRefreshListView listView;
-    private ArrayList<SubscriptionMessage> SubscriptionMessages;
+    private List<SubscriptionMessage> SubscriptionMessages;
     private SubscriptionAdapter adapter;
     private SubscriptionActivity activity = this;
     private ArrayList<SortSubsrciprion> sortSubsrciprions;
@@ -75,40 +72,38 @@ public class SubscriptionActivity extends BaseActivity {
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            String message = (String) msg.getData().get("result");
-            if (msg.what == 2) {
-                try {
-                    JSONObject object = new JSONObject(message);
-                    JSONArray array = object.getJSONArray("data");
-                    SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
-                    setData();
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
-                //错误信息
-                if (listView != null)
-                    listView.onRefreshComplete();
-            } else if (msg.what == RESULT_OK) {
-                if (adapter == null) {
-                    adapter = new SubscriptionAdapter();
-                    listView.getRefreshableView().setAdapter(adapter);
-                } else {
-                    notifyAdapter();
-                }
+            if (listView != null && listView.isRefreshing())
                 listView.onRefreshComplete();
+            switch (msg.what) {
+                case LOAD_NET:
+                    String message =   msg.getData().getString("result");
+                    if (message != null && JSON.parseObject(message).containsKey("data")) {
+                        String str = JSON.parseObject(message).getJSONArray("data").toJSONString();
+                        SubscriptionMessages = JSON.parseArray(str, SubscriptionMessage.class);
+                        setData();
+                    } else {
+                        ToastUtil.showToast(ct, message == null ? "" : message);
+                    }
+                    break;
+                case RESULT_OK:
+                    if (adapter == null) {
+                        adapter = new SubscriptionAdapter();
+                        listView.getRefreshableView().setAdapter(adapter);
+                    } else {
+                        notifyAdapter();
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    ToastUtil.showToast(ct,"系统内部错误");
+                    break;
+                default:
             }
+
+
         }
     };
-    String mLoginUserId;
-    private String emCode;
 
 
-    @Override//设置右划退出
-    public void setTouch(boolean b) {
-        super.setTouch(false);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 //        getMenuInflater().inflate(R.menu.menu_subscription, menu);
@@ -137,9 +132,7 @@ public class SubscriptionActivity extends BaseActivity {
     private void initView() {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
-        View aa = LayoutInflater.from(this).inflate(R.layout.subscrip_emptyview, null);
-        getSupportActionBar().setCustomView(aa);
-        listView.setEmptyView(aa);
+        listView.setEmptyView(R.layout.subscrip_emptyview);
         listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
@@ -174,7 +167,6 @@ public class SubscriptionActivity extends BaseActivity {
     }
 
     private void init() {
-        mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         emCode = CommonUtil.getSharedPreferences(mContext, "erp_username") + CommonUtil.getSharedPreferences(mContext, "erp_master");
         //第一次进来获取数据库
@@ -185,7 +177,6 @@ public class SubscriptionActivity extends BaseActivity {
         calendar.set(Calendar.SECOND, 0);
         newlong = calendar.getTimeInMillis();
         SubscriptionMessages = SubscriptionDao.getInstance().findByDate(newlong, newlong + daylong, emCode);
-
         if (SubscriptionMessages != null && SubscriptionMessages.size() > 0) {//当天数据库有数据
             loadMore();
         } else {//当天数据库没有数据
@@ -281,14 +272,13 @@ public class SubscriptionActivity extends BaseActivity {
         }
         if (isRef) refresh();
         else loadMore();
-
     }
 
     private void clearDataToDB(long newlong, long date) {
-        SubscriptionDao.getInstance().deleteMessage(newlong, date, emCode);
+        long i = SubscriptionDao.getInstance().deleteMessage(newlong, date, emCode);
     }
 
-    private void saveDataToDB(ArrayList<SubscriptionMessage> subscriptionMessages) {
+    private void saveDataToDB(List<SubscriptionMessage> subscriptionMessages) {
         SubscriptionDao.getInstance().addMessage(subscriptionMessages, emCode);
     }
 
@@ -318,7 +308,7 @@ public class SubscriptionActivity extends BaseActivity {
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, param, handler, headers, 2, null, null, "get");
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, LOAD_NET, null, null, "get");
     }
 
     //外层list

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

@@ -57,6 +57,7 @@
             android:layout_alignBottom="@+id/name_tv"
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@+id/tv"
+            android:paddingBottom="5dp"
             android:text="0 "
             android:textColor="@color/mainList2"
             android:textSize="25dp" />