Merge remote-tracking branch 'origin/qa_byd' into qa_byd

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/proguard-rules.pro

@@ -333,6 +333,14 @@
     <init>(java.lang.Throwable);
 }
 
+#-----Netty-----
+-keepattributes Signature,InnerClasses
+-keepclasseswithmembers class io.netty.** {
+    *;
+}
+-dontwarn io.netty.**
+-dontwarn sun.**
+
 #-----ZhiDaoService-----
 -keep class com.zhidao.auto.platform.**{*;}
 -keep class com.zhidao.auto.carcorder.**{*;}