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");
+    }
 }