Merge remote-tracking branch 'origin/master'

app/src/main/java/com/zxhl/game/ysdzz/GuildDialog.kt

@@ -3,6 +3,7 @@ package com.zxhl.game.ysdzz
 import android.app.Activity
 import android.app.Dialog
 import android.content.Context
+import android.content.Intent
 import android.graphics.Color
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -16,7 +17,9 @@ import com.zxhl.library.AppliContext
 import com.zxhl.library.net.NetConfig
 import com.zxhl.library.utils.JumpUtils
 import com.zxhl.library.utils.PhoneUtils
+import com.zxhl.library.utils.Utils
 import com.zxhl.task.R
+import com.zxhl.task.module.activity.WebActivity
 
 class GuildDialog {
 
@@ -42,12 +45,12 @@ class GuildDialog {
             .setOnClickListener { activity.finish() }
         val clickUa: ClickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {
-                JumpUtils.h5Jump("隐私政策", NetConfig.H5.WEB_URL_PRIVACY)
+                h5Jump2(activity,"隐私政策", NetConfig.H5.WEB_URL_PRIVACY)
             }
         }
         val clickPrivat: ClickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {
-                JumpUtils.h5Jump("用户协议", NetConfig.H5.WEB_URL_USER)
+                h5Jump2(activity,"用户协议", NetConfig.H5.WEB_URL_USER)
             }
         }
 //        《隐私政策》和《用户协议》，请您在使用前仔细阅读并了解
@@ -140,4 +143,19 @@ class GuildDialog {
         return mDialogView
     }
 
+    fun h5Jump2(
+        activity: Activity,
+        title: String?,
+        url: String?
+    ) {
+        try {
+            val intent = Intent(activity, WebActivity::class.java)
+            intent.putExtra("title", title)
+            intent.putExtra("url", url)
+            activity.startActivity(intent)
+        } catch (e: Exception) {
+            Utils.showToast(AppliContext.get(), "该版本暂不支持，请更新版本！")
+        }
+    }
+
 }
\ No newline at end of file

app/src/main/java/com/zxhl/game/ysdzz/ui/GamePauseActivity.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.widget.Toast
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.zxhl.game.ysdzz.ADConfig.AD_PAUSE_PAGE_IMAGE
+import com.zxhl.game.ysdzz.GuildDialog
 import com.zxhl.game.ysdzz.R
 import com.zxhl.library.Constant
 import com.zxhl.library.config.AdManager
@@ -14,7 +15,7 @@ import com.zxhl.library.listener.ZXADExpressListener
 import com.zxhl.library.module.NewsEntity
 import com.zxhl.library.net.BaseActivity
 import com.zxhl.library.net.NetConfig
-import com.zxhl.library.utils.JumpUtils
+import com.zxhl.library.utils.JumpUtils.h5Jump
 import com.zxhl.library.utils.PhoneUtils
 import com.zxhl.library.utils.Utils
 import kotlinx.android.synthetic.main.activit_game_pause.*
@@ -83,11 +84,11 @@ class GamePauseActivity :BaseActivity() {
         }
         //隐私协议
         secret_agreement.setOnClickListener(View.OnClickListener {
-            JumpUtils.h5Jump("隐私协议", NetConfig.H5.WEB_URL_PRIVACY);
+            GuildDialog().h5Jump2(this,"隐私协议", NetConfig.H5.WEB_URL_PRIVACY);
         })
         //用户协议
         user_agreement.setOnClickListener(View.OnClickListener {
-            JumpUtils.h5Jump("用户协议", NetConfig.H5.WEB_URL_USER);
+            GuildDialog().h5Jump2(this,"用户协议", NetConfig.H5.WEB_URL_USER);
         })
 
     }

library/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zxhl.library">
 
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -11,43 +11,29 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--前台服务，用于9.0系统或者内存不足防止后台服务被系统干掉，我们需要将服务提升为前台服务-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 前台服务，用于9.0系统或者内存不足防止后台服务被系统干掉，我们需要将服务提升为前台服务 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <permission android:name="android.permission.DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-
-    <!-- SDK所需要权限 -->
-
-
-    <!--必要权限-->
-
-    <!--可选权限-->
-    <uses-permission android:name="android.permission.GET_TASKS" />
-
-    <!--可选，穿山甲提供“获取地理位置权限”和“不给予地理位置权限，开发者传入地理位置参数”两种方式上报用户位置，两种方式均可不选，添加位置权限或参数将帮助投放定位广告-->
-    <!--请注意：无论通过何种方式提供给穿山甲用户地理位置，均需向用户声明地理位置权限将应用于穿山甲广告投放，穿山甲不强制获取地理位置信息-->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-    <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <!-- SDK所需要权限 -->
+    <!-- 必要权限 -->
+    <!-- 可选权限 -->
+    <uses-permission android:name="android.permission.GET_TASKS" /> <!-- 可选，穿山甲提供“获取地理位置权限”和“不给予地理位置权限，开发者传入地理位置参数”两种方式上报用户位置，两种方式均可不选，添加位置权限或参数将帮助投放定位广告 -->
+    <!-- 请注意：无论通过何种方式提供给穿山甲用户地理位置，均需向用户声明地理位置权限将应用于穿山甲广告投放，穿山甲不强制获取地理位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="true">
-
-
-        //baidu
         <activity
             android:name="com.baidu.mobads.AppActivity"
-
             android:configChanges="screenSize|keyboard|keyboardHidden|orientation"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
-
         <provider
             android:name="com.baidu.mobads.openad.BdFileProvider"
             android:authorities="${applicationId}.bd.provider"
@@ -58,17 +44,11 @@
                 android:resource="@xml/bd_file_path" />
         </provider>
 
-
         <activity
             android:name=".net.PermissionsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-
             android:screenOrientation="unspecified"
-            android:theme="@style/myTranslant" />
-
-
-
-        <!--全屏广告，激励视频-->
+            android:theme="@style/myTranslant" /> <!-- 全屏广告，激励视频 -->
         <activity
             android:name="com.qq.e.ads.PortraitADActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
@@ -81,17 +61,14 @@
 
         <uses-library
             android:name="org.apache.http.legacy"
-            android:required="false" />
-        <!-- 声明SDK所需要的组件 -->
+            android:required="false" /> <!-- 声明SDK所需要的组件 -->
         <service
             android:name="com.qq.e.comm.DownloadService"
-            android:exported="false" />
-        <!-- 请开发者注意字母的大小写，ADActivity，而不是AdActivity -->
+            android:exported="false" /> <!-- 请开发者注意字母的大小写，ADActivity，而不是AdActivity -->
         <activity
             android:name="com.qq.e.ads.ADActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
 
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -101,8 +78,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
-
-
         <provider
             android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
             android:authorities="${applicationId}.TTFileProvider"
@@ -115,16 +90,12 @@
         <provider
             android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
             android:authorities="${applicationId}.TTMultiProvider"
-            android:exported="false" />
-
-
-        <!--广告展示Activity -->
+            android:exported="false" /> <!-- 广告展示Activity -->
         <activity
             android:name="com.sigmob.sdk.base.common.AdActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@android:style/Theme.DeviceDefault" />
 
-
         <provider
             android:name="com.sigmob.sdk.SigmobXFileProvider"
             android:authorities="${applicationId}.sigprovider"
@@ -136,4 +107,4 @@
         </provider>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file

library/src/main/java/com/zxhl/library/utils/JumpUtils.java

@@ -10,6 +10,7 @@ import com.zxhl.library.AppliContext;
 import com.zxhl.library.Constant;
 import com.zxhl.library.module.NewsEntity;
 import com.zxhl.library.module.ShaveListEntity;
+import com.zxhl.library.net.NetConfig;
 import com.zxhl.library.net.UserInfoEntity;
 import com.zxhl.library.router.RounterApi;
 import com.zxhl.library.router.RounterBus;
@@ -39,6 +40,8 @@ public class JumpUtils {
         }
     }
 
+
+
     public static void gatherJump(String CChannel, String pid, String albumId, String description, String area, String tvYear,
                                   String score, String contentType, String name, String image, boolean topVisibleFlag,
                                   String availableMediaNum, String playCnt) {
@@ -112,7 +115,7 @@ public class JumpUtils {
     }
 
     //钻石提现
-    public static  void  jumpDiamonCrashActivity(){
+    public static void jumpDiamonCrashActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentDimoneCrash();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -120,10 +123,11 @@ public class JumpUtils {
         } catch (Exception e) {
         }
     }
-    public static  void  jumpCrashActivity(String page){
+
+    public static void jumpCrashActivity(String page) {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentCrash(page);
-            intent.putExtra("page",page);
+            intent.putExtra("page", page);
 
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             AppliContext.get().startActivity(intent);
@@ -133,7 +137,7 @@ public class JumpUtils {
 
 
     //r任务页
-    public static  void  jumpTaskCrashActivity(){
+    public static void jumpTaskCrashActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentTaskCrash();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -143,7 +147,7 @@ public class JumpUtils {
     }
 
     //活动页  yzdd_active
-    public static  void  jumpActiveActivity(){
+    public static void jumpActiveActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentActive();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -153,7 +157,7 @@ public class JumpUtils {
     }
 
     //金币提现
-    public static  void  jumpCoinCrashActivity(){
+    public static void jumpCoinCrashActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentCoinCrash();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -163,7 +167,6 @@ public class JumpUtils {
     }
 
 
-
     //幸运抽奖
     public static void jumpLuckDrawActivity() {
         try {
@@ -185,7 +188,7 @@ public class JumpUtils {
     }
 
 
-     // 刮刮卡
+    // 刮刮卡
     public static void jumpShaveActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentShave();
@@ -209,10 +212,10 @@ public class JumpUtils {
     public static void jumpReadH5Activity(String url, String title, String slot_id, String sid) {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentReadH5(url, title, slot_id, sid);
-            intent.putExtra("url",url);
-            intent.putExtra("title",title);
-            intent.putExtra("slot_id",slot_id);
-            intent.putExtra("sid",sid);
+            intent.putExtra("url", url);
+            intent.putExtra("title", title);
+            intent.putExtra("slot_id", slot_id);
+            intent.putExtra("sid", sid);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             AppliContext.get().startActivity(intent);
         } catch (Exception e) {
@@ -220,21 +223,21 @@ public class JumpUtils {
     }
 
 
-     //互动广告跳转
+    //互动广告跳转
     public static void jumpAdWebActivity(String url, String title, String slot_id, String sid, String incentive_level, String alert, String alertRenderType, String timeTrigger, String delay, String deep_url_re) {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class)
                     .getIntentAdWeb(incentive_level, alert, alertRenderType, timeTrigger, delay, deep_url_re, url, title, slot_id, sid);
-            intent.putExtra("url",url);
-            intent.putExtra("title",title);
-            intent.putExtra("slot_id",slot_id);
-            intent.putExtra("sid",sid);
-            intent.putExtra("deep_url_re",deep_url_re);
-            intent.putExtra("delay",delay);
-            intent.putExtra("timeTrigger",timeTrigger);
-            intent.putExtra("alertRenderType",alertRenderType);
-            intent.putExtra("alert",alert);
-            intent.putExtra("incentive_level",incentive_level);
+            intent.putExtra("url", url);
+            intent.putExtra("title", title);
+            intent.putExtra("slot_id", slot_id);
+            intent.putExtra("sid", sid);
+            intent.putExtra("deep_url_re", deep_url_re);
+            intent.putExtra("delay", delay);
+            intent.putExtra("timeTrigger", timeTrigger);
+            intent.putExtra("alertRenderType", alertRenderType);
+            intent.putExtra("alert", alert);
+            intent.putExtra("incentive_level", incentive_level);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             AppliContext.get().startActivity(intent);
         } catch (Exception e) {
@@ -242,7 +245,7 @@ public class JumpUtils {
     }
 
 
-  //刮刮卡详情
+    //刮刮卡详情
     public static void jumpScratchCardActivity(ShaveListEntity.ShaveEntity entity) {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentScratchCard(Utils.obj2Str(entity));
@@ -253,8 +256,7 @@ public class JumpUtils {
     }
 
 
-
-  //抽奖记录
+    //抽奖记录
     public static void jumpSlotMachineRecordActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentSlotMachineRecord();
@@ -264,7 +266,7 @@ public class JumpUtils {
         }
     }
 
-   //金币明细
+    //金币明细
     public static void jumpGoldDetailsActivity() {
         try {
             Intent intent = RounterBus.getRounter(RounterApi.class).getIntentGoldDetails();

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

@@ -2,7 +2,7 @@
 <resources>
 
 
-     <string name="wait_ing">请稍后</string>
+    <string name="wait_ing">请稍后</string>
     <string name="permission_help">帮助</string>
     <string name="permission_help_text">彩蛋消消乐缺少必要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。\n最后点击两次后退按钮，即可返回。</string>
     <string name="permission_camera_help_text">此功能需要权限：\n\n%s\n请点击"设置"-"权限"-打开所需权限。</string>

task/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zxhl.task">
 
@@ -37,7 +38,6 @@
                     android:scheme="yzdd" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".module.luckydraw.activity.ShaveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -86,9 +86,8 @@
                     android:scheme="yzdd" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name="com.zxhl.task.module.activity.WithdrawResultActivity"
+            android:name=".module.activity.WithdrawResultActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
@@ -97,7 +96,6 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".module.activity.RewardVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -109,7 +107,9 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="new_web"
                     android:scheme="yzdd" />
@@ -121,13 +121,14 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="ad_web"
                     android:scheme="yzdd" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".module.luckydraw.activity.ScratchCardActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -159,10 +160,7 @@
                     android:host="diamondwithdrawcash"
                     android:scheme="yzdd" />
             </intent-filter>
-        </activity>
-
-
-        <!--红包雨-->
+        </activity> <!-- 红包雨 -->
         <activity
             android:name=".module.activity.RedPackageActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -178,10 +176,7 @@
                     android:host="redpackage"
                     android:scheme="yzdd" />
             </intent-filter>
-        </activity>
-
-
-        <!--任务页   以前的-->
+        </activity> <!-- 任务页   以前的 -->
         <activity
             android:name=".module.activity.TaskActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -197,9 +192,7 @@
                     android:host="task"
                     android:scheme="yzdd" />
             </intent-filter>
-        </activity>
-
-        <!--钻石提现   菜园-->
+        </activity> <!-- 钻石提现   菜园 -->
         <activity
             android:name=".module.caiyuan.DiamondCashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -232,7 +225,6 @@
                     android:scheme="yzdd" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".module.caiyuan.CoinCrashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -248,10 +240,7 @@
                     android:host="coin_crash"
                     android:scheme="yzdd" />
             </intent-filter>
-        </activity>
-
-        <!--彩蛋消消乐-->
-
+        </activity> <!-- 彩蛋消消乐 -->
         <activity
             android:name=".module.caiyuan.CrashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -268,13 +257,12 @@
                     android:scheme="yzdd" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".module.caiyuan.ActiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/myTranslant"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/myTranslant">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -288,4 +276,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file