动态资源重命名

m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt

@@ -9,7 +9,7 @@ import com.ydl.ydlcommon.base.BaseActivity
 import com.yidianling.dynamic.R
 import com.yidianling.dynamic.router.DynamicIn
 import com.yidianling.dynamic.trendList.TrendsListFragment
-import kotlinx.android.synthetic.main.activity_mytrends.*
+import kotlinx.android.synthetic.main.dynamic_activity_mytrends.*
 import java.util.*
 
 
@@ -34,7 +34,7 @@ class MyTrendsActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_mytrends)
+        setContentView(R.layout.dynamic_activity_mytrends)
         ButterKnife.bind(this)
 
         sendFragment = TrendsListFragment.newInstance(
@@ -104,20 +104,20 @@ class MyTrendsActivity : BaseActivity() {
     //切换标签选中状态
     private fun changeLabel(position: Int, isChangeFragment: Boolean) {
         if (position == 0) {
-            item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.title_green))
+            item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
 
-            item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.title_green))
+            item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
 
-            item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.text_gray))
-            item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.white))
+            item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
+            item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
 
         } else if (position == 1) {
-            item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.text_gray))
+            item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
 
-            item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.white))
+            item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
 
-            item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.title_green))
-            item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.title_green))
+            item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
+            item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
         }
 
         if (isChangeFragment) {

m-dynamic/src/main/java/com/yidianling/dynamic/activity/TrendsReplyInfoActivity.kt

@@ -32,7 +32,7 @@ import com.yidianling.dynamic.thank.ThankActivity
 import com.yidianling.dynamic.trendsDetail.TrendsDetailActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.activity_trends_reply_info.*
+import kotlinx.android.synthetic.main.dynamic_activity_trends_reply_info.*
 import java.util.*
 
 /**
@@ -53,7 +53,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_trends_reply_info)
+        setContentView(R.layout.dynamic_activity_trends_reply_info)
         ButterKnife.bind(this)
 
         val bundle = intent.getBundleExtra(YDLConstants.BUNDLE)
@@ -80,7 +80,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
         val colors = resources.getIntArray(R.array.ydl_colors)
         header!!.setColorSchemeColors(colors)
         header!!.layoutParams = PtrFrameLayout.LayoutParams(-1, -2)
-        val padding = resources.getDimension(R.dimen.default_dis_size).toInt()
+        val padding = resources.getDimension(R.dimen.dynamic_default_dis_size).toInt()
         header!!.setPadding(0, padding, 0, padding)
         header!!.setPtrFrameLayout(store_house_ptr_frame)
         store_house_ptr_frame!!.headerView = header
@@ -102,7 +102,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
         recy_ico_list!!.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
         icoAdapter = object :
-            BaseRecyclerAdapter<TrendsInfoBean.ZanImg>(this, ArrayList(), R.layout.item_circleimg) {
+            BaseRecyclerAdapter<TrendsInfoBean.ZanImg>(this, ArrayList(), R.layout.dynamic_item_circleimg) {
             override fun convert(
                 mContext: Context,
                 holder: BaseViewHolder,
@@ -111,12 +111,12 @@ class TrendsReplyInfoActivity : BaseActivity() {
             ) {
                 val img = holder.getView<ImageView>(R.id.img_ico)
                 if (position == 7) {
-                    GlideApp.with(mContext).load(R.drawable.newsfeed_zan_more).into(img)
+                    GlideApp.with(mContext).load(R.drawable.dynamic_newsfeed_zan_more).into(img)
                 } else if (position > 7) {
 
                 } else {
                     GlideApp.with(mContext).load(bean.head)
-                        .error(resources.getDrawable(R.drawable.head_place_hold_pic)).into(img)
+                        .error(resources.getDrawable(R.drawable.dynamic_head_place_hold_pic)).into(img)
                 }
                 img.setOnClickListener {
                     //点击头像进入会员主页
@@ -227,7 +227,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
         }
 
         GlideApp.with(this).load(bean.info.header).circleCrop()
-            .error(R.drawable.head_place_hold_pic).into(item_recommend_trend_user_head!!)
+            .error(R.drawable.dynamic_head_place_hold_pic).into(item_recommend_trend_user_head!!)
         //        if (bean.getInfo().getgetGender() == 1) {
         //            //男
         //            Glide.with(this).load(R.mipmap.male).into(imgSex);
@@ -276,7 +276,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
             GlideApp.with(this).load(infoBean!!.comment.header).circleCrop()
                 .into(item_recommend_trend_user_head_iv!!)
             text_reply_userName!!.text = infoBean!!.comment.name
-            comment_sex_iv!!.setImageResource(if (infoBean!!.comment.gender == 1) R.drawable.male else R.drawable.female)
+            comment_sex_iv!!.setImageResource(if (infoBean!!.comment.gender == 1) R.drawable.dynamic_male else R.drawable.dynamic_female)
             text_reply_time!!.text = infoBean!!.comment.time_str
             //            textCommentContent.setText(infoBean.getComment().getContent());
             MoonUtil.identifyFaceExpression(
@@ -288,9 +288,9 @@ class TrendsReplyInfoActivity : BaseActivity() {
             //是否已赞
             if (infoBean!!.comment.is_zan == 1) {
                 //已赞
-                img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan_sel))
+                img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan_sel))
             } else {
-                img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan))
+                img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan))
             }
         }
     }
@@ -346,10 +346,10 @@ class TrendsReplyInfoActivity : BaseActivity() {
                         //评论点赞成功
                         if (infoBean!!.comment.is_zan == 1) {
                             infoBean!!.comment.is_zan = 2
-                            img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan))
+                            img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan))
                         } else {
                             infoBean!!.comment.is_zan = 1
-                            img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan_sel))
+                            img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan_sel))
                         }
                     }
                 } else {

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/AllTopicAdapter.java

@@ -53,7 +53,7 @@ public class AllTopicAdapter extends RecyclerView.Adapter<AllTopicViewHolder> {
 
     @Override
     public AllTopicViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= mInflater.inflate(R.layout.item_alltopic,parent,false);
+        View view= mInflater.inflate(R.layout.dynamic_item_alltopic,parent,false);
         AllTopicViewHolder viewHolder= new AllTopicViewHolder(view);
         return viewHolder;
     }
@@ -68,8 +68,8 @@ public class AllTopicAdapter extends RecyclerView.Adapter<AllTopicViewHolder> {
         String focus_state=recommendTopic.getFocus_state();
         GlideApp.with(mContext)
                 .load(img_url)
-                .placeholder(R.drawable.default_img)
-                .error(R.drawable.default_img)
+                .placeholder(R.drawable.dynamic_default_img)
+                .error(R.drawable.dynamic_default_img)
                 .into(holder.item_topic_iv);
         holder.item_topic_title_tv.setText(topic_title);
         holder.item_topic_trend_num_tv.setText(String.format("动态 %s", trend_num));

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/DialogListAdapter.java

@@ -41,7 +41,7 @@ public class DialogListAdapter extends RecyclerView.Adapter<DialogListViewHolder
 
     @Override
     public DialogListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= mInflater.inflate(R.layout.item_dialog_list,parent,false);
+        View view= mInflater.inflate(R.layout.dynamic_item_dialog_list,parent,false);
         DialogListViewHolder viewHolder= new DialogListViewHolder(view);
         return viewHolder;
     }

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/PublishTrendImgAdapter.java

@@ -70,7 +70,7 @@ public class PublishTrendImgAdapter extends RecyclerView.Adapter<PublishTrendImg
     @Override
     public PublishTrendImgViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = null;
-        view = mInflater.inflate(R.layout.item_publish_trend_img, parent, false);
+        view = mInflater.inflate(R.layout.dynamic_item_publish_trend_img, parent, false);
         PublishTrendImgViewHolder viewHolder = new PublishTrendImgViewHolder(view);
         return viewHolder;
     }
@@ -90,7 +90,7 @@ public class PublishTrendImgAdapter extends RecyclerView.Adapter<PublishTrendImg
             holder.item_publish_iv.setVisibility(View.VISIBLE);
             GlideApp.with(mContext)
                     .load(path)
-                    .error(R.drawable.default_img)
+                    .error(R.drawable.dynamic_default_img)
                     .transform(new GlideRoundTransform(mContext, 6))
 //                    .centerCrop()
                     .into(holder.item_publish_iv);

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendDicussAdapter.java

@@ -40,7 +40,7 @@ public class RecommendDicussAdapter extends RecyclerView.Adapter<RecommendDicuss
 
     @Override
     public RecommendDicussViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= mInflater.inflate(R.layout.item_discuss_list,parent,false);
+        View view= mInflater.inflate(R.layout.dynamic_item_discuss_list,parent,false);
         RecommendDicussViewHolder viewHolder= new RecommendDicussViewHolder(view);
         return viewHolder;
     }
@@ -54,7 +54,7 @@ public class RecommendDicussAdapter extends RecyclerView.Adapter<RecommendDicuss
         String content=reconmmendDicuss.getContent();
 
 //        holder.discuss_tv.setText(content);
-        MoonUtil.SetDicuss(mContext,holder.discuss_tv,content,user_name,R.color.default_text_color,reply_user_name, ImageSpan.ALIGN_BOTTOM);
+        MoonUtil.SetDicuss(mContext,holder.discuss_tv,content,user_name,R.color.dynamic_default_text_color,reply_user_name, ImageSpan.ALIGN_BOTTOM);
         setUpItemEvent(holder);
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTopicAdapter.java

@@ -42,7 +42,7 @@ public class RecommendTopicAdapter extends RecyclerView.Adapter<RecommendTopicVi
 
     @Override
     public RecommendTopicViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= mInflater.inflate(R.layout.item_recommend_topic,parent,false);
+        View view= mInflater.inflate(R.layout.dynamic_item_recommend_topic,parent,false);
         RecommendTopicViewHolder viewHolder= new RecommendTopicViewHolder(view);
         return viewHolder;
     }
@@ -55,7 +55,7 @@ public class RecommendTopicAdapter extends RecyclerView.Adapter<RecommendTopicVi
         String topic_title=recommendTopic.getTopic_title();
         GlideApp.with(mContext)
                 .load(img_url)
-                .error(R.drawable.default_img)
+                .error(R.drawable.dynamic_default_img)
                 .transform(new CropSquareTransformation(mContext))//裁剪正方形
                 .override(270, 150)
                 .centerCrop()

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTrendAdapter.java

@@ -121,21 +121,21 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         RecyclerView.ViewHolder holder = null;
         switch (viewType) {
             case TYPE_ONE:
-                view = mInflater.inflate(R.layout.item_recommend_trend, parent, false);
+                view = mInflater.inflate(R.layout.dynamic_item_recommend_trend, parent, false);
                 holder = new RecommendTrendViewHolder(view);
                 break;
 
             case TYPE_TWO:
-                view = mInflater.inflate(R.layout.item_recommend_trend_ad, parent, false);
+                view = mInflater.inflate(R.layout.dynamic_item_recommend_trend_ad, parent, false);
                 holder = new RecommendTrendAdViewHolder(view);
                 break;
 
             case TYPE_LODE_MORE:
-                view = mInflater.inflate(R.layout.item_trend_load_more, parent, false);
+                view = mInflater.inflate(R.layout.dynamic_item_trend_load_more, parent, false);
                 holder = new TrendLoadMoreViewHolder(view);
                 break;
             case TYPE_THREE://广告
-                view = mInflater.inflate(R.layout.item_recommend_trend_ad2, parent, false);
+                view = mInflater.inflate(R.layout.dynamic_item_recommend_trend_ad2, parent, false);
                 holder = new RecommendTrendAdViewHolder2(view);
                 break;
         }
@@ -184,7 +184,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 recommendedDiscusses = recommendedTrend.getTrednDiscuss();
                 int DiscussNum = recommendedTrend.getDiscussNum();
                 if ("2".equals(up_flag)) {
-                    holderOne.trend_title_tv.setText(Utils.textValueOf(R.drawable.newsfeed_icon_zhiding, trend_title));
+                    holderOne.trend_title_tv.setText(Utils.textValueOf(R.drawable.dynamic_newsfeed_icon_zhiding, trend_title));
                 } else {
                     holderOne.trend_title_tv.setText(trend_title);
                 }
@@ -195,17 +195,17 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                     GlideApp.with(mContext)
                             .load(user_head)
                             .circleCrop()
-                            .placeholder(R.drawable.head_place_hold_pic)
-                            .error(R.drawable.head_place_hold_pic)
+                            .placeholder(R.drawable.dynamic_head_place_hold_pic)
+                            .error(R.drawable.dynamic_head_place_hold_pic)
                             .into(holderOne.user_head_iv);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
 
                 if ("1".equals(user_gender)) {
-                    holderOne.user_gender_iv.setImageResource(R.drawable.male);
+                    holderOne.user_gender_iv.setImageResource(R.drawable.dynamic_male);
                 } else if ("2".equals(user_gender)) {
-                    holderOne.user_gender_iv.setImageResource(R.drawable.female);
+                    holderOne.user_gender_iv.setImageResource(R.drawable.dynamic_female);
                 }
 
                 holderOne.time_tv.setText(time);
@@ -235,10 +235,10 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
 
                 if ("1".equals(is_zan)) {//赞
-                    holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like_sel));
+                    holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like_sel));
 //                    holderOne.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like_sel),null,null,null);
                 } else {//未赞
-                    holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like));
+                    holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like));
 //                    holderOne.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like),null,null,null);
                 }
 
@@ -318,7 +318,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 dicussAdapter = new RecommendDicussAdapter(recommendedDiscusses2, mContext);
                 int DiscussNum1 = recommendedTrend.getDiscussNum();
                 if ("2".equals(up_flag)) {
-                    holdertwo.trend_title_tv.setText(Utils.textValueOf(R.drawable.newsfeed_icon_zhiding, trend_title));
+                    holdertwo.trend_title_tv.setText(Utils.textValueOf(R.drawable.dynamic_newsfeed_icon_zhiding, trend_title));
                 } else {
                     holdertwo.trend_title_tv.setText(trend_title);
                 }
@@ -328,14 +328,14 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 GlideApp.with(mContext)
                         .load(user_head)
                         .circleCrop()
-                        .placeholder(R.drawable.default_img)
-                        .error(R.drawable.default_img)
+                        .placeholder(R.drawable.dynamic_default_img)
+                        .error(R.drawable.dynamic_default_img)
                         .into(holdertwo.user_head_iv);
 
                 if ("1".equals(user_gender)) {
-                    holdertwo.user_gender_iv.setImageResource(R.drawable.male);
+                    holdertwo.user_gender_iv.setImageResource(R.drawable.dynamic_male);
                 } else if ("2".equals(user_gender)) {
-                    holdertwo.user_gender_iv.setImageResource(R.drawable.female);
+                    holdertwo.user_gender_iv.setImageResource(R.drawable.dynamic_female);
                 }
 
                 holdertwo.time_tv.setText(time);
@@ -361,10 +361,10 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 }
 
                 if ("1".equals(is_zan)) {//赞
-                    holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like_sel));
+                    holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like_sel));
 //                    holdertwo.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like_sel),null,null,null);
                 } else {//未赞
-                    holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like));
+                    holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like));
 //                    holdertwo.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like),null,null,null);
                 }
                 //评论
@@ -391,8 +391,8 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
                 GlideApp.with(mContext)
                         .load(ad_img)
-                        .placeholder(R.drawable.default_img)
-                        .error(R.drawable.default_img)
+                        .placeholder(R.drawable.dynamic_default_img)
+                        .error(R.drawable.dynamic_default_img)
                         .into(holdertwo.trend_ad_iv);
                 holdertwo.trend_ad_tv.setText(jump_title);
 
@@ -415,14 +415,14 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 GlideApp.with(mContext)
                         .load(user_head)
                         .circleCrop()
-                        .placeholder(R.drawable.head_place_hold_pic)
-                        .error(R.drawable.head_place_hold_pic)
+                        .placeholder(R.drawable.dynamic_head_place_hold_pic)
+                        .error(R.drawable.dynamic_head_place_hold_pic)
                         .into(holderThree.itemRecommendTrendUserHeadIv);
 
                 if ("1".equals(user_gender)) {
-                    holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.male);
+                    holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.dynamic_male);
                 } else if ("2".equals(user_gender)) {
-                    holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.female);
+                    holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.dynamic_female);
                 }
 
                 holderThree.itemRecommendTrendTimeTv.setText(time);
@@ -436,7 +436,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 holderThree.itemRecommendTrendReadedTv.setText(read_num);
                 GlideApp.with(mContext)
                         .load(recommendedTrend.getAdImg())
-                        .placeholder(R.drawable.default_img)
+                        .placeholder(R.drawable.dynamic_default_img)
                         .into(holderThree.ivAdImg);
                 holderThree.itemView.setOnClickListener(v -> {
                     H5Params params = new H5Params(recommendedTrend.getUrl(), null, recommendedTrend.getShare());

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTrendImgAdapter.java

@@ -49,7 +49,7 @@ public class RecommendTrendImgAdapter extends RecyclerView.Adapter<RecommendTren
     @Override
     public RecommendTrendImgViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view=null;
-        view=mInflater.inflate(R.layout.item_recommend_trend_img,parent,false);
+        view=mInflater.inflate(R.layout.dynamic_item_recommend_trend_img,parent,false);
         RecommendTrendImgViewHolder viewHolder= new RecommendTrendImgViewHolder(view);
         return viewHolder;
     }
@@ -63,7 +63,7 @@ public class RecommendTrendImgAdapter extends RecyclerView.Adapter<RecommendTren
             GlideApp.with(mContext)
                     .load(img_url)
 //                .override(width,width)
-                    .error(R.drawable.default_img)
+                    .error(R.drawable.dynamic_default_img)
                     .centerCrop()
 //                .bitmapTransform(new CropSquareTransformation(mContext))//裁剪正方形
                     .into(holder.trend_img1);

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/SelectTopicAdapter.java

@@ -40,7 +40,7 @@ public class SelectTopicAdapter extends RecyclerView.Adapter<SelectTopiViewHolde
 
     @Override
     public SelectTopiViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= mInflater.inflate(R.layout.item_select_topic,parent,false);
+        View view= mInflater.inflate(R.layout.dynamic_item_select_topic,parent,false);
         SelectTopiViewHolder viewHolder= new SelectTopiViewHolder(view);
         return viewHolder;
     }

m-dynamic/src/main/java/com/yidianling/dynamic/adapter/TopicDetailMemberAdapter.java

@@ -93,7 +93,7 @@ public class TopicDetailMemberAdapter extends RecyclerView.Adapter<TopicDetailMe
     @Override
     public TopicDetailMemberViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = null;
-        view = mInflater.inflate(R.layout.item_topicdetail_member_head, parent, false);
+        view = mInflater.inflate(R.layout.dynamic_item_topicdetail_member_head, parent, false);
         TopicDetailMemberViewHolder viewHolder = new TopicDetailMemberViewHolder(view);
         return viewHolder;
     }
@@ -104,10 +104,10 @@ public class TopicDetailMemberAdapter extends RecyclerView.Adapter<TopicDetailMe
         String img_url = topicDetailMemberHead.head;
         GlideApp.with(mContext)
                 .load(img_url)
-                .error(R.drawable.head_place_hold_pic)
+                .error(R.drawable.dynamic_head_place_hold_pic)
                 .circleCrop()
-                .placeholder(R.drawable.head_place_hold_pic)
-                .error(R.drawable.head_place_hold_pic)
+                .placeholder(R.drawable.dynamic_head_place_hold_pic)
+                .error(R.drawable.dynamic_head_place_hold_pic)
                 .into(holder.item_topic_member_head_iv);
         setUpItemEvent(holder);
     }

m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity.java

@@ -66,7 +66,7 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_browse_pictures);
+        setContentView(R.layout.dynamic_activity_browse_pictures);
         browse_pictures_vp = (ViewPager) findViewById(R.id.browse_pictures_vp);
         back_iv = (ImageView) findViewById(R.id.browse_pictures_back_iv);
         title_tv = (TextView) findViewById(R.id.browse_pictures_num_tv);
@@ -316,7 +316,7 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
         public Object instantiateItem(View container, int position) {
             GlideApp.with(mContext)
                     .load(mImages.get(position).getImage_url())
-                    .error(R.drawable.default_img)
+                    .error(R.drawable.dynamic_default_img)
                     .into(mDatas.get(position));
             mDatas.get(position).setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
                 @Override

m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity2.java

@@ -56,7 +56,7 @@ public class BrowsePicturesActivity2 extends BaseActivity implements ViewPager.O
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_browse_pictures);
+        setContentView(R.layout.dynamic_activity_browse_pictures);
         browse_pictures_vp=(ViewPager) findViewById(R.id.browse_pictures_vp);
         back_iv=(ImageView)findViewById(R.id.browse_pictures_back_iv);
         title_tv=(TextView)findViewById(R.id.browse_pictures_num_tv);
@@ -255,7 +255,7 @@ public class BrowsePicturesActivity2 extends BaseActivity implements ViewPager.O
         public Object instantiateItem(View container, int position) {
             GlideApp.with(mContext)
                     .load(mImages.get(position))
-                    .error(R.drawable.default_img)
+                    .error(R.drawable.dynamic_default_img)
                     .into(mDatas.get(position));
             mDatas.get(position).setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
                 @Override

m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmojiAdapter.java

@@ -39,12 +39,12 @@ public class EmojiAdapter extends BaseAdapter {
 	 
 	@SuppressLint({ "ViewHolder", "InflateParams" })
 	public View getView(int position, View convertView, ViewGroup parent) {
-		convertView = LayoutInflater.from(context).inflate(R.layout.nim_emoji_item, null);
+		convertView = LayoutInflater.from(context).inflate(R.layout.dynamic_nim_emoji_item, null);
 		ImageView emojiThumb = (ImageView) convertView.findViewById(R.id.imgEmoji);
 		int count = EmojiManager.getDisplayCount();
 		int index = startIndex + position;
 		if (position == EmoticonView.EMOJI_PER_PAGE || index == count) {
-			emojiThumb.setBackgroundResource(R.drawable.nim_emoji_del);
+			emojiThumb.setBackgroundResource(R.drawable.dynamic_nim_emoji_del);
 		} else if (index < count) {
             emojiThumb.setBackgroundDrawable(EmojiManager.getDisplayDrawable(context, index));
 		}	

m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmoticonPickerView.java

@@ -76,7 +76,7 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
         this.uiHandler = new Handler(context.getMainLooper());
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        inflater.inflate(R.layout.nim_emoji_layout, this);
+        inflater.inflate(R.layout.dynamic_nim_emoji_layout, this);
     }
 
     @Override
@@ -140,8 +140,8 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
 
         // emoji表情
         CheckedImageButton btn = addEmoticonTabBtn(index++, tabCheckListener);
-        btn.setNormalImageId(R.drawable.nim_emoji_icon_inactive);
-        btn.setCheckedImageId(R.drawable.nim_emoji_icon);
+        btn.setNormalImageId(R.drawable.dynamic_nim_emoji_icon_inactive);
+        btn.setCheckedImageId(R.drawable.dynamic_nim_emoji_icon);
 
         // 贴图
         List<StickerCategory> categories = manager.getCategories();
@@ -154,8 +154,8 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
 
     private CheckedImageButton addEmoticonTabBtn(int index, OnClickListener listener) {
         CheckedImageButton emotBtn = new CheckedImageButton(context);
-        emotBtn.setNormalBkResId(R.drawable.nim_sticker_button_background_normal_layer_list);
-        emotBtn.setCheckedBkResId(R.drawable.nim_sticker_button_background_pressed_layer_list);
+        emotBtn.setNormalBkResId(R.drawable.dynamic_nim_sticker_button_background_normal_layer_list);
+        emotBtn.setCheckedBkResId(R.drawable.dynamic_nim_sticker_button_background_pressed_layer_list);
         emotBtn.setId(index);
         emotBtn.setOnClickListener(listener);
         emotBtn.setScaleType(ImageView.ScaleType.FIT_CENTER);

m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmoticonView.java

@@ -140,7 +140,7 @@ public class EmoticonView {
                     imgCur = (ImageView) pageNumberLayout.getChildAt(i);
                 } else {
                     imgCur = new ImageView(context);
-                    imgCur.setBackgroundResource(R.drawable.nim_view_pager_indicator_selector);
+                    imgCur.setBackgroundResource(R.drawable.dynamic_nim_view_pager_indicator_selector);
                     pageNumberLayout.addView(imgCur);
                 }
             }
@@ -359,7 +359,7 @@ public class EmoticonView {
                 gridView.setHorizontalSpacing(5);
                 gridView.setVerticalSpacing(5);
                 gridView.setGravity(Gravity.CENTER);
-                gridView.setSelector(R.drawable.nim_emoji_item_selector);
+                gridView.setSelector(R.drawable.dynamic_nim_emoji_item_selector);
                 container.addView(gridView);
                 return gridView;
             } else {
@@ -371,7 +371,7 @@ public class EmoticonView {
                 gridView.setNumColumns(4);
                 gridView.setHorizontalSpacing(5);
                 gridView.setGravity(Gravity.CENTER);
-                gridView.setSelector(R.drawable.nim_emoji_item_selector);
+                gridView.setSelector(R.drawable.dynamic_nim_emoji_item_selector);
                 container.addView(gridView);
                 return gridView;
             }

m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/StickerAdapter.java

@@ -45,7 +45,7 @@ public class StickerAdapter extends BaseAdapter {
     public View getView(int position, View convertView, ViewGroup parent) {
         StickerViewHolder viewHolder;
         if (convertView == null) {
-            convertView = View.inflate(context, R.layout.nim_sticker_picker_view, null);
+            convertView = View.inflate(context, R.layout.dynamic_nim_sticker_picker_view, null);
             viewHolder = new StickerViewHolder();
             viewHolder.imageView = (ImageView) convertView.findViewById(R.id.sticker_thumb_image);
             viewHolder.descLabel = (TextView) convertView.findViewById(R.id.sticker_desc_label);
@@ -66,7 +66,7 @@ public class StickerAdapter extends BaseAdapter {
 
         GlideApp.with(context)
                 .load(StickerManager.getInstance().getStickerUri(sticker.getCategory(), sticker.getName()))
-                .error(R.drawable.nim_default_img_failed)
+                .error(R.drawable.dynamic_nim_default_img_failed)
                 .dontAnimate()
                 .into(viewHolder.imageView);
 

m-dynamic/src/main/java/com/yidianling/dynamic/common/tool/GlideImageLoader.java

@@ -26,8 +26,8 @@ public class GlideImageLoader implements ImageLoader {
 
     private void showImage(Activity activity, String path, ImageView imageView, int width, int height){
         SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
-        sp.loadingPic = R.drawable.default_img;
-        sp.errorPic = R.drawable.default_img;
+        sp.loadingPic = R.drawable.dynamic_default_img;
+        sp.errorPic = R.drawable.dynamic_default_img;
         sp.scaleType = ISimpleImageOpConfig.CENTER_CROP;
         sp.isCacheOnDisk = false;
         YDLImageCacheManager.showImage(activity,path,imageView,width, height,sp);

m-dynamic/src/main/java/com/yidianling/dynamic/common/view/LooperTextView.java

@@ -80,7 +80,7 @@ public class LooperTextView extends FrameLayout {
     }
 
     private View newTextView(int status) {
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.looper_item, null, false);
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.dynamic_looper_item, null, false);
         if (status == STATUS_IN) {
             content_before_in = (TextView) view.findViewById(R.id.loop_content_before);
         } else if (status == STATUS_OUT) {

m-dynamic/src/main/java/com/yidianling/dynamic/common/view/NineGridViewAdapter.java

@@ -39,7 +39,7 @@ public abstract class NineGridViewAdapter implements Serializable {
     protected ImageView generateImageView(Context context) {
         NineGridViewWrapper imageView = new NineGridViewWrapper(context);
         imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        imageView.setImageResource(R.drawable.ic_default_color);
+        imageView.setImageResource(R.drawable.dynamic_ic_default_color);
         return imageView;
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/dialog/CancelFocusDialog.kt

@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.view.WindowManager
 import com.yidianling.dynamic.R
 import com.yidianling.dynamic.dialog.listener.CancelFocusDialogListener
-import kotlinx.android.synthetic.main.cancel_focus_dialog_layout.*
+import kotlinx.android.synthetic.main.dynamic_cancel_focus_dialog_layout.*
 
 /**
  * Created by xj on 2019/9/25.
@@ -16,7 +16,7 @@ class CancelFocusDialog(val mContext: Context, val listener: CancelFocusDialogLi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.cancel_focus_dialog_layout)
+        setContentView(R.layout.dynamic_cancel_focus_dialog_layout)
 
         val params = window.attributes
         params.width = WindowManager.LayoutParams.MATCH_PARENT

m-dynamic/src/main/java/com/yidianling/dynamic/members/MemberFragment.java

@@ -39,7 +39,7 @@ public class MemberFragment extends DynamicFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        view = this.getActivity().getLayoutInflater().inflate(R.layout.fragment_member, null);
+        view = this.getActivity().getLayoutInflater().inflate(R.layout.dynamic_fragment_member, null);
         context = getActivity().getApplicationContext();
         member_age_tv=(TextView)view.findViewById(R.id.member_age_tv);
         member_emotional_state_tv=(TextView)view.findViewById(R.id.member_emotional_state_tv);

m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/PublishTrendActivity.java

@@ -95,7 +95,7 @@ public class PublishTrendActivity extends BaseActivity {
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_trend;
+        return R.layout.dynamic_activity_trend;
     }
 
     @Override
@@ -187,7 +187,7 @@ public class PublishTrendActivity extends BaseActivity {
         TextView textView = mTableLayout.getTitleView(1);
         textView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         int textViewWidth = textView.getMeasuredWidth();
-        View view = LayoutInflater.from(this).inflate(R.layout.popup_notice, null);
+        View view = LayoutInflater.from(this).inflate(R.layout.dynamic_popup_notice, null);
         view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         int wid = view.getMeasuredWidth();
         noticePopupWindow = new PopupWindow(view);

m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/SelecTopicActivity.java

@@ -37,7 +37,7 @@ public class SelecTopicActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_selec_topic);
+        setContentView(R.layout.dynamic_activity_selec_topic);
         Cancletv = (TextView) findViewById(R.id.select_topic_cancel_tv);
         focus_rcv = (RecyclerViewForScrollView) findViewById(R.id.select_topic_focus_rcv);
         recommend_rcv = (RecyclerViewForScrollView) findViewById(R.id.select_topic_recommend_rcv);

m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java

@@ -189,7 +189,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
 
     @Override
     public int layoutResId() {
-        return R.layout.fragment_publish_trend;
+        return R.layout.dynamic_fragment_publish_trend;
     }
 
     @Override
@@ -246,8 +246,8 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
             publish_trend_ad_rel.setVisibility(View.VISIBLE);
             GlideApp.with(activity)
                     .load(Test_cover)
-                    .placeholder(R.drawable.default_img)
-                    .error(R.drawable.default_img)
+                    .placeholder(R.drawable.dynamic_default_img)
+                    .error(R.drawable.dynamic_default_img)
                     .into(publish_trend_ad_iv);
             publish_trend_ad_tv.setText(Test_title);
             if (isFromFm == 1) {
@@ -258,7 +258,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
         } else {
             publish_trend_img_rcv.setVisibility(View.VISIBLE);
             publish_trend_ad_rel.setVisibility(View.GONE);
-            publish_trend_bottom_img_iv.setImageResource(R.drawable.edit_img);
+            publish_trend_bottom_img_iv.setImageResource(R.drawable.dynamic_edit_img);
             head_dir = RxFileTool.getStorageDirectory(activity) + "/img/publish_img/";
 
             if (adapter == null) {
@@ -368,21 +368,21 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
                     // 此处为得到焦点时的处理内容
                     writeing_title = true;
                     hideEmojiLayout();
-                    publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji_dis);
+                    publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji_dis);
                 } else {
                     // 此处为失去焦点时的处理内容
                     writeing_title = false;
                     if (writeing_title == false && ("".equals(Test_url) || Test_url == null || "".equals(Test_cover) || Test_cover == null ||
                             "".equals(Test_title) || Test_title == null)) {
-                        publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
-                        //                        publish_trend_bottom_img_iv.setImageResource(R.drawable.edit_img);
+                        publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
+                        //                        publish_trend_bottom_img_iv.setImageResource(R.drawable.dynamic_edit_img);
                     }
                 }
             }
         });
         publish_trend_content_editext.setOnTouchListener((v, event) -> {
             hideEmojiLayout();
-            publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
+            publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
             return false;
         });
 
@@ -424,7 +424,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
                         new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                publish_anonymity_iv.setImageResource(R.drawable.checkbox_sel);
+                                publish_anonymity_iv.setImageResource(R.drawable.dynamic_checkbox_sel);
                                 is_niming = 2;
                                 dialog.dismiss();
                             }
@@ -438,7 +438,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
                         });
                 builder.create().show();
             } else {
-                publish_anonymity_iv.setImageResource(R.drawable.checkbox);
+                publish_anonymity_iv.setImageResource(R.drawable.dynamic_checkbox);
                 is_niming = 1;
             }
         } else if (v.getId() == R.id.publish_trend_bottom_img_iv) {
@@ -465,10 +465,10 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
         } else if (v.getId() == R.id.ll_to_expert) {//仅对专家可见
             if (isDoctorShow == 1) {
                 isDoctorShow = 2;
-                iv_to_expert.setImageResource(R.drawable.checkbox);
+                iv_to_expert.setImageResource(R.drawable.dynamic_checkbox);
             } else {
                 isDoctorShow = 1;
-                iv_to_expert.setImageResource(R.drawable.checkbox_sel);
+                iv_to_expert.setImageResource(R.drawable.dynamic_checkbox_sel);
             }
         }
     }
@@ -483,7 +483,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
         if ("".equals(phone) || phone == null) {
             NormalDialog.Builder builder = new NormalDialog.Builder(getActivity(), "left", true);
             builder.setTitle("");
-            builder.setMessage(BaseApp.instance.getResources().getString(R.string.bindphone));
+            builder.setMessage(BaseApp.instance.getResources().getString(R.string.dynamic_bindphone));
             builder.setPositiveButton("果断绑定", (dialog, which) -> {
                 startActivity(DynamicIn.INSTANCE.inputPhoneIntent(getActivity(), DynamicConstants.BIND_PHONE_ACTION));
                 dialog.dismiss();
@@ -800,7 +800,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
     private void showUserSliencedDialog(PublishTrendResult resp) {
         CommonDialog.create(getActivity())
                 .setMessage(resp.tips)
-                .setLeftOnclick(getActivity().getString(R.string.details), new View.OnClickListener() {
+                .setLeftOnclick(getActivity().getString(R.string.dynamic_details), new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         String realUrl = TextUtils.isEmpty(resp.url) ? DynamicConstants.HELP_URL : resp.url;
@@ -808,7 +808,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
                         NewH5Activity.start(getActivity(), params);
                     }
                 })
-                .setRightClick(getActivity().getString(R.string.approval), new View.OnClickListener() {
+                .setRightClick(getActivity().getString(R.string.dynamic_approval), new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
 
@@ -910,11 +910,11 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
     private void toggleEmojiLayout() {
         if (emoticon_picker_view == null || emoticon_picker_view.getVisibility() == View.GONE) {
             showEmojiLayout();
-            //            publish_emoji_iv.setImageResource(R.drawable.edict_ico_key);
+            //            publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_key);
         } else {
             hideEmojiLayout();
             showInputMethod(publish_trend_content_editext);
-            publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
+            publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
         }
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/thank/ShowIntroduceDialogFragment.java

@@ -66,7 +66,7 @@ public class ShowIntroduceDialogFragment extends BaseDialogFragment {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_dialog_show_introduce, container, false);
+        View view = inflater.inflate(R.layout.dynamic_fragment_dialog_show_introduce, container, false);
         ButterKnife.bind(this, view);
         init();
         return view;
@@ -139,11 +139,11 @@ public class ShowIntroduceDialogFragment extends BaseDialogFragment {
                                 .into(mHead);
 
                         if (zjservice.is_online.equals("2")) {
-                            mChangeImg.setImageResource(R.drawable.icon_layer_chat);
+                            mChangeImg.setImageResource(R.drawable.dynamic_icon_layer_chat);
                             mChangeText.setText("私聊");
                         }
                         if (zjservice.is_online.equals("3") || zjservice.is_online.equals("4")) {
-                            mChangeImg.setImageResource(R.drawable.icon_layer_chat_off);
+                            mChangeImg.setImageResource(R.drawable.dynamic_icon_layer_chat_off);
                             mChangeText.setText("私聊");
                             mChangeText.setTextColor(Color.parseColor("#888888"));
                         }

m-dynamic/src/main/java/com/yidianling/dynamic/thank/ThankActivity.java

@@ -71,7 +71,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
         int[] colors = getResources().getIntArray(R.array.ydl_colors);
         header.setColorSchemeColors(colors);
         header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
-        int padding = (int) getResources().getDimension(R.dimen.default_dis_size);
+        int padding = (int) getResources().getDimension(R.dimen.dynamic_default_dis_size);
         header.setPadding(0, padding, 0, padding);
         header.setPtrFrameLayout(store_house_ptr_frame);
 
@@ -210,7 +210,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
 
     @Override
     protected int layoutResId() {
-        return R.layout.activity_thank;
+        return R.layout.dynamic_activity_thank;
     }
 
     @Override
@@ -283,7 +283,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 0 && resultCode == RESULT_OK) {
-            ToastUtil.toastImg(this, R.drawable.dialog_send_thx_success);
+            ToastUtil.toastImg(this, R.drawable.dynamic_dialog_send_thx_success);
             if (worryDetailAnswerForEventBus != null) {
                 worryDetailAnswerForEventBus.pIsZan = true;
                 worryDetailAnswerForEventBus.pZan++;

m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ThankHeadView.kt

@@ -26,7 +26,7 @@ import com.yidianling.ydl_pay.CommonPayDialog
 import de.greenrobot.event.EventBus
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.ui_thank_head.view.*
+import kotlinx.android.synthetic.main.dynamic_ui_thank_head.view.*
 
 /**
  * Created by softrice on 15/11/25.
@@ -64,7 +64,7 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
 
 
     init {
-        View.inflate(activity, R.layout.ui_thank_head, this)
+        View.inflate(activity, R.layout.dynamic_ui_thank_head, this)
         this.activity = activity as BaseActivity
     }
 
@@ -75,8 +75,8 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
         GlideApp.with(activity)
             .load(thxData.userInfo.head)
             .transform(GlideCircleTransform(activity))
-            .placeholder(R.drawable.head_place_hold_pic)
-            .error(R.drawable.head_place_hold_pic)
+            .placeholder(R.drawable.dynamic_head_place_hold_pic)
+            .error(R.drawable.dynamic_head_place_hold_pic)
             .into(sdv_head!!)
 
         rcb_submit.setOnClickListener {
@@ -165,10 +165,10 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
                             (context as Activity).fragmentManager,
                             showIntroduceDialogFragment.javaClass.name
                         )
-                        ToastUtil.toastImg(context, R.drawable.dialog_send_thx_success)
+                        ToastUtil.toastImg(context, R.drawable.dynamic_dialog_send_thx_success)
                         EventBus.getDefault().post(ThankReplyUpdateEvent())
                     } else {
-                        ToastUtil.toastImg(context, R.drawable.dialog_send_thx_success)
+                        ToastUtil.toastImg(context, R.drawable.dynamic_dialog_send_thx_success)
                         EventBus.getDefault().post(ThankReplyUpdateEvent())
                         //通知更新
                     }

m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ThxSelectView.java

@@ -55,39 +55,39 @@ public class ThxSelectView extends LinearLayout {
 
     public ThxSelectView(Context context) {
         super(context);
-        inflate(context, R.layout.ui_thx_select, this);
+        inflate(context, R.layout.dynamic_ui_thx_select, this);
         ButterKnife.bind(this);
     }
 
 
     public ThxSelectView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        inflate(context, R.layout.ui_thx_select, this);
+        inflate(context, R.layout.dynamic_ui_thx_select, this);
         ButterKnife.bind(this);
     }
 
     public void select(int position) {
         if (position >= 0 && position < 3) {
-            Drawable drawable = getResources().getDrawable(R.drawable.love_white);
+            Drawable drawable = getResources().getDrawable(R.drawable.dynamic_love_white);
             cleanSelect();
             selectId = position;
             switch (position) {
                 case 0:
-                    ll_left.setBackgroundResource(R.drawable.shape_red_bg);
+                    ll_left.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
                     tv_left_down.setTextColor(disSelectColor);
                     tv_left_up.setTextColor(disSelectColor);
                     tv_left_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
                     break;
 
                 case 1:
-                    ll_center.setBackgroundResource(R.drawable.shape_red_bg);
+                    ll_center.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
                     tv_center_down.setTextColor(disSelectColor);
                     tv_center_up.setTextColor(disSelectColor);
                     tv_center_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
                     break;
 
                 case 2:
-                    ll_right.setBackgroundResource(R.drawable.shape_red_bg);
+                    ll_right.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
                     tv_right_down.setTextColor(disSelectColor);
                     tv_right_up.setTextColor(disSelectColor);
                     tv_right_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
@@ -113,18 +113,18 @@ public class ThxSelectView extends LinearLayout {
     }
 
     void cleanSelect() {
-        Drawable drawable = getResources().getDrawable(R.drawable.love_red);
-        ll_left.setBackgroundResource(R.drawable.shape_red_round);
+        Drawable drawable = getResources().getDrawable(R.drawable.dynamic_love_red);
+        ll_left.setBackgroundResource(R.drawable.dynamic_shape_red_round);
         tv_left_down.setTextColor(selectColor);
         tv_left_up.setTextColor(selectColor);
         tv_left_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
 
-        ll_center.setBackgroundResource(R.drawable.shape_red_round);
+        ll_center.setBackgroundResource(R.drawable.dynamic_shape_red_round);
         tv_center_down.setTextColor(selectColor);
         tv_center_up.setTextColor(selectColor);
         tv_center_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
 
-        ll_right.setBackgroundResource(R.drawable.shape_red_round);
+        ll_right.setBackgroundResource(R.drawable.dynamic_shape_red_round);
         tv_right_down.setTextColor(selectColor);
         tv_right_up.setTextColor(selectColor);
         tv_right_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);

m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ZanReplyListItemView.java

@@ -34,7 +34,7 @@ public class ZanReplyListItemView extends LinearLayout {
 
     public ZanReplyListItemView(Context context) {
         super(context);
-        inflate(context,R.layout.ui_zan_reply_list,this);
+        inflate(context,R.layout.dynamic_ui_zan_reply_list,this);
         ButterKnife.bind(this);
 
     }
@@ -44,8 +44,8 @@ public class ZanReplyListItemView extends LinearLayout {
         GlideApp.with(getContext())
                 .load(thxZan.head)
                 .transform(new GlideCircleTransform(getContext()))
-                .placeholder(R.drawable.head_place_hold_pic)
-                .error(R.drawable.head_place_hold_pic)
+                .placeholder(R.drawable.dynamic_head_place_hold_pic)
+                .error(R.drawable.dynamic_head_place_hold_pic)
                 .into(sdv_head);
         if (thxZan.num.endsWith("0"))
             tv_zan_num.setText("");

m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicActivity.java

@@ -33,7 +33,7 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_all_topic);
+        setContentView(R.layout.dynamic_activity_all_topic);
         initView();
     }
 
@@ -79,13 +79,13 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
 //                resetText();
 //                switch (position) {
 //                    case 0:
-//                        topic_tab_all_tv.setTextColor(getResources().getColor(R.color.title_green));
-//                        topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.title_green));
+//                        topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
+//                        topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green));
 //
 //                        break;
 //                    case 1:
-//                        topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.title_green));
-//                        topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.title_green));
+//                        topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
+//                        topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green));
 //
 //                        break;
 //
@@ -100,10 +100,10 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
     }
 
 //    private void resetText() {
-//        topic_tab_all_tv.setTextColor(getResources().getColor(R.color.text_gray));
-//        topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
-//        topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.text_gray));
-//        topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
+//        topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
+//        topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
+//        topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
+//        topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
 //    }
 
     @Override

m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicFragment.java

@@ -45,7 +45,7 @@ public class AllTopicFragment extends DynamicFragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_all_topic, container, false);
+        view = inflater.inflate(R.layout.dynamic_fragment_all_topic, container, false);
         context = getActivity().getApplicationContext();
         initView();
         return view;

m-dynamic/src/main/java/com/yidianling/dynamic/topic/HotTopicFragment.java

@@ -21,7 +21,7 @@ public class HotTopicFragment extends DynamicFragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_newest, container, false);
+        view = inflater.inflate(R.layout.dynamic_fragment_newest, container, false);
         context=getActivity().getApplicationContext();
         initView();
         return view;

m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java

@@ -149,7 +149,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_topic_detail);
+        setContentView(R.layout.dynamic_activity_topic_detail);
         ButterKnife.bind(this);
         initDatas();
         initViews();
@@ -234,39 +234,39 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
                 }
                 LogUtil.d("tool bar size: " + mToolbar.getHeight());
                 if (verticalOffset <= (-appBarLayout.getTotalScrollRange() + mToolbar.getHeight() / 2)) {
-                    if (backgroundColor != R.color.white) {
-                        mToolbar.setBackgroundColor(getResources().getColor(R.color.white));
+                    if (backgroundColor != R.color.dynamic_white) {
+                        mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
                         alPhaAnimation(mToolbar, 0, 1, null);
-                        mTopicDetailTitleBackIv.setImageResource(R.drawable.toolbar_back);
-                        mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green);
-                        backgroundColor = R.color.white;
+                        mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_toolbar_back);
+                        mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green);
+                        backgroundColor = R.color.dynamic_white;
                     }
                     collapsingToolbarLayout.setTitle(topicTitle);
                     //使用下面两个CollapsingToolbarLayout的方法设置展开透明->折叠时你想要的颜色
-                    collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(android.R.color.transparent));
-                    collapsingToolbarLayout.setCollapsedTitleTextColor(getResources().getColor(R.color.black));
+                    collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(R.color.dynamic_transparent));
+                    collapsingToolbarLayout.setCollapsedTitleTextColor(getResources().getColor(R.color.dynamic_black));
                 } else if (verticalOffset >= -appBarLayout.getTotalScrollRange() / 5) {
                     collapsingToolbarLayout.setTitle("");
-                    if (backgroundColor != android.R.color.transparent) {
+                    if (backgroundColor != R.color.dynamic_transparent) {
                         alPhaAnimation(mToolbar, 1, 0f, new AnimatorListenerAdapter() {
                             @Override
                             public void onAnimationEnd(Animator animation) {
                                 super.onAnimationEnd(animation);
-                                mToolbar.setBackgroundColor(getResources().getColor(android.R.color.transparent));
+                                mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_transparent));
                                 mToolbar.setAlpha(1f);
-                                mTopicDetailTitleBackIv.setImageResource(R.drawable.titlebar_back2);
-                                mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green2);
+                                mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_titlebar_back2);
+                                mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green2);
                             }
                         });
-                        backgroundColor = android.R.color.transparent;
+                        backgroundColor = R.color.dynamic_transparent;
                     }
                 } else {
-                    if (backgroundColor != android.R.color.transparent) {
-                        mToolbar.setBackgroundColor(getResources().getColor(android.R.color.transparent));
+                    if (backgroundColor != R.color.dynamic_transparent) {
+                        mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_transparent));
                         mToolbar.setAlpha(1f);
-                        mTopicDetailTitleBackIv.setImageResource(R.drawable.titlebar_back2);
-                        mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green2);
-                        backgroundColor = android.R.color.transparent;
+                        mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_titlebar_back2);
+                        mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green2);
+                        backgroundColor = R.color.dynamic_transparent;
                     }
                     collapsingToolbarLayout.setTitle("");
                 }
@@ -391,7 +391,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
 
 
     private void ShowCustomShareDialog(final String share_title, final String share_url, final String share_context, final String share_head) {
-        View view = getLayoutInflater().inflate(R.layout.share_select_dialog,
+        View view = getLayoutInflater().inflate(R.layout.dynamic_share_select_dialog,
                 null);
         final Dialog dialog = new Dialog(this,
                 R.style.transparentFrameWindowStyle);
@@ -442,10 +442,10 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
     }
 
     private void resetText() {
-        mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.text_gray));
-        mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.white));
-        mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.text_gray));
-        mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.white));
+        mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
+        mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
+        mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
+        mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
     }
 
     private void setTabSelection(int index) {
@@ -494,11 +494,11 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
         mTopicDetailTrendNumTv.setText("" + topicDetail.topic.postsCount);
         GlideApp.with(TopicDetailActivity.this)
                 .load(cover)
-                .placeholder(R.drawable.default_img)
-                .error(R.drawable.default_img)
+                .placeholder(R.drawable.dynamic_default_img)
+                .error(R.drawable.dynamic_default_img)
                 .into(mTopicDetailTopBgIv);
-        mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.focused_topic_detail_bg : R.drawable.focus_topic_detail_bg);
-        mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.trend_foucused) : "+" + this.getString(R.string.trend_foucus));
+        mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.dynamic_focused_topic_detail_bg : R.drawable.dynamic_focus_topic_detail_bg);
+        mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.dynamic_trend_foucused) : "+" + this.getString(R.string.dynamic_trend_foucus));
         if (!"2".equals(topicId)) {
             mTopicDetailFocusTv.setVisibility(View.VISIBLE);
         }
@@ -550,8 +550,8 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
                     .burryPoint("Theme_attention");
             totalMembers += 1;
             mTopicDetailUsersNumTv.setText(totalMembers + "人");
-            mTopicDetailFocusTv.setBackgroundResource(R.drawable.focused_topic_detail_bg);
-            mTopicDetailFocusTv.setText(this.getString(R.string.trend_foucused));
+            mTopicDetailFocusTv.setBackgroundResource(R.drawable.dynamic_focused_topic_detail_bg);
+            mTopicDetailFocusTv.setText(this.getString(R.string.dynamic_trend_foucused));
             TopicDetailBean.Member member = new TopicDetailBean.Member();
             member.head = DynamicIn.INSTANCE.getUserInfo().getHead();
             member.uid = DynamicIn.INSTANCE.getUserInfo().getUid() + "";
@@ -559,8 +559,8 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
         } else {
             totalMembers = totalMembers - 1;
             mTopicDetailUsersNumTv.setText(totalMembers + "人");
-            mTopicDetailFocusTv.setBackgroundResource(R.drawable.focus_topic_detail_bg);
-            mTopicDetailFocusTv.setText("+" + this.getString(R.string.trend_foucus));
+            mTopicDetailFocusTv.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
+            mTopicDetailFocusTv.setText("+" + this.getString(R.string.dynamic_trend_foucus));
             if (adapter.getDatas() != null && adapter.getDatas().size() > 0) {
                 for (TopicDetailBean.Member m : adapter.getDatas()) {
                     if (m.uid.equals(DynamicIn.INSTANCE.getUserInfo().getUid())) {

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendListInFragment.java

@@ -112,7 +112,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_trend_list_in, container, false);
+        View view = inflater.inflate(R.layout.dynamic_fragment_trend_list_in, container, false);
         unbinder = ButterKnife.bind(this, view);
         initFileds();
         initView();
@@ -267,9 +267,9 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
     private View getFooterView() {
         View view;
         if (trendsRcv != null) {
-            view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, trendsRcv, false);
+            view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, trendsRcv, false);
         } else {
-            view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, null);
+            view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, null);
         }
         return view;
     }
@@ -411,7 +411,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
     @Override
     public void showLoadingDialog(boolean isNeedShowLoading) {
         if (trendType.equals("member_trend")) {
-            showProgressDialog(getActivity().getString(R.string.dialog_loading));
+            showProgressDialog(getActivity().getString(R.string.dynamic_dialog_loading));
         }
     }
 
@@ -483,7 +483,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
                 .burryPoint("Warmth_dynamic");
         mDatas.get(position).isZan = 1;
         mDatas.get(position).zanCount += 1;
-        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.newsfeed_like_sel);
+        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_newsfeed_like_sel);
         ((TextView) view.findViewById(R.id.text_zan_num)).setText(mDatas.get(position).zanCount + "");
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
         isDoLikeAction = false;
@@ -493,7 +493,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
     public void showDisLikeView(View view, int position, ZanResult zanResultBaseBean, List<TrendsListBean.Trend> mDatas) {
         mDatas.get(position).isZan = 2;
         mDatas.get(position).zanCount -= 1;
-        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.newsfeed_like);
+        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_newsfeed_like);
         ((TextView) view.findViewById(R.id.text_zan_num)).setText(String.valueOf(mDatas.get(position).zanCount));
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
         isDoLikeAction = false;

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt

@@ -43,7 +43,7 @@ import com.yidianling.dynamic.trendsDetail.TrendsDetailActivity
 import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.fragment_trends_list.*
+import kotlinx.android.synthetic.main.dynamic_fragment_trends_list.*
 import java.util.*
 
 
@@ -97,7 +97,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     private val headerView: View
         get() {
             val view = LayoutInflater.from(activity)
-                .inflate(R.layout.item_trends_head_recommend_topic, null)
+                .inflate(R.layout.dynamic_item_trends_head_recommend_topic, null)
             recommendTopicDatas = ArrayList()
             mRecommendTopicListAdapter = RecommendTopicListAdapter(activity, recommendTopicDatas)
             val allTopicLin = view.findViewById<View>(R.id.all_topic_lin) as LinearLayout
@@ -117,7 +117,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     //置顶帖Header View
     private val recommendTopHeaderView: View
         get() {
-            val view = LayoutInflater.from(activity).inflate(R.layout.item_recommend_top, null)
+            val view = LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null)
             val linearLayoutManager = LinearLayoutManager(activity)
             mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity)
             mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView
@@ -141,9 +141,9 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
             val view: View
             if (trends_rcv != null) {
                 view =
-                    LayoutInflater.from(activity).inflate(R.layout.progress_item, trends_rcv, false)
+                    LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, trends_rcv, false)
             } else {
-                view = LayoutInflater.from(activity).inflate(R.layout.progress_item, null)
+                view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null)
             }
             return view
         }
@@ -179,7 +179,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     }
 
     override fun getLayoutId(): Int {
-        return R.layout.fragment_trends_list
+        return R.layout.dynamic_fragment_trends_list
     }
 
     override fun lazyLoad() {
@@ -648,7 +648,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     ) {
         mDatas[position].isZan = 2
         mDatas[position].zanCount -= 1
-        (view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.newsfeed_like)
+        (view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.dynamic_newsfeed_like)
         (view.findViewById<View>(R.id.text_zan_num) as TextView).text =
             mDatas[position].zanCount.toString() + ""
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position)
@@ -670,7 +670,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
             .burryPoint("Warmth_dynamic")
         mDatas[position].isZan = 1
         mDatas[position].zanCount += 1
-        (view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.newsfeed_like_sel)
+        (view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.dynamic_newsfeed_like_sel)
         (view.findViewById<View>(R.id.text_zan_num) as TextView).text =
             mDatas[position].zanCount.toString() + ""
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position)

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/ItemCommentsAdapter.java

@@ -42,7 +42,7 @@ public class ItemCommentsAdapter extends RecyclerView.Adapter<BaseViewHolder> {
 
     @Override
     public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_discuss_list, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.dynamic_item_discuss_list, parent, false);
         return new BaseViewHolder(view, parent.getContext(), viewType);
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/ItemImageAdapter.java

@@ -37,9 +37,9 @@ public class ItemImageAdapter extends RecyclerView.Adapter<BaseViewHolder> {
     public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view;
         if (viewType == 0) {
-            view = LayoutInflater.from(mContext).inflate(R.layout.item_trend_imag, parent, false);
+            view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trend_imag, parent, false);
         } else {
-            view = LayoutInflater.from(mContext).inflate(R.layout.item_trend_imag_ad, parent, false);
+            view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trend_imag_ad, parent, false);
         }
         return new BaseViewHolder(view, mContext, viewType);
     }

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/RecommendTopAdapter.java

@@ -37,7 +37,7 @@ public class RecommendTopAdapter<T extends ITopTrends> extends RecyclerView.Adap
 
     @Override
     public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view= LayoutInflater.from(mContext).inflate(R.layout.item_last_trend_top,parent,false);
+        View view= LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_last_trend_top,parent,false);
         return new BaseViewHolder(view);
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/RecommendTopicListAdapter.java

@@ -36,7 +36,7 @@ public class RecommendTopicListAdapter extends RecyclerView.Adapter<BaseViewHold
 
     @Override
     public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_recommend_topic, parent, false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_recommend_topic, parent, false);
         return new BaseViewHolder(view, mContext, viewType);
     }
 

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/TrendsListAdapter.java

@@ -116,7 +116,7 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
         if (mFootViews != null && mFootViews.get(viewType) != null) {
             return new BaseViewHolder(mFootViews.get(viewType), mContext, viewType);
         }
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_trends_list, parent, false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trends_list, parent, false);
         ((RecyclerView) view.findViewById(R.id.item_trend_img_rcv)).setNestedScrollingEnabled(false);
         return new BaseViewHolder(view, mContext, viewType);
     }
@@ -183,12 +183,12 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
                             .setText(R.id.text_con, "数据加载失败");
                     break;
                 case FOOTER_STATE_NO_DATA:
-                    holder.setText(R.id.text_con, mContext.getString(R.string.no_more_data_hint))
+                    holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_no_more_data_hint))
                             .setVisibility(R.id.text_con, View.VISIBLE)
                             .setVisibility(R.id.pb, View.GONE);
                     break;
                 case FOOTRE_STATE_LOAD_MORE:
-                    holder.setText(R.id.text_con, mContext.getString(R.string.loading_hint))
+                    holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_loading_hint))
                             .setVisibility(R.id.pb, View.VISIBLE)
                             .setVisibility(R.id.text_con, View.VISIBLE);
                     break;
@@ -262,8 +262,8 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
                 .setText(R.id.text_zan_num, String.valueOf(trend.zanCount))
                 .setText(R.id.text_talk_num, trend.commentsCount == 0 ? "评论" : trend.commentsCount + "")
                 .setText(R.id.text_trend, "#" + trend.topicTitle + "#")
-                .setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.newsfeed_like_sel : R.drawable.newsfeed_like)
-                .setImageResource(R.id.item_trend_user_gender_iv, "2".equals(trend.gender) ? R.drawable.female : R.drawable.male)
+                .setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.dynamic_newsfeed_like_sel : R.drawable.dynamic_newsfeed_like)
+                .setImageResource(R.id.item_trend_user_gender_iv, "2".equals(trend.gender) ? R.drawable.dynamic_female : R.drawable.dynamic_male)
                 .setOnClickListener(R.id.item_trend_zan_iv, v -> {
                     if (onItemClickListener != null) {
                         onItemClickListener.onItemLikeClick(holder.getView(R.id.item_trend_zan_rel), position - getHeadersCount(), mDatas);

m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/AdViewPagerAdapter.kt

@@ -17,7 +17,7 @@ import com.yidianling.dynamic.model.Command
 import com.yidianling.dynamic.model.TrendsDetailInfoBean
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.item_trend_detail_ad.view.*
+import kotlinx.android.synthetic.main.dynamic_item_trend_detail_ad.view.*
 
 /**
  * 动态广告图展示
@@ -32,12 +32,12 @@ class AdViewPagerAdapter(private val context: Context, private val adList: Mutab
     override fun getCount() = adList.size
 
     override fun instantiateItem(container: ViewGroup?, position: Int): Any? {
-        val view = LayoutInflater.from(context).inflate(R.layout.item_trend_detail_ad, container, false)
+        val view = LayoutInflater.from(context).inflate(R.layout.dynamic_item_trend_detail_ad, container, false)
         view.ivAd.layoutParams.height = ScreenUtil.getDisplayWidth() * 19 / 66
         val ad = adList[position]
         GlideApp.with(context)
                 .load(ad.adImg)
-                .placeholder(R.drawable.default_img)
+                .placeholder(R.drawable.dynamic_default_img)
                 .into(view.ivAd)
         view.setOnClickListener {
 

m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java

@@ -128,7 +128,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
 
     @Override
     public int layoutResId() {
-        return R.layout.fragment_moments;
+        return R.layout.dynamic_fragment_moments;
     }
 
     @Override
@@ -285,9 +285,9 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
         switch (index) {
             case 0:
                 mItemRecommendTv.setSelected(false);
-                mItemRecommendTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 mItemFocusTv.setSelected(false);
-                mItemFocusTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 mItemHotTv.setSelected(true);
                 mItemHotTv.setTextColor(Color.WHITE);
                 break;
@@ -295,17 +295,17 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
                 mItemRecommendTv.setSelected(true);
                 mItemRecommendTv.setTextColor(Color.WHITE);
                 mItemFocusTv.setSelected(false);
-                mItemFocusTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 mItemHotTv.setSelected(false);
-                mItemHotTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 break;
             case 2:
                 mItemRecommendTv.setSelected(false);
-                mItemRecommendTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 mItemFocusTv.setSelected(true);
                 mItemFocusTv.setTextColor(Color.WHITE);
                 mItemHotTv.setSelected(false);
-                mItemHotTv.setTextColor(getResources().getColor(R.color.text_666666));
+                mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
                 break;
         }
     }

m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsContentListFragment.java

@@ -93,7 +93,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
 
     @Override
     public int layoutResId() {
-        return R.layout.fragment_trend_list_in;
+        return R.layout.dynamic_fragment_trend_list_in;
     }
 
     @Override
@@ -241,9 +241,9 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
     private View getFooterView() {
         View view;
         if (trendsRcv != null) {
-            view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, trendsRcv, false);
+            view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, trendsRcv, false);
         } else {
-            view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, null);
+            view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, null);
         }
         return view;
     }
@@ -464,7 +464,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
     public void showDisLikeView(View view, int position, ZanResult zanResultBaseBean, List<TrendsListBean.Trend> mDatas) {
         mDatas.get(position).isZan = 2;
         mDatas.get(position).zanCount -= 1;
-        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.icon_warm_nor);
+        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_icon_warm_nor);
         ((TextView) view.findViewById(R.id.text_zan_num)).setText(String.valueOf(mDatas.get(position).zanCount));
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
         isDoLikeAction = false;
@@ -481,7 +481,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
                 .burryPoint("Warmth_dynamic");
         mDatas.get(position).isZan = 1;
         mDatas.get(position).zanCount += 1;
-        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.icon_warm_sel);
+        ((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_icon_warm_sel);
         ((TextView) view.findViewById(R.id.text_zan_num)).setText(mDatas.get(position).zanCount + "");
         startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
         isDoLikeAction = false;

m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsCotentListAdapter.java

@@ -120,7 +120,7 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
             return new BaseViewHolder(mFootViews.get(viewType), mContext, viewType);
         }
 
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_trends_content_list, parent, false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trends_content_list, parent, false);
         return new BaseViewHolder(view, mContext, viewType);
     }
 
@@ -186,12 +186,12 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
                             .setText(R.id.text_con, "数据加载失败");
                     break;
                 case FOOTER_STATE_NO_DATA:
-                    holder.setText(R.id.text_con, mContext.getString(R.string.no_more_data_hint))
+                    holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_no_more_data_hint))
                             .setVisibility(R.id.text_con, View.VISIBLE)
                             .setVisibility(R.id.pb, View.GONE);
                     break;
                 case FOOTRE_STATE_LOAD_MORE:
-                    holder.setText(R.id.text_con, mContext.getString(R.string.loading_hint))
+                    holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_loading_hint))
                             .setVisibility(R.id.pb, View.VISIBLE)
                             .setVisibility(R.id.text_con, View.VISIBLE);
                     break;
@@ -264,8 +264,8 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
                 .setText(R.id.text_zan_num, trend.zanCount + "")
                 .setText(R.id.text_talk_num, trend.commentsCount + "")
                 .setText(R.id.text_trend, "#" + trend.topicTitle + "#")
-                .setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.icon_warm_sel : R.drawable.icon_warm_nor)
-                .setImageResource(R.id.item_trend_user_gender_iv, trend.gender.equals("2") ? R.drawable.new_female : R.drawable.new_male)
+                .setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.dynamic_icon_warm_sel : R.drawable.dynamic_icon_warm_nor)
+                .setImageResource(R.id.item_trend_user_gender_iv, trend.gender.equals("2") ? R.drawable.dynamic_new_female : R.drawable.dynamic_new_male)
                 .setOnClickListener(R.id.item_trend_zan_iv, v -> {
                     if (onItemClickListener != null) {
                         onItemClickListener.onItemLikeClick(holder.getView(R.id.item_trend_zan_rel), position - getHeadersCount(), mDatas);
@@ -340,7 +340,7 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
         public void onDisplayImage(Context context, ImageView imageView, String url) {
             imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
             SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
-            sp.errorPic = R.drawable.ic_default_color;
+            sp.errorPic = R.drawable.dynamic_ic_default_color;
             sp.isCacheOnDisk = false;
             YDLImageCacheManager.showImage(context,url,imageView,sp);
         }

m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/view/TrendsHomeBannerView.kt

@@ -11,7 +11,7 @@ import com.yidianling.dynamic.R
 import com.yidianling.dynamic.model.TrendsListBean
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.view.banner.GlideImageLoader
-import kotlinx.android.synthetic.main.trends_home_banner.view.*
+import kotlinx.android.synthetic.main.dynamic_trends_home_banner.view.*
 
 /**
  * @author yuanwai
@@ -45,7 +45,7 @@ class TrendsHomeBannerView : FrameLayout {
 
     private fun initView() {
         val params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        View.inflate(context, R.layout.trends_home_banner, this)
+        View.inflate(context, R.layout.dynamic_trends_home_banner, this)
         layoutParams = params
         dp14 = RxImageTool.dip2px(14f)
         dp4 = RxImageTool.dip2px(4f)