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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 24 21:17:40 CST 2018
-debugName=407
+#Fri May 25 08:41:54 CST 2018
+debugName=409
 versionName=630
-debugCode=407
+debugCode=409
 versionCode=170

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -155,7 +155,18 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
                     progressDialog.dismiss();
                     gridlists.clear();
                     Log.i(TAG, "json:" + msg.getData().getString("result"));
-                    showFunelView(msg.getData().getString("result"));
+                   JSONArray jsonArray=JSON.parseObject(msg.getData().getString("result")).getJSONArray("chances");
+                    if (jsonArray != null) {
+                       if (jsonArray.size()>0) {
+                           showFunelView(msg.getData().getString("result"));
+                       }else{
+                           String json = "{\"sessionId\":\"A84EE897980B21770FD00FC69C47B27B\",\"chances\":[{\"detno\":1,\"percent\":\"0.00%\",\"count\":0,\"color\":\"485CC6\",\"currentprocess\":\"初次沟通\"},{\"detno\":2,\"percent\":\"0.00%\",\"count\":0,\"color\":\"4686CC\",\"currentprocess\":\"产品演示\"},{\"detno\":3,\"percent\":\"0.00%\",\"count\":0,\"color\":\"49B0C9\",\"currentprocess\":\"立项评估\"},{\"detno\":4,\"percent\":\"0.00%\",\"count\":0,\"color\":\"48C79E\",\"currentprocess\":\"需求分析\"},{\"detno\":5,\"percent\":\"0.00%\",\"count\":0,\"color\":\"55CC59\",\"currentprocess\":\"样品报价\"},{\"detno\":6,\"percent\":\"0.00%\",\"count\":0,\"color\":\"90BB42\",\"currentprocess\":\"商务谈判\"},{\"detno\":7,\"percent\":\"0.00%\",\"count\":0,\"color\":\"BAA535\",\"currentprocess\":\"合同签约\"},{\"detno\":8,\"percent\":\"0.00%\",\"count\":0,\"color\":\"C7853F\",\"currentprocess\":\"完成交易\"},{\"detno\":9,\"percent\":\"0.00%\",\"count\":0,\"color\":\"BB5743\",\"currentprocess\":\"多次交易\"}],\"success\":true}";
+                           showFunelView(json);  
+                       }
+                    }else {
+                        String json = "{\"sessionId\":\"A84EE897980B21770FD00FC69C47B27B\",\"chances\":[{\"detno\":1,\"percent\":\"0.00%\",\"count\":0,\"color\":\"485CC6\",\"currentprocess\":\"初次沟通\"},{\"detno\":2,\"percent\":\"0.00%\",\"count\":0,\"color\":\"4686CC\",\"currentprocess\":\"产品演示\"},{\"detno\":3,\"percent\":\"0.00%\",\"count\":0,\"color\":\"49B0C9\",\"currentprocess\":\"立项评估\"},{\"detno\":4,\"percent\":\"0.00%\",\"count\":0,\"color\":\"48C79E\",\"currentprocess\":\"需求分析\"},{\"detno\":5,\"percent\":\"0.00%\",\"count\":0,\"color\":\"55CC59\",\"currentprocess\":\"样品报价\"},{\"detno\":6,\"percent\":\"0.00%\",\"count\":0,\"color\":\"90BB42\",\"currentprocess\":\"商务谈判\"},{\"detno\":7,\"percent\":\"0.00%\",\"count\":0,\"color\":\"BAA535\",\"currentprocess\":\"合同签约\"},{\"detno\":8,\"percent\":\"0.00%\",\"count\":0,\"color\":\"C7853F\",\"currentprocess\":\"完成交易\"},{\"detno\":9,\"percent\":\"0.00%\",\"count\":0,\"color\":\"BB5743\",\"currentprocess\":\"多次交易\"}],\"success\":true}";
+                        showFunelView(json);
+                    }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();