12:00

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

@@ -195,7 +195,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
 
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
-            allList.clear();
+            if (!ListUtils.isEmpty(real_List)) real_List.clear();
             ToastMessage("刷新成功");
         } else {
             ToastMessage("加载完毕");
@@ -883,9 +883,18 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 0x17 || (requestCode == 0x20 && resultCode == 0x20)) {
+        if (requestCode == 0x17) {
 //            refreshing();
-            if (mPosition != -1){
+            //  录入一张单据后刷新所有界面
+            if (!ListUtils.isEmpty(waitList)) waitList.clear();
+            if (!ListUtils.isEmpty(doneList)) doneList.clear();
+            if (!ListUtils.isEmpty(isendList)) isendList.clear();
+            mCurrentPage = 1;
+            sendResquestForServerAll(2, mCurrentPage);
+        }
+
+        if (requestCode == 0x20 && resultCode == 0x20){
+            if (mPosition != -1 && !ListUtils.isEmpty(real_List)){
                 real_List.remove(mPosition);
                 adapter.notifyDataSetChanged();
             }

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

@@ -411,7 +411,6 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
 
 
     private void doClickEvent(int mPosition, int msg_id) {
-//        if ("note".equals(msg_type) || "meeting".equals(msg_type)) {
             baseUrl = CommonUtil.getSharedPreferences(mContext, "erp_baseurl");
             String url = baseUrl + "mobile/message/getDetail.action";
             Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
@@ -420,11 +419,9 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             startActivityForResult(intent_web, MSG_MARKED_READED);
 
         Log.d("322msg_id",msg_id + ":" + url);
-//        } else {
             msgModel.get(mPosition).setReaded(true);
             MessageDao.getInstance().upStatus(msg_id,msg_type, true);//点击保存本地为已读状态操作
             msgAdapter.notifyDataSetChanged();
-//        }
     }
 
     private void showPopupWindow() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -139,14 +139,6 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             allList.add(process);
                         }
                         doClassifyAllList(allList); // TODO 分类
-         /*               adapter = new NewSchedultAdapter(TaskB2BActivity.this, allList);
-                        listview_main.setAdapter(adapter);
-                        if (adapter.getCount() != 0) {
-                            sendHomeBroadcast(adapter.getCount());
-                        } else {
-                            mEmptyLayout.showEmpty();
-                        }
-                        listview_main.onRefreshComplete();*/
                     } else {
                         mEmptyLayout.showEmpty();
                         listview_main.onRefreshComplete();
@@ -234,7 +226,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
-            allList.clear();
+            if (!ListUtils.isEmpty(real_List)) real_List.clear();
             ToastMessage("刷新成功");
         } else {
             ToastMessage("加载完毕");
@@ -691,9 +683,17 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 0x17 || (requestCode == 0x20 && resultCode == 0x20)) {
+        if (requestCode == 0x17 ) {
 //            refreshing();
-            if (mPosition != -1){
+            if (!ListUtils.isEmpty(waitList)) waitList.clear();
+            if (!ListUtils.isEmpty(doneList)) doneList.clear();
+            if (!ListUtils.isEmpty(isendList)) isendList.clear();
+            mCurrentPage = 1;
+            sendResquestForServer("", 2,mCurrentPage); // update
+        }
+
+        if (requestCode == 0x20 && resultCode == 0x20){
+            if (mPosition != -1 && !ListUtils.isEmpty(real_List)){
                 real_List.remove(mPosition);
                 adapter.notifyDataSetChanged();
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -108,7 +108,8 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                     if (falg) {
                         ViewUtil.ShowMessageTitle(ct, "操作成功！");
                         setResult(0x20, new Intent());
-                        goBackMenu();
+//                        goBackMenu();
+                        finish();
                     } else {
                         ViewUtil.ShowMessageTitle(ct, "操作失败！");
                     }

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/service/StepService.java

@@ -293,8 +293,8 @@ public class StepService extends Service implements SensorEventListener {
 
     @Override
     public void onSensorChanged(SensorEvent event) {
-//        i++;
-//        StepDcretor.CURRENT_SETP ++; //TODO 这里取消屏蔽功能，动一次计步叠加一次
+        i++;
+        StepDcretor.CURRENT_SETP ++; //TODO 这里取消屏蔽功能，动一次计步叠加一次
         updateNotification("今日步数：" + StepDcretor.CURRENT_SETP + " 步");
     }
 

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

@@ -49,7 +49,6 @@
                 android:textColor="#575757"
                 android:textSize="@dimen/text_hine"
                 android:layout_marginTop="10dp"
-                android:text="小跟班"
                 />
             <TextView
                 android:id="@+id/common_docui_Section_tv"
@@ -61,7 +60,7 @@
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_hine"
                 android:layout_marginTop="4dp"
-                android:text="B2B平台部>软件工程师"/>
+                />
             <TextView
                 android:id="@+id/common_docui_status_tv"
                 android:layout_width="wrap_content"