Merge branch 'feat/wjy/合规' into 'd/v4.4.08'

ip

See merge request app_android_lib/YDL-Component!341

m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java

@@ -948,7 +948,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
                 holder.setHeadImageWithUrl(R.id.item_recommend_trend_user_head_iv, data.getHeader());       //头像
                 holder.setText(R.id.text_userName, data.getName());         //用户名
                 holder.setText(R.id.text_time, data.getTime_str()); //发布时间
-                holder.setText(R.id.tv_ip, "IP属地: " + data.getIpProvince()); // IP属地
+                if (!TextUtils.isEmpty(data.getIpProvince())) holder.setText(R.id.tv_ip, "IP属地: " + data.getIpProvince()); // IP属地
                 holder.setImageResource(R.id.img_comment_sex, data.getGender() == 1 ? R.drawable.dynamic_male : R.drawable.dynamic_female);
                 holder.setImageResource(R.id.img_comment_zan, data.getIs_zan() == 1 ? R.drawable.dynamic_reply_zan_sel : R.drawable.dynamic_reply_zan);
                 showCommentItemContent(holder, data);
@@ -1423,7 +1423,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
         }
         tvUserName.setText(mTrendBody.name);
         tvTime.setText(mTrendBody.timeStr);    //发布时间
-        tvFrom.setText("IP属地: " + mTrendBody.ipProvince); // IP属地
+        if (!TextUtils.isEmpty(mTrendBody.ipProvince)) tvFrom.setText("IP属地: " + mTrendBody.ipProvince); // IP属地
 
         if (TextUtils.isEmpty(mTrendBody.title)) {
             tvTrendInfoTitle.setVisibility(GONE);