Merge branch 'pandorapan_社区相关' into dev_改版主分支

# Conflicts:
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java

common/src/main/res/values-zh-rHK/strings.xml

@@ -94,6 +94,7 @@
     <string name="edit_profile_right_date">請選擇正確的日期</string>
     <string name="edit_nick_name_price_msg">溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石1800一次</string>
     <string name="follow">關注</string>
+    <string name="main_type_theater">短劇</string>
     <string name="unfollow">  主播哪裡做的不好~\n哥哥確定要取消關注嗎?</string>
     <string name="unfollow_confrim">繼續關注</string>
     <string name="unfollow_cancel">不再關注</string>
@@ -463,6 +464,7 @@
     <string name="recommend_enter">點擊進入</string>
     <string name="recomment_to_you">為你推薦</string>
     <string name="recomment">推薦</string>
+    <string name="main_type_find">發現</string>
     <string name="sex_male">男</string>
     <string name="sex_female">女</string>
     <string name="setting">個性設置</string>