2025年01月08日11:54:09

wjc

2025-01-08 634d1eea3221cf745d719608546a3d7dca7e19c2

2025年01月08日11:54:09

 app/build.gradle

@@ -29,7 +29,7 @@
        applicationId "com.hdl.photovoltaic"
        minSdkVersion 23
        targetSdkVersion 34
        versionCode 4
        versionCode 5
        versionName "1.0.0"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true

 app/src/main/AndroidManifest.xml

@@ -47,7 +47,7 @@
    <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- Optional. Required for location feature -->
    <!-- 为了提高sdk识别唯一用户的能力，保证消息推送的精准送达，建议集成以下权限（可选） -->
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
    <!--    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />&lt;!&ndash;谷歌play上架不了&ndash;&gt;-->
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 如您需要接入地理围栏业务，建议集成以下权限（可选） -->
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -132,9 +132,6 @@
        <activity
            android:name=".ui.me.CPersonalDataActivity"
            android:exported="false" />

        <service android:name=".widget.apkwgtupload.ApkDownLoadService" />

        <activity
            android:name=".ui.me.WebActivity"
            android:exported="false" />

 app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java

@@ -5,6 +5,7 @@
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;

@@ -24,7 +25,6 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.photovoltaic.widget.FlashingIconBoxDialog;
import com.hdl.photovoltaic.widget.apkwgtupload.ApkDownLoadService;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;

@@ -137,6 +137,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getColor(R.color.text_00000000));
        viewBinding.asRegardsVersionUpdatingRl.setVisibility(View.GONE);
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_regard);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
        String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
@@ -170,11 +171,24 @@
                updateConfirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                    @Override
                    public void Confirm() {
                        Intent intent = new Intent(_mActivity, ApkDownLoadService.class);
                        intent.putExtra("updateUrl", mNewVersionBean.getPackageUrl());
                        intent.putExtra("downLoadName", HdlAppUpdateLogic.getInstance().getApkFileName());
                        intent.putExtra("downLoadType", "0");
                        _mActivity.startService(intent);
                        FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                        flashingBoxDialog.setContent(getString(R.string.loading_not_supported));
                        flashingBoxDialog.show();
//                        try {
//                            PackageManager packageManager = getPackageManager();
//                            PackageInfo packageInfo = packageManager.getPackageInfo("com.android.vending", 0);
//                            String versionName = packageInfo.versionName; // 获取版本号
//                            int versionCode = packageInfo.versionCode; // 获取版本代码
//                            // 在此处处理版本信息
//                        } catch (PackageManager.NameNotFoundException e) {
//                            e.printStackTrace();
//                            // 处理异常，例如谷歌Play商店应用未安装
//                        }
//
//                        String packageName = "com.hdl.photovoltaic"; // 替换为你想跳转到的应用的包名
//                        Intent intent = new Intent(Intent.ACTION_VIEW);
//                        intent.setData(Uri.parse("market://details?id=" + packageName));
//                        startActivity(intent);
                        updateConfirmationCancelDialog.dismiss();

                    }

 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java

@@ -111,32 +111,44 @@

            @Override
            public void onClick(View v) {
                //Manifest.permission.WRITE_EXTERNAL_STORAGE 读写设备上的照片以及文件
                //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
                //Android 13以上用别的权限
                if (Build.VERSION.SDK_INT >= 33) {
                    PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.READ_MEDIA_IMAGES, new PermissionUtils.PermissionState() {
                        @Override
                        public void Success(int value) {
                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {

                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
                    @Override
                    public void Success(int value) {
                        if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                                return;
                            }
                            changedUserAvatar();
                            return;
                        }
                    }, true);
                } else {
                    PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
                        @Override
                        public void Success(int value) {
                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                                return;
                            }
                            changedUserAvatar();
                        }
                    }, true);
                }
                        changedUserAvatar();
                    }
                }, true);

//                //Manifest.permission.WRITE_EXTERNAL_STORAGE 读写设备上的照片以及文件
//                //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
//                //Android 13以上用别的权限
//                if (Build.VERSION.SDK_INT >= 33) {
//                    PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.READ_MEDIA_IMAGES, new PermissionUtils.PermissionState() {
//                        @Override
//                        public void Success(int value) {
//                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
////                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
//                                return;
//                            }
//                            changedUserAvatar();
//                        }
//                    }, true);
//                } else {
//                    PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
//                        @Override
//                        public void Success(int value) {
//                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
////                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
//                                return;
//                            }
//                            changedUserAvatar();
//                        }
//                    }, true);
//                }
            }
        });


 app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AndroidPermissionActivity.java

File was deleted

 app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/ApkDownLoadService.java

File was deleted

 app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java

File was deleted

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

@@ -81,16 +81,26 @@
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/qr_code_box" />


            <View
                android:id="@+id/line"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_29"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv" />


            <!--版本更新-->
            <RelativeLayout
                android:id="@+id/as_regards_version_updating_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_57"
                android:layout_marginTop="@dimen/dp_29"
                android:background="@color/text_FF1C1C1E"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv">
                app:layout_constraintTop_toBottomOf="@+id/line">

                <TextView
                    android:id="@+id/as_regards_version_updating_tv"
@@ -100,9 +110,7 @@
                    android:layout_marginStart="@dimen/dp_16"
                    android:text="@string/app_version_upgrade"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textSize="@dimen/text_14"

                    />
                    android:textSize="@dimen/text_14" />

                <LinearLayout
                    android:id="@+id/as_regards_version_updating_ll"

 pickerview/src/androidTest/java/com/bigkoo/pickerview/ApplicationTest.java

@@ -1,13 +1,13 @@
package com.bigkoo.pickerview;



import android.app.Application;

import android.test.ApplicationTestCase;



/**

 * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>

 */

public class ApplicationTest extends ApplicationTestCase<Application> {

    public ApplicationTest() {

        super(Application.class);

    }

}
//import android.test.ApplicationTestCase;

//

///**

// * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>

// */

//public class ApplicationTest extends ApplicationTestCase<Application> {

//    public ApplicationTest() {

//        super(Application.class);

//    }

//}

 wheelview/src/androidTest/java/test/wheelview/ExampleInstrumentedTest.java

@@ -1,26 +1,26 @@
package test.wheelview;



import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import static org.junit.Assert.*;



/**

 * Instrumentation test, which will execute on an Android device.

 *

 * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>

 */

@RunWith(AndroidJUnit4.class)

public class ExampleInstrumentedTest {

    @Test

    public void useAppContext() throws Exception {

        // Context of the app under test.

        Context appContext = InstrumentationRegistry.getTargetContext();



        assertEquals("test.wheelview.test", appContext.getPackageName());

    }

}

//import android.support.test.InstrumentationRegistry;

//import android.support.test.runner.AndroidJUnit4;

//

//import org.junit.Test;

//import org.junit.runner.RunWith;

//

//import static org.junit.Assert.*;

//

///**

// * Instrumentation test, which will execute on an Android device.

// *

// * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>

// */

//@RunWith(AndroidJUnit4.class)

//public class ExampleInstrumentedTest {

//    @Test

//    public void useAppContext() throws Exception {

//        // Context of the app under test.

//        Context appContext = InstrumentationRegistry.getTargetContext();

//

//        assertEquals("test.wheelview.test", appContext.getPackageName());

//    }

//}