Merge branch 'release' of ssh://10.10.100.21/source/uu-android into feature_arison

# Conflicts:
#	WeiChat/version.properties

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/ReportStatisticsBiActivity.java

@@ -181,7 +181,9 @@ public class ReportStatisticsBiActivity extends BaseActivity {
                     for (int j = 0; j < reportlist.size(); j++) {
                         if (dataInquiryGirdItemBean.getIconText().equals(reportlist.get(j).getTitle())) {
                             String caller = reportlist.get(j).getCaller();
-                            clickItem(caller);
+                            String title=reportlist.get(j).getTitle();
+                            
+                            clickItem(caller,title);
 //                            Intent intent = new Intent();
 //                            intent.setClass(ReportStatisticsBiActivity.this, ReportQueryCriteriaActivity.class);
 //                            intent.putExtra("reportinfo", reportlist.get(j));
@@ -324,16 +326,18 @@ public class ReportStatisticsBiActivity extends BaseActivity {
 
     }
 
-    public void clickItem(String caller) {
+    public void clickItem(String caller,String title) {
         progressDialog.show();
         String url = CommonUtil.getAppBaseUrl(this) + "common/bi/getToken.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         params.put("caller", caller);
         params.put("master", CommonUtil.getMaster());
+        Bundle bundle = new Bundle();
+        bundle.putString("mTitle", title);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_CLICK_URL, null, null, "get");
+        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_CLICK_URL, null, bundle, "get");
     }