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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 20 09:12:31 CST 2017
+#Mon Nov 20 15:35:18 CST 2017
 debugName=1
 versionName=618
-debugCode=19
+debugCode=24
 versionCode=118

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1034,8 +1034,8 @@ public class ViewUtil {
     public static void LoginERPTask(String url, String master, String username,
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-       url = url + "mobile/login.action";
-       // url ="http://192.168.253.29:8080/ERP/mobile/login.action";
+      // url = url + "mobile/login.action";
+       url ="http://192.168.253.29:8080/ERP/mobile/login.action";
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -94,8 +94,8 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        return baseUrl;
-//        return "http://192.168.253.29:8080/ERP/";
+        //return baseUrl;
+        return "http://192.168.253.29:8080/ERP/";
     }
 
     /**

app_modular/appworks/src/main/AndroidManifest.xml

@@ -239,8 +239,15 @@
         </activity>
 
         <activity android:name=".activity.CommonDataFormActivity">
+        <intent-filter>
+            <action android:name="com.modular.work.CommonDataFormActivity" />
+            <category android:name="android.intent.category.DEFAULT" />
+        </intent-filter>
+    </activity>
+
+        <activity android:name=".activity.CommonFormListActivity">
             <intent-filter>
-                <action android:name="com.modular.work.CommonDataFormActivity" />
+                <action android:name="com.modular.work.CommonFormListActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -807,9 +807,9 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             .putExtra("caller", caller),
                     0x25);
         } else if (item.getItemId() == R.id.oa_leave) {
-            startActivity(new Intent(mContext, FormListSelectActivity.class)
-                    .putExtra("caller",
-                            caller)
+            startActivity(new Intent(mContext, CommonFormListActivity.class)
+                    .putExtra("serveId",mServeId)
+                    .putExtra("caller", caller)
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
             if (formid != 0) {
                 finish();
@@ -2455,7 +2455,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                 click_btn.setEnabled(false);
             }
         }, 50);
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/takeOverTask.action";
+        String url = CommonUtil.getAppBaseUrl(mContext) + "common/takeOverTask.action";
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("em_code", emName);

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonFormListActivity.java

@@ -41,8 +41,6 @@ import com.core.widget.VoiceSearchView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.me.network.app.http.rx.ResultListener;
-import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
@@ -157,6 +155,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
     private String caller;
     private String status;
     private int currentPosition;
+    private String serveId;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -182,6 +181,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         Intent intent = getIntent();
         caller = intent.getStringExtra("caller");
         from = intent.getStringExtra("from");
+        serveId=intent.getStringExtra("serveId");
         if ("Ask4Leave".equals(caller)) {
             getSupportActionBar().setTitle("请假单");
         }
@@ -345,7 +345,7 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
             }
         });
 
-        /** @注释：已显示单据点击监听 */
+
         mlistview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
             @Override
@@ -402,35 +402,15 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
                 }
 
                 if (itemMap.get(statusKey) == null) {
-                    ToastMessage("单据状态为空！");
-                    return;
-                }
+//                    ToastMessage("单据状态为空！");
+//                    return;
+                } 
                 LogUtil.d("状态：" + itemMap.get(statusKey)
                         .toString());
-                status = itemMap.get(statusKey)
-                        .toString();
-                Intent it_detail = null;
-                if ("SignMain".equals(from)) {
-                    if ("Ask4Leave".equals(caller)) {
-                        it_detail = new Intent("com.modular.plat.LeaveActivity");
-                    }
-                    if ("SpeAttendance".equals(caller)) {
-                        it_detail = new Intent("com.modular.plat.ExtraLeaveActivity");
-                    }
-                    if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-                        it_detail = new Intent("com.modular.plat.TravelActivity");
-                    }
-                    if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-                        it_detail = new Intent("com.modular.plat.WorkExtraActivity");
-                    }
-                } else {
-                    it_detail = new Intent("com.modular.plat.SaleDetailActivity");
-                }
-                it_detail.putExtra("formCondition", keyField + "=" + keyId);
-                it_detail.putExtra("gridCondition", pfField + "=" + keyId);
-                it_detail.putExtra("caller", caller);
+//                status = itemMap.get(statusKey)
+//                        .toString();
+                status = "无状态";
                 LogUtil.d("caller:" + caller + "  id:" + id);
-
                 if ("在录入".equals(status)) {
                     if ("FeePlease!FYBX".equals(caller)) {
                         startActivity(new Intent(mContext,
@@ -460,8 +440,6 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
         isdelete = false;
-
-
     }
 
 
@@ -562,30 +540,20 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
     }
 
     public void sendResquest(String page, String size, String where) {
-       
         HttpClient client = new HttpClient();
-        String sessionId = CommonUtil.getSharedPreferences(this, "sessionId");
         Map<String, String> params = new HashMap<String, String>();
         params.put("page", page);
         params.put("pageSize", size);
-        if (caller.equals("Workovertime")) {
-            params.put("caller", "WorkovertimeDetail");
-        } else {
-            params.put("caller", caller);
-        }
-        if (where == null) {
-            where = "1=1";
-        }
-        params.put("condition", where);
-        params.put("sessionId", sessionId);
+        params.put("serve_id",serveId);
+        params.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         String result = null;
         try {
             result = client.sendPostRequest(CommonUtil.getAppBaseUrl(this)
-                    + "mobile/common/list.action", params);
-            LogUtil.prinlnLongMsg("LongLogs", JSON.toJSONString(params) + ":" + result);
+                    + "api/serve/query.action", params);
+            LogUtil.prinlnLongMsg("HttpLogs", JSON.toJSONString(params) + ":" + result);
             if (result != null && rMap != null) {
-                //这里报销单相同参数第一次请求正常，下啦刷新报错不知道原因，只能这么处理
                 if (result.contains("exceptionInfo")) {
+                    //这里报销单相同参数第一次请求正常，下啦刷新报错不知道原因，只能这么处理
                     handler.sendEmptyMessage(1);
                     mlistview.onRefreshComplete();
                     return;