守护的全服通知，修改测试问题

common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java

@@ -19,7 +19,7 @@ public class GuardBuyTipsDialog {
      * @param content 购买类型名称
      * @param simpleCallback
      */
-    public static void showBuyOrRenewDialog(Context context, String coin, String content, DialogUitl.SimpleCallback simpleCallback) {
+    public static void showBuyOrRenewDialog(Context context, String coin, String content, boolean isOpen,DialogUitl.SimpleCallback simpleCallback) {
         if (context instanceof Activity) {
             if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
                 return;
@@ -30,14 +30,26 @@ public class GuardBuyTipsDialog {
         dialog.setContentView(R.layout.dialog_guard_buy_tips);
         dialog.setCancelable(true);
         dialog.setCanceledOnTouchOutside(true);
-        if (!TextUtils.isEmpty(coin)) {
-            TextView contentTextView = dialog.findViewById(R.id.content);
-            contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
-        }
-        if (!TextUtils.isEmpty(content)) {
-            TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
-            buyTypeTextView.setText("【"+content+"】");
+        if (!isOpen){
+            if (!TextUtils.isEmpty(coin)) {
+                TextView contentTextView = dialog.findViewById(R.id.content);
+                contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
+            }
+            if (!TextUtils.isEmpty(content)) {
+                TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
+                buyTypeTextView.setText("【"+content+"】");
+            }
+        }else {
+            if (!TextUtils.isEmpty(coin)) {
+                TextView contentTextView = dialog.findViewById(R.id.content);
+                contentTextView.setText(context.getString(R.string.guard_buy_tips_2, coin));
+            }
+            if (!TextUtils.isEmpty(content)) {
+                TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
+                buyTypeTextView.setText("【"+content+"】");
+            }
         }
+
         dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -1175,7 +1175,7 @@ public interface PDLiveApi {
     Observable<ResponseModel<GuardGetGuardOpenInfoModel>> getGuardOpenInfo(@Query("liveuid") String liveUid);
 
     @GET("/api/public/?service=Guard.openGuard")
-    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey);
+    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream);
 
     @GET("/api/public/?service=Guard.sendMoneyLong")
     Observable<ResponseModel<Object>> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum);

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -2984,9 +2984,9 @@ public class LiveNetManager {
 
     }
 
-    public void openGuard(String liveUid, String guardType, String priceKey, HttpCallback<String> callback) {
+    public void openGuard(String liveUid, String guardType, String priceKey, String stream, HttpCallback<String> callback) {
         API.get().pdLiveApi(mContext)
-                .openGuard(liveUid, guardType, priceKey)
+                .openGuard(liveUid, guardType, priceKey, stream)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<Object>>() {
@@ -3007,7 +3007,8 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
-    public void sendMoneyLongList(String liveUid,HttpCallback<List<sendMoneyLongListModel>> callback) {
+
+    public void sendMoneyLongList(String liveUid, HttpCallback<List<sendMoneyLongListModel>> callback) {
         API.get().pdLiveApi(mContext)
                 .sendMoneyLongList(liveUid)
                 .subscribeOn(Schedulers.io())
@@ -3030,6 +3031,7 @@ public class LiveNetManager {
                 }).isDisposed();
 
     }
+
     public void sendMoneyLong(String liveUid, String goldNum, HttpCallback<String> callback) {
         API.get().pdLiveApi(mContext)
                 .sendMoneyLong(liveUid, goldNum)
@@ -3103,7 +3105,7 @@ public class LiveNetManager {
 
     }
 
-    public void checkUpgrades( String liveUid,HttpCallback<CheckUpgradesModel> callback) {
+    public void checkUpgrades(String liveUid, HttpCallback<CheckUpgradesModel> callback) {
         API.get().pdLiveApi(mContext)
                 .checkUpgrades(liveUid)
                 .subscribeOn(Schedulers.io())

common/src/main/res/values-en-rUS/string.xml

@@ -1491,6 +1491,7 @@ Limited ride And limited avatar frame</string>
     <string name="due_in_guard">Expired</string>
     <string name="continuative_guardian_privilege2">"Now renew and enjoy guardian privileges again "</string>
     <string name="renewal_guardian">Renewal Guardian</string>
+    <string name="guard_buy_tips_2">You will spend %s diamonds to renew the anchor</string>
     <string name="participate">Participate</string>
     <string name="send_benefits">Send benefits</string>
 </resources>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1490,6 +1490,7 @@
     <string name="due_in_guard">天到期</string>
     <string name="continuative_guardian_privilege2">保留守護等級 重享守護特權</string>
     <string name="renewal_guardian">續費守護</string>
+    <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1489,6 +1489,7 @@
     <string name="due_in_guard">天到期</string>
     <string name="continuative_guardian_privilege2">保留守護等級 重享守護特權</string>
     <string name="renewal_guardian">續費守護</string>
+    <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
 

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

@@ -1486,6 +1486,7 @@
     <string name="due_in_guard">天到期</string>
     <string name="continuative_guardian_privilege2">保留守護等級 重享守護特權</string>
     <string name="renewal_guardian">續費守護</string>
+    <string name="guard_buy_tips_2">您將花費%s鑽石為主播續費</string>
     <string name="participate">點擊參加</string>
     <string name="send_benefits">發放福利</string>
 

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

@@ -1495,6 +1495,7 @@ Limited ride And limited avatar frame</string>
     <string name="due_in_guard">Expired</string>
     <string name="renewal_guardian">Renewal Guardian</string>
     <string name="guard_buy_tips_1">You will spend %s diamonds for the anchor</string>
+    <string name="guard_buy_tips_2">You will spend %s diamonds to renew the anchor</string>
     <string name="participate">Participate</string>
     <string name="send_benefits">Send benefits</string>