Merge branch 'master' into dev_random_pk

# Conflicts:
#	live/src/main/res/values/strings.xml

common/src/main/res/anim/in_from_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/anim/in_from_right_abit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0"
+        android:toXDelta="-15%" />
+</set>

common/src/main/res/anim/out_from_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="3000"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/anim/out_to_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="100%" />
+</set>

common/src/main/res/anim/out_to_right_abit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>

common/src/main/res/drawable/bg_anchor_mic_info_btn_invite.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="76dp" android:height="27dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff40beff" />
+            <corners android:topLeftRadius="13dp" android:topRightRadius="13dp" android:bottomLeftRadius="13dp" android:bottomRightRadius="13dp" />
+        </shape>
+    </item>
+</selector>

common/src/main/res/drawable/bg_anchor_mic_info_btn_ok.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="76dp" android:height="27dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff0fdab8" />
+            <corners android:topLeftRadius="13dp" android:topRightRadius="13dp" android:bottomLeftRadius="13dp" android:bottomRightRadius="13dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@drawable/loading_00000"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00001"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00002"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00003"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00004"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00005"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00006"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00007"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00008"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00009"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00010"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00011"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00012"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00013"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00014"
+        android:duration="100" />
+    <item
+        android:drawable="@drawable/loading_00015"
+        android:duration="100" />
+
+
+</animation-list>

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

@@ -63,4 +63,9 @@
         android:layout_height="3dp"
         android:progressDrawable="@drawable/bg_horizontal_progressbar"
         android:visibility="gone" />
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>

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

@@ -108,6 +108,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:id="@+id/system_notice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -0,0 +1,85 @@
+<?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"
+    >
+    <LinearLayout
+        android:layout_marginBottom="15dp"
+        android:layout_marginTop="15dp"
+        android:gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="主播："
+            android:textColor="#161616"
+            android:textStyle="bold"
+            android:textSize="16sp"
+            />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="#EB6877"
+            android:textStyle="bold"
+            android:textSize="16sp"
+            />
+    </LinearLayout>
+
+
+    <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/layout/dialog_progress.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:gravity="center_vertical"
+    android:background="@drawable/app_dialog_bg">
+    <ImageView
+        android:id="@+id/ivIcon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@mipmap/ic_launcher"
+        android:layout_marginRight="4dp"/>
+    <TextView
+        android:id="@+id/tvDialogTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/ivIcon"
+        android:textSize="14sp"
+        android:textColor="@color/app_dialog_title_color"
+        android:text="更新中"/>
+
+    <TextView
+        android:id="@+id/tvProgress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tvDialogTitle"
+        android:layout_marginTop="10dp"
+        android:lineSpacingMultiplier="1.2"
+        android:text="正在下載中......"
+        android:textColor="@color/app_dialog_content_color"
+        android:textSize="14sp" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="6dp"
+        android:layout_below="@+id/tvProgress"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:max="100" />
+</RelativeLayout>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/live_bg" />
+
+    <ImageView
+        android:id="@+id/iv_loading"
+        android:layout_width="150dp"
+        android:layout_height="188dp"
+        android:layout_centerInParent="true"
+        android:background="@drawable/loading_animation" />
+
+</RelativeLayout>

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

@@ -12,7 +12,7 @@
 
 
     <TextView
-        android:id="@+id/goto_room_view"
+        android:id="@+id/got_room_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="42dp"
         android:layout_marginEnd="10dp"
-        android:layout_toStartOf="@id/goto_room_view"
+        android:layout_toStartOf="@id/got_room_view"
         android:scrollbars="none">
 
         <RelativeLayout

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

@@ -78,6 +78,7 @@
 
     <string name="apply_for_lianmai">ApplyMic</string>
     <string name="cancel_application">Cancel Mic</string>
+    <string name="close_mic">Close Mic</string>
     <string name="quit_mic">Quit Mic</string>
     <string name="edit_profile_birthday">Birthday</string>
     <string name="edit_profile_sex">Gender</string>

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

@@ -70,6 +70,7 @@
     <string name="edit_profile_sex">性別</string>
     <string name="apply_for_lianmai">申请連麥</string>
     <string name="cancel_application">取消申請</string>
+    <string name="close_mic">關閉連麥</string>
     <string name="quit_mic">退出連麥</string>
     <string name="edit_profile_city">所在地</string>
     <string name="edit_one_1">編輯個人資料</string>
@@ -617,6 +618,7 @@
     <string name="glamour_list">魅力榜</string>
     <string name="magnificent_list">豪氣榜</string>
     <string name="no_more_mic">當前沒有人在語音連麥中</string>
+    <string name="live_anchor_open_mic">語音連麥未開啟</string>
     <string name="load_failure">網絡請求失敗</string>
     <string name="load_failure_2">請檢查網絡連接後重試~</string>
     <string name="loading">加載中</string>
@@ -963,4 +965,5 @@
     <string name="image_quality_selection" translatable="false">畫質選擇</string>
     <string name="more_settings" translatable="false">更多設置</string>
     <string name="moer">查看更多</string>
+    <string name="gift_way">礼物正在获取中...</string>
 </resources>

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

@@ -6,9 +6,9 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorBackground">@color/background</item>
-        <item name="android:windowAnimationStyle">@style/Animation</item>
+        <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" >@color/colorPrimary</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
     </style>
 
     <style name="dialog" parent="AppTheme">
@@ -35,6 +35,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
+
     <style name="dialog4" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -44,6 +45,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">false</item>
     </style>
+
     <style name="dialog3" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -69,10 +71,12 @@
         <item name="android:windowEnterAnimation">@anim/left_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/left_anim_exit</item>
     </style>
+
     <style name="RightLeftToAnim" parent="android:Animation">
         <item name="android:windowEnterAnimation">@anim/right_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/right_anim_exit</item>
     </style>
+
     <style name="groupLast" parent="AppTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
@@ -93,6 +97,7 @@
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
     </style>
+
     <style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -107,15 +112,22 @@
     <style name="Animation">
         <item name="android:activityOpenEnterAnimation">@null</item>
         <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskOpenEnterAnimation">@null</item>
         <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskToFrontEnterAnimation">@null</item>
         <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskToBackExitAnimation">@anim/out_from_right</item>
+    </style>
+    <!-- 页面弹出（入场出场）动画 -->
+    <style name="AnimationActivity" parent="@android:style/Animation">
+        <item name="android:activityOpenEnterAnimation">@anim/in_from_right</item>
+        <item name="android:activityOpenExitAnimation">@anim/in_from_right_abit</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_to_right_abit</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_to_right</item>
     </style>
 </resources>