Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java

@@ -111,6 +111,15 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
         mFooter.setTextSizeTitle(14);
     }
 
+    /**
+     * 设置头部字体颜色
+     *
+     * @param textColor
+     */
+    public void setHeaderTextColor(int textColor) {
+        mHeader.setAccentColor(textColor);
+    }
+
     private HttpCallback mRefreshCallback = new HttpCallback() {
 
         private int mDataCount;
@@ -295,7 +304,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
      * 手动设置没有更多数据
      * 因为日榜/周榜接口没有分页参数，会导致一直读取重复数据
      */
-    public void setNotLoadMore(){
+    public void setNotLoadMore() {
         mSmartRefreshLayout.finishLoadMoreWithNoMoreData();
     }
 

common/src/main/java/com/yunbao/common/utils/WordUtil.java

@@ -4,6 +4,8 @@ import android.content.res.Resources;
 
 import com.yunbao.common.CommonAppContext;
 
+import java.util.Locale;
+
 /**
  * Created by cxf on 2017/10/10.
  * 获取string.xml中的字
@@ -20,4 +22,10 @@ public class WordUtil {
     public static String getString(int res) {
         return sResources.getString(res);
     }
+
+    public static boolean isZh() {
+        Locale locale = sResources.getConfiguration().locale;
+        String language = locale.getLanguage();
+        return language.endsWith("zh");
+    }
 }

common/src/main/res/layout/item_sidebar_lives.xml

@@ -21,12 +21,17 @@
 
         <ImageView
             android:id="@+id/live_type"
-            android:layout_width="46dp"
-            android:layout_height="18dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_margin="4dp"
-            android:scaleType="centerCrop"
             android:gravity="center" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="25dp"
+            android:layout_gravity="bottom"
+            android:background="@mipmap/bg_main_item_bottom" />
+
         <TextView
             android:id="@+id/name"
             android:layout_width="wrap_content"

common/src/main/res/values-en/strings.xml

@@ -76,7 +76,6 @@
     <string name="completing_mission">completing mission</string>
 
 
-
     <string name="apply_for_lianmai">ApplyMic</string>
     <string name="cancel_application">Cancel Mic</string>
     <string name="quit_mic">Quit Mic</string>
@@ -172,7 +171,7 @@
     <string name="only_one">Only one can be given away~</string>
     <string name="guard_guard">Guard</string>
     <string name="guard_week_con">Contribution this week</string>
-    <string name="guard_no_data">Become the girst Guard of he/she</string>
+    <string name="guard_no_data">anchor are waiting at your guard!</string>
     <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
     <string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
     <string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
@@ -286,7 +285,7 @@
     <string name="live_zg">Tricky</string>
     <string name="live_dr">MultiplayerPK</string>
     <string name="live_mic">LianmaiVoice</string>
-    <string name="live_wks">ZhouXingbang</string>
+    <string name="live_wks">Start</string>
     <string name="live_zslk">LeaveTemporarily</string>
     <string name="live_zslk1">ResumeLive</string>
     <string name="live_flash">Flash lamp</string>
@@ -306,7 +305,7 @@
     <string name="live_votes">Harvest</string>
     <string name="live_watch_num">Number of visitors</string>
     <string name="live_end_ing">Guan Zhong</string>
-    <string name="live_say_something">Tell you something</string>
+    <string name="live_say_something">Let\'s have a chat~</string>
     <string name="live_open_alba">Open the barrage,</string>
     <string name="live_tiao">strip</string>
     <string name="live_input_password">Please enter the room password</string>
@@ -372,7 +371,7 @@
     <string name="live_choose_live_class">Please select a channel</string>
     <string name="live_follow_anchor">Focus on the anchor</string>
     <string name="live_report">Are you sure to report?</string>
-    <string name="live_link_mic_2">Interaction between wheat and wheat</string>
+    <string name="live_link_mic_2">Interaction</string>
     <string name="live_link_mic_3">End Lian Mai</string>
     <string name="live_link_mic_4">Allowed even wheat</string>
     <string name="live_link_mic_5">Ban Lian Mai</string>
@@ -861,5 +860,13 @@ Limited ride And limited avatar frame</string>
     <string name="anchor">anchor</string>
     <string name="anchor_more">More</string>
     <string name="wonderful_live">Wonderful live</string>
-    <string name="recommended_for_you">recommended for you</string>
+    <string name="recommended_for_you">More</string>
+    <string name="fun_games">Fun Games</string>
+    <string name="value_added_benefits">Value-added benefits</string>
+    <string name="fan_club">Fan Club</string>
+    <string name="activity_center">Activity</string>
+    <string name="basic_tools">Basic tools</string>
+    <string name="effects_settings">Effect settings</string>
+    <string name="shield_gift_effect">Shield gift effect</string>
+    <string name="shield_mount_effect">Shield car effect</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -123,7 +123,7 @@
 
     <string name="guard_guard">守護</string>
     <string name="guard_week_con">本周貢獻</string>
-    <string name="guard_no_data">主播正在等待您成為TA的守護，為TA保駕護航！</string>
+    <string name="guard_no_data">主播正在等待您的守護！</string>
     <string name="guard_tip_0">快去為喜歡的主播開通守護吧</string>
     <string name="guard_tip_1">您是當前主播的月守護\n守護日期截止到</string>
     <string name="guard_tip_2">您是當前主播的年守護\n守護日期截止到</string>
@@ -243,7 +243,7 @@
     <string name="live_votes">收穫</string>
     <string name="live_watch_num">觀看人數</string>
     <string name="live_end_ing">關播中</string>
-    <string name="live_say_something">和大家說點什麼…</string>
+    <string name="live_say_something">一起来聊聊天吧～</string>
     <string name="live_open_alba">開啟彈幕，</string>
     <string name="live_tiao">條</string>
     <string name="live_input_password">請輸入房間密碼</string>
@@ -875,11 +875,11 @@
     <string name="wonderful_live">精彩直播</string>
     <string name="recommended_for_you">為您推薦</string>
     <string name="fun_games">趣味游戏</string>
-    <string name="value_added_benefits">增值权益</string>
+    <string name="value_added_benefits">增值權益</string>
     <string name="fan_club">粉絲團</string>
     <string name="activity_center">活動中心</string>
-    <string name="basic_tools">基础工具</string>
+    <string name="basic_tools">基礎工具</string>
     <string name="effects_settings">特效設置</string>
-    <string name="shield_gift_effect">屏蔽礼物特效</string>
-    <string name="shield_mount_effect">屏蔽坐骑特效</string>
+    <string name="shield_gift_effect">屏蔽禮物特效</string>
+    <string name="shield_mount_effect">屏蔽座駕特效</string>
 </resources>