Merge branch 'develop' into test

# Conflicts:
#	app/build.gradle

.idea/encodings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file

.idea/gradle.xml

@@ -3,6 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

.idea/runConfigurations.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.bgycc.smartcanteen"
         minSdkVersion 21
         targetSdkVersion 22
-        versionCode 12
-        versionName "1.2.0.9.test" // test分支
+        versionCode 13
+        versionName "1.3.3" // test分支
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/bgycc/smartcanteen/AppConfig.kt

@@ -14,7 +14,7 @@ object AppConfig {
     fun getMainWebSocketServerHost(): String {
         return when (SERVER) {
             Server.DEV -> "10.187.43.221:9001"
-            Server.TEST -> "diningservicetest.bgy.com.cn:9001"
+            Server.TEST -> "diningservicetest.bgy.com.cn"
             Server.UAT -> "diningserviceuat.bgy.com.cn"
             else -> "diningservice.bgy.com.cn"
         }
@@ -23,7 +23,7 @@ object AppConfig {
     fun getMainWebSocketServerUrl(id: String, version: String): String {
         return when (SERVER) {
             Server.DEV -> "ws://${getMainWebSocketServerHost()}/websocket/$id/V$version"
-            Server.TEST -> "ws://${getMainWebSocketServerHost()}/websocket/$id/V$version"
+            Server.TEST -> "wss://${getMainWebSocketServerHost()}/websocket/$id/V$version"
             Server.UAT -> "wss://${getMainWebSocketServerHost()}/websocket/$id/V$version"
             else -> "wss://${getMainWebSocketServerHost()}/websocket/$id/V$version"
         }