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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 22 17:16:40 CST 2017
-debugName=242
+#Mon Dec 25 15:08:51 CST 2017
+debugName=246
 versionName=612
-debugCode=242
+debugCode=246
 versionCode=151

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -30,7 +30,7 @@ public class HttpClient {
     private File cacheFile;//缓存文件路径
     private long cacheFileSize;//缓存文件大小
     private int maxRetryCount;// 最大重试次数
-    private boolean isDebug = true;// 是否开启打印日志
+    private boolean isDebug;// 是否开启打印日志
     private Builder mBuilder;
 
     private HttpBase httpBase;
@@ -115,7 +115,7 @@ public class HttpClient {
         private long cacheFileSize;//缓存文件大小
         private int maxRetryCount;// 最大重试次数
         private long retryTimeout = 5;//重试间隔时间
-        private boolean isDebug = true;// 是否开启打印日志
+        private boolean isDebug;// 是否开启打印日志
         private HttpBase httpBase;//具体的网络请求类
         private int what;
 

app_modular/appworks/src/main/AndroidManifest.xml

@@ -343,7 +343,13 @@
             android:label="@string/title_device_manage" /> <activity
             android:name=".CRM.erp.activity.DeviceCycleCountAddActivity"
             android:label="@string/text_cycle_count_add" />
-        <activity android:name=".OA.platform.activity.BusinessTravelActivity"></activity>
+        <activity android:name=".OA.platform.activity.BusinessTravelActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.BusinessTravelActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name=".activity.DeviceQueryActivity"
                   android:windowSoftInputMode="adjustPan">

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

@@ -141,13 +141,13 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         if (TextUtils.isEmpty(mCaller)) {
             mCaller = "Device";
         }
-        //TODO gongpengming
+
         if (!TextUtils.isEmpty(mClass)) {
-            String dc_class="dc_class";
-            if (mCaller!=null&&mCaller.equals("DeviceChange!Maintain")){
-                dc_class="db_class";
-            }
-            mBaseCondition = "("+dc_class+" = \'" + mClass + "\')";
+            String dc_class = "dc_class";
+//            if (mCaller != null && mCaller.equals("DeviceChange!Maintain")) {
+//                dc_class = "db_class";
+//            }
+            mBaseCondition = "(" + dc_class + " = \'" + mClass + "\')";
             mCondition = mBaseCondition;
         }
     }