Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -2605,7 +2605,7 @@ public class CommonUtil {
                 LogUtil.println("checkCopyText", url);
                 if(StringUtils.isHttpUrl(url)) {
                     showGoWebDialog(dialogConfig, closeListener, textString, url);
-                } else{
+                } else if(TestUtil.isTest()) {//下面的功能暂不提供给用户
                     dialogConfig.setMsg("已经复制如下内容：\n" + textString + "\n，是否尝试跳转？")
                             .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().tryGotoDeepLink(textString))
                             .setBtnRightText("仅一次").setBtnRightOnClickListener(view -> {
@@ -2629,19 +2629,23 @@ public class CommonUtil {
         }
     }
 
+    //跳转http或者https链接
     private void showGoWebDialog(DialogConfig dialogConfig, View.OnClickListener closeListener, String textString, String url) {
-        if(checkShouYouShare(closeListener, url)){
+        if(checkShouYouShare(closeListener, url)){//小绵羊分享页面特殊处理
             return;
         }
-        dialogConfig.setMsg("已经复制如下内容：\n" + textString + "\n，是否访问该链接？")
-                .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url))
-                .setBtnRightText("仅一次").setBtnRightOnClickListener(view -> {
-            closeListener.onClick(view);
-            Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url);
-        });
-        ViewUtil.showMsgDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
+        if(TestUtil.isTest()) {//下面的功能暂不提供给用户
+            dialogConfig.setMsg("已经复制如下内容：\n" + textString + "\n，是否访问该链接？")
+                    .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url))
+                    .setBtnRightText("仅一次").setBtnRightOnClickListener(view -> {
+                closeListener.onClick(view);
+                Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url);
+            });
+            ViewUtil.showMsgDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
+        }
     }
 
+    //检查是否是小绵羊分享页面，如果是且获取到了game_id，返回true并调用接口获取对应的applications，然后尝试显示游戏对话框，提示用户是否查看游戏详情
     private boolean checkShouYouShare(View.OnClickListener closeListener, String url) {
         if(url.contains("/shou_you_share/index.html")) {
             String gameId = StringUtils.getQueryParameter(url, "game_id");

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1944,6 +1944,10 @@ public class Jump2View {
      * 游戏代充
      */
     public void goGameRecharge(Activity activity, Object o) {
+        if(!Config.IS_OPEN_GAME_RECHARGE){//关闭游戏直充功能
+            G.showToast(R.string.un_use_function);
+            return;
+        }
         Intent intent = new Intent(activity, ActGameAgencyRecharge.class);
         activity.startActivity(intent);
         GAME_INSTEAD_OF_RECHARGE.onEvent();

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -1,7 +1,5 @@
 package com.sheep.jiuyan.samllsheep;
 
-import com.sheep.gamegroup.util.TestUtil;
-
 /**
  * Created by kemllor on 2017/12/14.
  */
@@ -59,9 +57,13 @@ public class Config {
 
     //默认值
     public static boolean dvbEnableCheckCopyText(){
-        return TestUtil.isTest();
-//        //游戏用户默认开启检查粘贴板
+//        return TestUtil.isTest();
+        //游戏用户默认开启检查粘贴板
 //        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
 //        return userEntity != null && userEntity.isGameUser();
+        return true;//所有用户默认开启检查粘贴板内容的功能
     }
+
+    //游戏直充功能开启状态
+    public static boolean IS_OPEN_GAME_RECHARGE = false;
 }

app/src/main/res/layout/act_my_money.xml

@@ -282,6 +282,7 @@
                         android:textColor="#ff333333"
                         android:onClick="onClickGameRecharge"
                         android:textSize="12sp"
+                        android:visibility="gone"
                         android:text="游戏直充"/>
                     <TextView
                         android:layout_width="0dp"

app/src/main/res/layout/new_year_act_my_money.xml

@@ -318,6 +318,7 @@
                         android:gravity="center"
                         android:onClick="onClickGameRecharge"
                         android:text="游戏直充"
+                        android:visibility="gone"
                         android:textColor="#ff333333"
                         android:textSize="12sp" />
 

app/src/main/res/values/str_network_strings.xml

@@ -13,4 +13,5 @@
     <string name="wushuju">还没有数据哦</string>
     <string name="wushuju_net_error">网络错误，请稍候再试</string>
     <string name="please_contact_customer_service">数据错误，请联系客服</string>
+    <string name="un_use_function">该功能已经下架，如有疑问，请联系客服</string>
 </resources>

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.4.10
-VERSION_CODE=3004010
+VERSION_NAME=3.4.11
+VERSION_CODE=3004011
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_MIN_SDK_VERSION=18
 ANDORID_TARGET_SDK_VERSION=28