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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 19:14:31 CST 2018
-debugName=151
+#Wed Jan 24 19:46:15 CST 2018
+debugName=155
 versionName=613
-debugCode=151
+debugCode=155
 versionCode=152

app_core/common/src/main/java/com/core/app/Constants.java

@@ -17,7 +17,7 @@ public class Constants {
         String url = "";
         if (BaseConfig.isDebug()) {
             url = IM_BASE_URL_TEST;
-//            url = IM_BASE_URL;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_modular/appworks/src/main/AndroidManifest.xml

@@ -402,7 +402,8 @@
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.PublicInquiryDetailActivity" />
         
-        <activity android:name=".activity.CustomerInquiryDetailActivity">
+        <activity android:name=".activity.CustomerInquiryDetailActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="com.modular.work.platform.activity.CustomerInquiryDetailActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -462,7 +462,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         } else if (flag == PUBLIC_INQUIRY_DETAIL) {
 
             initEditable(true, View.VISIBLE);
-            initDetailData(result);
+            
+            JSONObject resultObject = JSON.parseObject(result);
+            JSONObject inquiryItem = resultObject.getJSONObject("inquiryItem");
+            initDetailData(inquiryItem.toString());
         }
     }