Browse Source

2016/8/31 修复首页异常及bug

Bitliker 9 years ago
parent
commit
94f33b0bea

+ 1 - 1
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'

+ 3 - 11
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninClickFragment.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -142,7 +141,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         ViewUtils.inject(getmRootView());
         setHasOptionsMenu(true);
-        ActionBar bar = ct.getSupportActionBar();
         init();
         initView();
     }
@@ -518,32 +516,26 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         Bean b = null;
         switch (num) {
             case 3:
-                chche.clear();
                 b = new Bean();//上班
                 b.time = object.containsKey("wd_ondutythree") ? object.getString("wd_ondutythree") : "08:30";
                 b.startSignin = object.containsKey("wd_onbeg3") ? object.getString("wd_onbeg3") : "07:00";
                 b.time2 = object.containsKey("wd_offdutythree") ? object.getString("wd_offdutythree") : "11:30";
                 b.startSignin2 = object.containsKey("wd_offend3") ? object.getString("wd_offend3") : "12:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
             case 2:
-                chche.clear();
                 b = new Bean();
                 b.time = object.containsKey("wd_ondutytwo") ? object.getString("wd_ondutytwo") : "--:--";
                 b.startSignin = object.containsKey("wd_onbeg2") ? object.getString("wd_onbeg2") : "07:00";
                 b.time2 = object.containsKey("wd_offdutytwo") ? object.getString("wd_offdutytwo") : "--:--";
                 b.startSignin2 = object.containsKey("wd_offend2") ? object.getString("wd_offend2") : "07:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
             case 1:
-                chche.clear();
                 b = new Bean();
                 b.time = object.containsKey("wd_ondutyone") ? object.getString("wd_ondutyone") : "--:--";
                 b.startSignin = object.containsKey("wd_onbeg1") ? object.getString("wd_onbeg1") : "07:00";
                 b.time2 = object.containsKey("wd_offdutyone") ? object.getString("wd_offdutyone") : "--:--";
                 b.startSignin2 = object.containsKey("wd_offend1") ? object.getString("wd_offend1") : "07:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
                 break;
         }//添加上班签到时间完成
         endLoadData(beans);

+ 20 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -169,6 +169,7 @@ public class MessageFragment extends EasyFragment {
     }
 
     public void setListener(int num) {
+        Log.i("gongpengming", num + "num=");
         if (refreshRedUIListener == null) return;
         refreshRedUIListener.updata(num);
     }
@@ -276,13 +277,10 @@ public class MessageFragment extends EasyFragment {
         num_tv = (TextView) view.findViewById(R.id.num_tv);
         content_tv = (TextView) view.findViewById(R.id.content_tv);
         time_tv = (TextView) view.findViewById(R.id.time_tv);
-
         b2b_num_tv = (TextView) view.findViewById(R.id.b2b_num_tv);
         b2b_content_tv = (TextView) view.findViewById(R.id.b2b_content_tv);
         b2b_time_tv = (TextView) view.findViewById(R.id.b2b_time_tv);
-
         rl_b2b = (RelativeLayout) view.findViewById(R.id.rl_b2b_business);
-
         view.findViewById(R.id.schedule_rl).setOnClickListener(listener);
         view.findViewById(R.id.task_rl).setOnClickListener(listener);
         view.findViewById(R.id.notice_rl).setOnClickListener(listener);
@@ -645,6 +643,21 @@ public class MessageFragment extends EasyFragment {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.LOAD_SUCCESS, null, null, "get");
     }
 
+    //获取任务
+    public void loadTaskByNet(int handlerWhat) {
+        String url = Constants.getAppBaseUrl(getActivity()) + "common/datalist/data.action";
+        Map<String, Object> mparams = new HashMap<String, Object>();
+        mparams.put("sessionId", CommonUtil.getSharedPreferences(mActivity, "sessionId"));
+        mparams.put("caller", "ResourceAssignment");
+        mparams.put("page", "1");
+        mparams.put("pageSize", "100");
+        mparams.put("_noc", "1");
+        String em_code = CommonUtil.getSharedPreferences(mActivity, "erp_username");
+        mparams.put("condition", "ra_resourcecode='" + em_code + "' and ra_statuscode='" + "START" + "'");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mActivity, "sessionId"));
+        ViewUtil.httpSendRequest(mActivity, url, mparams, handler, headers, handlerWhat, null, null, "get");
+    }
 
     public void loadGongGaoCount(Context ct) {
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
@@ -710,6 +723,7 @@ public class MessageFragment extends EasyFragment {
             b2b_num_tv.setVisibility(View.VISIBLE);
             b2b_content_tv.setText("您有" + bMsgs.size() + "条商务消息未读");
             rl_b2b.setVisibility(View.VISIBLE);
+            Log.i("gongpengming", "bMsgs.size=" + bMsgs.size());
             setListener(bMsgs.size() + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         } else {
             rl_b2b.setVisibility(View.GONE);
@@ -733,6 +747,7 @@ public class MessageFragment extends EasyFragment {
                                 num += 1;
                         }
                     }
+                    Log.i("gongpengming", "num.size=" + num);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
                     if (num > 0) {
                         num_tv.setText(num + "");
@@ -767,6 +782,7 @@ public class MessageFragment extends EasyFragment {
                     setNOTICE_count(GONGGAO_count + NOTICE_count + NES_count);
                     break;
                 case TASK_MSG:
+                    Log.i("gonpengming", "TASK_MSG=" + TASK_count);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
@@ -808,6 +824,7 @@ public class MessageFragment extends EasyFragment {
 
 
     private void setNOTICE_count(int count) {
+        Log.i("gongpengming","setNOTICE_count="+count);
         setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         if (count > 0) {
             notice_num_tv.setText(count + "");