1.1.3完善

admin

2021-07-08 1764c1784a4cf1a6afd25fcf1a0eef6187a84218

1.1.3完善

 app/build.gradle

@@ -48,8 +48,8 @@
        applicationId "com.tejia.lijin"
        minSdkVersion 19
        targetSdkVersion 26
        versionCode 65//2.0.2
        versionName "1.1.1"
        versionCode 67//2.0.2
        versionName "1.1.3"
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
    }


 app/src/main/AndroidManifest.xml

@@ -605,7 +605,7 @@
        <!-- 华为推送自动初始化 -->
        <meta-data
            android:name="push_kit_auto_init_enabled"
            android:value="true" />
            android:value="false" />
        <!-- 华为推送服务注册 -->
        <service
            android:name=".service.HWPushService"

 app/src/main/java/com/tejia/lijin/app/ShoppingApplication.java

@@ -196,21 +196,25 @@
     * 穿山甲广告初始化
     */
    private static void initAD(Context context) {
        GDTADManager.getInstance().initWith(context, Constant.GDT_APP_ID);
        try {
            GDTADManager.getInstance().initWith(context, Constant.GDT_APP_ID);

        TTAdSdk.init(context,
                new TTAdConfig.Builder()
                        .appId(Constant.CSJ_APP_ID)
                        .useTextureView(true) //默认使用SurfaceView播放视频广告,当有SurfaceView冲突的场景，可以使用TextureView
                        .appName("特价")
                        .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)//落地页主题
                        .allowShowNotify(true) //是否允许sdk展示通知栏提示
                        .debug(true) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
                        .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI) //允许直接下载的网络状态集合,没有设置的网络下点击下载apk会有二次确认弹窗，弹窗中会披露应用信息
                        .supportMultiProcess(false) //是否支持多进程，true支持
                        .asyncInit(true) //是否异步初始化sdk,设置为true可以减少SDK初始化耗时。3450版本开始废弃~~
                        //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
                        .build());
            TTAdSdk.init(context,
                    new TTAdConfig.Builder()
                            .appId(Constant.CSJ_APP_ID)
                            .useTextureView(true) //默认使用SurfaceView播放视频广告,当有SurfaceView冲突的场景，可以使用TextureView
                            .appName("特价")
                            .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)//落地页主题
                            .allowShowNotify(true) //是否允许sdk展示通知栏提示
                            .debug(true) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
                            .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI) //允许直接下载的网络状态集合,没有设置的网络下点击下载apk会有二次确认弹窗，弹窗中会披露应用信息
                            .supportMultiProcess(false) //是否支持多进程，true支持
                            .asyncInit(true) //是否异步初始化sdk,设置为true可以减少SDK初始化耗时。3450版本开始废弃~~
                            //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
                            .build());
        } catch (Exception e) {

        }
    }

    public IWXAPI mWxApi;

 app/src/main/java/com/tejia/lijin/app/ui/dialog/GoodsDetailJumpLoaingDialog.java

@@ -52,7 +52,7 @@
        String notifyDesc;
        String notifyUrl;
        int platform;
        int time = 5;
        int time = 3;
        Runnable runnable = null;
        IDialogClose dialogCloseListener;


 app/src/main/java/com/tejia/lijin/app/ui/main/MainActivity.java

@@ -284,8 +284,14 @@
        PushUtil.inintPush(ShoppingApplication.application, pushApps, new PushUtil.ITokenListener() {

            @Override
            public void onToken(PushRomType romType, String regId) {
                ShoppingApi.bindPushToken(getApplicationContext(), UserUtil.getUid(getApplicationContext()), romType, regId, null);
            public void onToken(final PushRomType romType,final String regId) {
                runOnUiThread(new Runnable() {
                    @Override
                    public void run() {
                        ShoppingApi.bindPushToken(getApplicationContext(), UserUtil.getUid(getApplicationContext()), romType, regId, null);
                    }
                });

            }
        });
    }

 app/src/main/java/com/tejia/lijin/app/ui/main/RecommendTopFragment.java

@@ -1554,7 +1554,7 @@
                lijinHongBaoRunnable.run();
            if (lijinSendInfo.getUser() != null) {
                Glide.with(this).load(lijinSendInfo.getUser().getPortrait()).transform(new GlideCircleTransform(getContext())).into(iv_fuli_portrait);
            }else
            } else
                Glide.with(this).load(R.drawable.ic_default_portrait_light).transform(new GlideCircleTransform(getContext())).into(iv_fuli_portrait);
        }
    }
@@ -1567,9 +1567,12 @@
        new RecommendHbDialog.Builder(getContext()).setHBInfo(lijinSendInfo).setActionListener(new RecommendHbDialog.Builder.ILijinHongBaoAction() {
            @Override
            public void onClose() {
                SharedPreferences.Editor editor = sharedPreferences.edit();
                editor.putString(lijinSendInfo.getMd5(), new Gson().toJson(lijinSendInfo));
                editor.commit();
                if (lijinSendInfo != null && !StringUtils.isNullOrEmpty(lijinSendInfo.getMd5())) {
                    SharedPreferences.Editor editor = sharedPreferences.edit();
                    editor.putString(lijinSendInfo.getMd5(), new Gson().toJson(lijinSendInfo));
                    editor.commit();
                }

                setFuliData();
            }


 app/src/main/java/com/tejia/lijin/app/ui/recommend/RecommendHotGoodsAdapter.java

@@ -90,6 +90,7 @@
                @Override
                public void onClick(View v) {
                    Intent intent = new Intent(mContext, GoodsDetailActivity.class);
                    intent.putExtra("from", "recommendHot");
                    intent.putExtra("goodsId", info.getGoodsId());
                    intent.putExtra("goodsType", info.getGoodsType());
                    intent.putExtra("title", info.getTitle());

 app/src/main/java/com/tejia/lijin/app/util/Constant.java

@@ -22,6 +22,8 @@
            case GOODS_TYPE_SUNING:
                return "苏宁";
        }


        return "";
    }


 app/src/main/java/com/tejia/lijin/app/util/TestUtil.java

@@ -15,7 +15,7 @@
    public static void pourIntoUserInfo(Context context) {
        if (!Constant.TEST)
            return;
        Long uid = 437032L;
        Long uid = 6872490L;
        SharedPreferences sp = context.getSharedPreferences("user", Context.MODE_PRIVATE);
        SharedPreferences.Editor editor = sp.edit();
        editor.putBoolean("isLogin", true);

 app/src/main/java/com/tejia/lijin/app/util/clipboard/ClipboardUtil.java

@@ -31,23 +31,27 @@

    public static void getClipboardContent(final Activity context, final IClipboardContentListener listener) {

        if (Build.VERSION.SDK_INT >= 29) {//Q以后版本采用
            context.getWindow().getDecorView().post(new Runnable() {
                @Override
                public void run() {
                    ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
                    if (clipboardManager != null)
                        if (clipboardManager.getPrimaryClip() != null)
                            if (clipboardManager.getPrimaryClip().getItemCount() > 0 && clipboardManager.getPrimaryClip().getItemAt(0).getText() != null)
                                listener.getContent(clipboardManager.getPrimaryClip().getItemAt(0).getText().toString());
                }
            });
        } else {
            ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
            if (clipboardManager != null)
                if (clipboardManager.getPrimaryClip() != null)
                    if (clipboardManager.getPrimaryClip().getItemCount() > 0 && clipboardManager.getPrimaryClip().getItemAt(0).getText() != null)
                        listener.getContent(clipboardManager.getPrimaryClip().getItemAt(0).getText().toString());
        try {
            if (Build.VERSION.SDK_INT >= 29) {//Q以后版本采用
                context.getWindow().getDecorView().post(new Runnable() {
                    @Override
                    public void run() {
                        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
                        if (clipboardManager != null)
                            if (clipboardManager.getPrimaryClip() != null)
                                if (clipboardManager.getPrimaryClip().getItemCount() > 0 && clipboardManager.getPrimaryClip().getItemAt(0).getText() != null)
                                    listener.getContent(clipboardManager.getPrimaryClip().getItemAt(0).getText().toString());
                    }
                });
            } else {
                ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
                if (clipboardManager != null)
                    if (clipboardManager.getPrimaryClip() != null)
                        if (clipboardManager.getPrimaryClip().getItemCount() > 0 && clipboardManager.getPrimaryClip().getItemAt(0).getText() != null)
                            listener.getContent(clipboardManager.getPrimaryClip().getItemAt(0).getText().toString());
            }
        } catch (Exception e) {

        }
    }


 app/src/main/res/drawable-xhdpi/icon_rank_diamond.png

 library-push/src/main/java/com/yeshi/push/PushUtil.java

@@ -2,10 +2,13 @@

import android.app.Application;
import android.os.Build;
import android.text.TextUtils;
import android.util.Log;

import com.heytap.msp.push.HeytapPushManager;
import com.heytap.msp.push.callback.ICallBackResultService;
import com.huawei.hms.aaid.HmsInstanceId;
import com.huawei.hms.common.ApiException;
import com.meizu.cloud.pushsdk.PushManager;
import com.vivo.push.IPushActionListener;
import com.vivo.push.PushClient;
@@ -27,6 +30,28 @@
                case "huawei":
                case "honor":
                    //华为是自动初始化
                    //获取token
                    new Thread() {
                        @Override
                        public void run() {
                            try {
                                // 从agconnect-service.json文件中读取appId
                                String appId = apps.getHw().getAppId();
                                // 输入token标识"HCM"
                                String tokenScope = "HCM";
                                String token = HmsInstanceId.getInstance(context).getToken(appId, tokenScope);
                                Log.i(TAG, "get token: " + token);

                                // 判断token是否为空
                                if(!TextUtils.isEmpty(token)) {
                                    tokenListener.onToken(PushRomType.huawei,token);
                                }
                            } catch (ApiException e) {
                                Log.e(TAG, "hw: get token failed, " + e);
                            }
                        }
                    }.start();

                    return;
                case "oppo"://上面官方判断
                    /***OPPO官方判断方法*/