From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级,隐私政策整改

---
 app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java |  113 +++++++-------------------------------------------------
 1 files changed, 14 insertions(+), 99 deletions(-)

diff --git a/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java b/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
index 34e33de..47ff88a 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/ToolUtil.java
@@ -20,9 +20,13 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+
 import androidx.annotation.NonNull;
+
 import com.google.android.material.appbar.AppBarLayout;
+
 import androidx.core.app.NotificationManagerCompat;
+
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
@@ -35,10 +39,9 @@
 import com.alibaba.baichuan.android.trade.model.AlibcShowParams;
 import com.alibaba.baichuan.android.trade.model.OpenType;
 import com.app.hubert.guide.util.ScreenUtils;
-import com.coloros.mcssdk.PushManager;
 import com.google.gson.Gson;
-import com.huawei.android.hms.agent.HMSAgent;
-import com.huawei.android.hms.agent.push.handler.EnableReceiveNormalMsgHandler;
+import com.heytap.msp.push.HeytapPushManager;
+import com.heytap.msp.push.callback.ICallBackResultService;
 import com.nostra13.universalimageloader.cache.disc.naming.HashCodeFileNameGenerator;
 import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
 import com.nostra13.universalimageloader.cache.memory.impl.LruMemoryCache;
@@ -47,6 +50,7 @@
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
+import com.tejia.lijin.app.ui.recommend.GoodsDetailActivity;
 import com.umeng.commonsdk.UMConfigure;
 import com.vivo.push.PushClient;
 import com.wpc.library.util.common.StringUtils;
@@ -67,7 +71,6 @@
 import com.tejia.lijin.app.ui.dialog.ShapeLoadingDialog;
 import com.tejia.lijin.app.ui.invite.ShareBrowserActivity;
 import com.tejia.lijin.app.ui.main.MainActivity;
-import com.tejia.lijin.app.ui.recommend.GoodsDetailActivityTB;
 import com.tejia.lijin.app.ui.recommend.SearchResultActivity;
 import com.tejia.lijin.app.ui.recommend.ShareGoodsImageActivity31;
 import com.tejia.lijin.app.util.umengCustomEvent.MainCustomEvent;
@@ -364,14 +367,17 @@
             } else {
                 try {
                     if (cClass.equals("com.tejia.lijin.app.ui.recommend.GoodsBrowserActivity")) {
-                        cClass = GoodsDetailActivityTB.class.getName();
+                        cClass = GoodsDetailActivity.class.getName();
                     }
                     Intent intent = new Intent(context, Class.forName(JumpActivityUtil.filterActivityName(cClass)));
                     if (!StringUtils.isEmpty(url1))
                         intent.putExtra("url", url1);
                     if (!StringUtils.isEmpty(id)) {
-                        intent.putExtra("id", id);
+                        intent.putExtra("goodsId", id);
+                        intent.putExtra("goodsType", Constant.GOODS_TYPE_TB);
                     }
+
+
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     context.startActivity(intent);
                 } catch (ClassNotFoundException e) {
@@ -381,39 +387,6 @@
         } catch (JSONException e) {
             e.printStackTrace();
         }
-    }
-
-    /**
-     * 娉ㄥ唽 OPPO RegId
-     */
-    public static void registeredOPPOId(Context context) {
-        String registerId = null;
-        if (PushManager.getInstance() != null)
-            registerId = PushManager.getInstance().getRegisterID();
-        if (!StringUtils.isEmpty(registerId))
-            ShoppingApi.bindOPPOPush(context, UserUtil.getUid(ShoppingApplication.application), registerId, new BasicTextHttpResponseHandler() {
-                @Override
-                public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                    super.onSuccessPerfect(statusCode, headers, jsonObject);
-                }
-            });
-    }
-
-    /**
-     * 娉ㄥ唽 VIVO RegId
-     */
-    public static void registeredVIVORegId(Context context) {
-//        Log.e("eee", "registeredVIVORegId-uid: " + uid);
-        String registerId = null;
-        if (PushClient.getInstance(context) != null)
-            registerId = PushClient.getInstance(context).getRegId();
-        if (!StringUtils.isEmpty(registerId))
-            ShoppingApi.bindVIVOPush(context, UserUtil.getUid(ShoppingApplication.application), registerId, new BasicTextHttpResponseHandler() {
-                @Override
-                public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                    super.onSuccessPerfect(statusCode, headers, jsonObject);
-                }
-            });
     }
 
     /**
@@ -443,73 +416,15 @@
                         weekDays.add(i);
                     }
                     if (isChecked)
-                        PushManager.getInstance().setPushTime(weekDays, 20, 0, 8, 0);
+                        HeytapPushManager.setPushTime(weekDays, 20, 0, 8, 0);
                     else
-                        PushManager.getInstance().setPushTime(weekDays, 0, 0, 23, 59);
+                        HeytapPushManager.setPushTime(weekDays, 0, 0, 23, 59);
                     break;
                 case "vivo":
                     break;
                 default:
                     break;
             }
-        }
-    }
-
-    /**
-     * 鎵撳紑鎴栧叧闂帹閫�
-     */
-    public static void setPush_OFF_NO(MainActivity mContext) {
-        if (mContext != null) {
-            /**
-             * false 鍏抽棴鎺ㄩ��
-             * _01 绗竴娆℃煡璇紙绗竴娆℃煡璇� 鍏抽棴鎺ㄩ�� 鍙叧闂竴娆★級
-             * true 寮�鍚帹閫�
-             * _02 浜屾鏌ヨ锛堝彧寮�鍚竴娆★級
-             * */
-            SharedPreferences sp = mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
-            String off_no = sp.getString("push_off_no", "false_01");
-            SharedPreferences.Editor editor = sp.edit();
-            String mBRAND = Build.BRAND.toLowerCase();
-            if (mBRAND.equals("xiaomi")) {
-//                Log.e("eee", "setPush_OFF_NO: " + mBRAND + "--" + off_no);
-                if (off_no.equals("false_01")) {//鍏抽棴涓�娆℃帹閫�
-//                    Log.e("eee", "setPush_OFF_NO: 鍏抽棴MiPush鎺ㄩ�佹湇鍔�");
-                    MiPushClient.pausePush(mContext, null);/**鏆傚仠鎺ユ敹MiPush鏈嶅姟鎺ㄩ�佺殑娑堟伅*/
-                    editor.putString("push_off_no", "false_02");
-                } else if (off_no.equals("true_01")) {
-//                    Log.e("eee", "setPush_OFF_NO: 鍚敤MiPush鎺ㄩ�佹湇鍔�");
-                    MiPushClient.resumePush(mContext, null);/**鎭㈠鎺ユ敹MiPush鏈嶅姟鎺ㄩ�佺殑娑堟伅锛岃繖鏃舵湇鍔″櫒浼氭妸鏆傚仠鏃舵湡鐨勬帹閫佹秷鎭噸鏂版帹閫佽繃鏉�*/
-                    editor.putString("push_off_no", "true_02");
-                }
-            } else if (mBRAND.equals("huawei") || mBRAND.equals("honor")) {
-//                Log.e("eee", "honor: ");
-                if (off_no.equals("false_01")) {
-                    editor.putString("push_off_no", "false_02");
-                    HMSAgent.Push.enableReceiveNormalMsg(false, new EnableReceiveNormalMsgHandler() {
-                        @Override
-                        public void onResult(int rst) {
-                        }
-                    });
-                } else if (off_no.equals("true_01")) {
-                    editor.putString("push_off_no", "true_02");
-                    HMSAgent.Push.enableReceiveNormalMsg(true, new EnableReceiveNormalMsgHandler() {
-                        @Override
-                        public void onResult(int rst) {
-                        }
-                    });
-                }
-            } else if (mBRAND.equals("oppo")) {
-                if (off_no.equals("false_01")) {
-                    PushManager.getInstance().pausePush();/*** 鏆傚仠鎺ユ敹OPush鏈嶅姟鎺ㄩ�佺殑娑堟伅*/
-                    editor.putString("push_off_no", "false_02");
-                } else if (off_no.equals("true_01")) {
-                    PushManager.getInstance().resumePush();/*** 鎭㈠鎺ユ敹OPush鏈嶅姟鎺ㄩ�佺殑娑堟伅锛岃繖鏃舵湇鍔″櫒浼氭妸鏆傚仠鏃舵湡鐨勬帹閫佹秷鎭噸鏂版帹閫佽繃鏉�*/
-                    editor.putString("push_off_no", "true_02");
-                }
-            } else if (mBRAND.equals("vivo")) {
-
-            }
-            editor.commit();
         }
     }
 

--
Gitblit v1.8.0