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

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

@@ -69,7 +69,8 @@ import java.util.regex.PatternSyntaxException;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class TaskActivity extends BaseActivity implements OnClickListener {
-
+    //TODO 应要求修改先修改为2000，后面再优化
+    private final int PAGE_SIZE=2000;
     private EmptyLayout mEmptyLayout;
     private Context context;
     private PullToRefreshListView listview_main;
@@ -788,7 +789,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
         mparams.put("page", "1");
-        mparams.put("pageSize", "100");
+        mparams.put("pageSize", PAGE_SIZE);
         mparams.put("_noc", "1");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
         String erp_emid = CommonUtil.getSharedPreferences(context, "erp_emid");
@@ -805,6 +806,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         ViewUtil.httpSendRequest(context, url, mparams, handler, headers, handlerWhat, null, null, "get");
     }
 
+
     /**
      * @注释： 带条件的调转
      */
@@ -815,7 +817,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
         mparams.put("page", mCurrentPage);
-        mparams.put("pageSize", "100");
+        mparams.put("pageSize", PAGE_SIZE);
         mparams.put("_noc", "1");
         mparams.put("status", "");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
@@ -836,7 +838,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
         mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
         mparams.put("caller", "ResourceAssignment");
         mparams.put("page", "1");
-        mparams.put("pageSize", "100");
+        mparams.put("pageSize", PAGE_SIZE);
         mparams.put("_noc", "1");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_emid");
         mparams.put("condition", "recorderid='" + em_code + "'" + "and handstatuscode<>'FINISHED'" + " and nvl(class,' ')<>'projecttask'");

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

@@ -347,12 +347,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
                     contact_lv.setAdapter(adapter);
 //                    notifyDataSetChanged();
                 }
-            }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialogInterface, int i) {
-
-                }
-            }).show();
+            }).setNegativeButton(R.string.cancel,null).show();
         }
 
         class ViewHodler {

settings.gradle

@@ -4,7 +4,7 @@ include ':WeiChat'
 //核心模块
 include ':network'
 include ':imageload'
-include  ':commom'
+include ':common'
 
 //第三库模块
 include ':lib-zxing'
@@ -21,7 +21,7 @@ include ':pullToRefershLibraryMy'
 //核心模块
 project(':network').projectDir = new File('app_core/network')
 project(':imageload').projectDir = new File('app_core/imageload')
-project(':commom').projectDir = new File('app_core/commom')
+project(':common').projectDir = new File('app_core/common')
 
 
 //第三库模块