Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

m-fm/src/main/java/com/yidianling/fm/FMListItemView.java

@@ -39,7 +39,7 @@ public class FMListItemView extends LinearLayout {
         if (!TextUtils.isEmpty(fm.getImageUrl())) {
             GlideApp.with(getContext())
                     .load(fm.getImageUrl())
-                    .placeholder(R.drawable.default_img)
+                    .placeholder(R.drawable.platform_default_img)
                     .into(sdv_head);
         }
         tv_title.setText(fm.getName());

m-fm/src/main/java/com/yidianling/fm/FMListViewFragment.java

@@ -74,7 +74,7 @@ public class FMListViewFragment extends BaseFragment implements PtrHandler, Load
         int color = getResources().getColor(R.color.google_green);
         header.setColorSchemeColors(new int[]{color});
         header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
-        int padding = (int) getActivity().getResources().getDimension(R.dimen.default_dis_size);
+        int padding = (int) getActivity().getResources().getDimension(R.dimen.platform_default_dis_size);
         header.setPadding(0, padding, 0, padding);
         header.setPtrFrameLayout(store_house_ptr_frame);
         store_house_ptr_frame.setHeaderView(header);

m-fm/src/main/res/layout/fragment_fm_list_view.xml

@@ -40,7 +40,7 @@
                     android:id="@+id/ll_empty_txt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/default_dis_size_huge"
+                    android:layout_marginTop="@dimen/platform_default_dis_size_huge"
                     android:text="还没有喜欢的电台内容"
                     android:textColor="#D6D6D6" />
 

m-fm/src/main/res/layout/ui_fm_list_item.xml

@@ -2,7 +2,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
-    android:padding="@dimen/default_dis_size">
+    android:padding="@dimen/platform_default_dis_size">
 
     <ImageView
         android:id="@+id/sdv_head"
@@ -18,9 +18,9 @@
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@+id/iv_next"
         android:layout_toRightOf="@+id/sdv_head"
-        android:padding="@dimen/default_dis_size_small"
+        android:padding="@dimen/platform_default_dis_size_small"
         android:text=""
-        android:textSize="@dimen/default_text_size_big" />
+        android:textSize="@dimen/platform_default_text_size_big" />
 
     <TextView
         android:id="@+id/tv_anchor"
@@ -28,10 +28,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_title"
         android:layout_toRightOf="@+id/sdv_head"
-        android:drawablePadding="@dimen/default_dis_size_micro"
-        android:padding="@dimen/default_dis_size_small"
+        android:drawablePadding="@dimen/platform_default_dis_size_micro"
+        android:padding="@dimen/platform_default_dis_size_small"
         android:text="主播："
-        android:textColor="@color/default_text_color_hint" />
+        android:textColor="@color/platform_default_text_color_hint" />
 
     <TextView
         android:id="@+id/tv_listen_num"
@@ -40,10 +40,10 @@
         android:layout_below="@+id/tv_title"
         android:layout_toLeftOf="@+id/iv_next"
         android:layout_toRightOf="@+id/tv_anchor"
-        android:drawablePadding="@dimen/default_dis_size_micro"
-        android:padding="@dimen/default_dis_size_small"
+        android:drawablePadding="@dimen/platform_default_dis_size_micro"
+        android:padding="@dimen/platform_default_dis_size_small"
         android:text="收听：0"
-        android:textColor="@color/default_text_color_hint" />
+        android:textColor="@color/platform_default_text_color_hint" />
 
     <ImageView
         android:id="@+id/iv_next"

m-fm/src/main/res/layout/ui_music_notification.xml

@@ -12,7 +12,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:contentDescription="@string/platform_header"
-        android:src="@drawable/default_img" />
+        android:src="@drawable/platform_default_img" />
 
     <TextView
         android:id="@+id/tv_title"
@@ -25,7 +25,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="2"
-        android:textColor="@color/default_text_color"
+        android:textColor="@color/platform_default_text_color"
         android:textSize="14sp"
         tools:text="课课程名称课程名称课程名称课程名称课程名称课" />