Merge branch 'dev_userCard'

# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java

common/src/main/res/drawable/bg_dialog_unfollow_cancel.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="100dp" android:height="36dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#ffffc621" />
+            <corners android:radius="21dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="280dp"
+              android:layout_height="wrap_content"
+              android:background="@drawable/bg_dialog"
+              android:gravity="center_horizontal"
+              android:orientation="vertical"
+    >
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:layout_marginTop="15dp"
+        android:gravity="center_horizontal"
+        android:text="@string/dialog_tip"
+        android:textColor="@color/textColor"
+        android:textSize="15sp"
+        />
+
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:gravity="center_horizontal"
+        android:textColor="#161616"
+        android:textSize="14sp"
+        />
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:gravity="center"
+        android:layout_marginBottom="22dp"
+        android:layout_height="40dp">
+
+
+        <TextView
+            android:id="@+id/btn_cancel"
+            android:layout_width="87dp"
+            android:layout_height="33dp"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="#FFC621"
+            android:layout_marginRight="7dp"
+            android:textSize="14sp"
+            android:background="@drawable/bg_dialog_unfollow_cancel"
+            />
+
+
+
+        <TextView
+            android:id="@+id/btn_confirm"
+
+            android:layout_width="87dp"
+            android:layout_height="33dp"
+            android:gravity="center"
+            android:layout_marginLeft="7dp"
+            android:text="@string/confirm"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:background="@mipmap/tipbox_btn_orange"
+            />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -93,6 +93,9 @@
     <string name="edit_profile_right_date">請選擇正確的日期</string>
     <string name="edit_nick_name_price_msg">溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石1800一次</string>
     <string name="follow">關注</string>
+    <string name="unfollow">  主播哪裡做的不好~\n哥哥確定要取消關注嗎?</string>
+    <string name="unfollow_confrim">繼續關注</string>
+    <string name="unfollow_cancel">不再關注</string>
     <string name="following">已關注</string>
     <string name="follow_my_follow">我的關注</string>
     <string name="my_black">我的黑名單</string>
@@ -702,6 +705,9 @@
     <string name="chat_charge_pay">立即支付</string>
     <string name="live_user_level">使用者等級</string>
     <string name="live_user_level_anchor">主播等級</string>
+    <string name="live_user_card_level">用户等級</string>
+    <string name="live_noble_level_anchor">貴族等級</string>
+    <string name="live_honor_number_anchor">榮譽墻</string>
     <string name="live_anchor_error">連接已斷開，請重新開播</string>
     <string name="search_no_data_2">空空如也</string>
     <string name="chat">聊天</string>
@@ -947,4 +953,5 @@
     <string name="chat_chat">聊聊天</string>
     <string name="want_pre">想在其他APP上方也顯示小窗，\n可前往設置進行授權。</string>
     <string name="lucky_angel" translatable="false">恭喜 %s 在幸運天使中抽中 %s！下一個幸運天使就是你哦！</string>
+    <string name="user_card_guard" translatable="false">守護團%s人</string>
 </resources>