~wjc/HDLPhotovoltaicDebugAPP.git

parent: 215622f6 | 补丁 | 提交 | show whitespace

2025年03月25日21:35:30

wjc

2025-03-25 579da4e0056080c878ed4d0a479a631db9610ee1

2025年03月25日21:35:30

15个文件已修改

	aa_chart_core/build.gradle	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/AndroidManifest.xml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	countrypicker/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pickerview/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	third-zxing/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	wheelview/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 aa_chart_core/build.gradle

@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'

android {
    compileSdk 31
    compileSdkVersion 33

    defaultConfig {
        minSdk 23
        targetSdk 31
        minSdkVersion 23
        targetSdkVersion 33
        versionCode 1
        versionName "1.0"


 aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java

@@ -70,7 +70,11 @@
    public Integer xAxisTickInterval;     //x 轴刻度点间隔数(设置每隔几个点显示一个 X轴的内容)
    public String[] categories;            //x 轴是否显示数据
    public Number xAxisGridLineWidth;    //x 轴网格线的宽度
    public String xAxisGridLineColor;    //x 轴网格线的颜色
    public Boolean xAxisVisible;          //x 轴是否显示
    public String xAxisColor;          //x 轴颜色
    public Number xAxisLineWidth;          //x 轴线宽度

    public Boolean yAxisVisible;          //y 轴是否显示
    public Boolean yAxisLabelsEnabled;    //y 轴是否显示数据
    public String yAxisTitle;            //y 轴标题
@@ -79,6 +83,7 @@
    public Number yAxisMax;              //y 轴最大值
    public Boolean yAxisAllowDecimals;    //y 轴是否允许显示小数
    public Number yAxisGridLineWidth;    //y 轴网格线的宽度
    public String yAxisGridLineColor;    //y 轴网格线的宽度
    public Object[] colorsTheme;           //图表主题颜色数组
    public Boolean legendEnabled;         //是否显示图例
    public Object backgroundColor;       //图表背景色
@@ -224,11 +229,33 @@
        return this;
    }

    public AAChartModel xAxisGridLineColor(String prop) {
        xAxisGridLineColor = prop;
        return this;


    }

    public AAChartModel xAxisColor(String prop) {
        xAxisColor = prop;
        return this;
    }

    public AAChartModel xAxisLineWidth(Number prop) {
        xAxisLineWidth = prop;
        return this;
    }

    public AAChartModel yAxisGridLineWidth(Number prop) {
        yAxisGridLineWidth = prop;
        return this;
    }

    public AAChartModel yAxisGridLineColor(String prop) {
        yAxisGridLineColor = prop;
        return this;
    }

    public AAChartModel xAxisVisible(Boolean prop) {
        xAxisVisible = prop;
        return this;

 aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java

@@ -646,9 +646,9 @@

/**
 * -------------------------------------------------------------------------------
 *
 * <p>
 *  🌕 🌖 🌗 🌘  ❀❀❀   WARM TIPS!!!   ❀❀❀ 🌑 🌒 🌓 🌔
 *
 * <p>
 * Please contact me on GitHub,if there are any problems encountered in use.
 * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
 * -------------------------------------------------------------------------------
@@ -657,9 +657,8 @@
 * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
 * JianShu       : http://www.jianshu.com/u/f1e6753d4254
 * SegmentFault  : https://segmentfault.com/u/huanghunbieguan
 *
 * <p>
 * -------------------------------------------------------------------------------

 */


@@ -885,18 +884,23 @@
                    Boolean aaXAxisLabelsEnabled = aaChartModel.xAxisLabelsEnabled;
                    AALabels aaXAxisLabels = new AALabels()
                            .enabled(aaXAxisLabelsEnabled);//设置 x 轴是否显示文字

                    if (aaXAxisLabelsEnabled) {
                        aaXAxisLabels.style(new AAStyle()
                                .color(aaChartModel.axesTextColor));
                                .color(aaChartModel.axesTextColor)
                        );
                    }

                    AAXAxis aaXAxis = new AAXAxis()
                            .labels(aaXAxisLabels) //设置 x 轴是否显示文字
                            .reversed(aaChartModel.xAxisReversed)
                            .gridLineWidth(aaChartModel.xAxisGridLineWidth) //x轴网格线宽度
                            .gridLineColor(aaChartModel.xAxisGridLineColor) //x轴网格线宽度
                            .categories(aaChartModel.categories)
                            .visible(aaChartModel.xAxisVisible) //x轴是否可见
                            .tickInterval(aaChartModel.xAxisTickInterval);//x轴坐标点间隔数
                            .tickInterval(aaChartModel.xAxisTickInterval)//x轴坐标点间隔数
                            .lineColor(aaChartModel.xAxisColor) // 设置 X 轴轴线颜色为红色（十六进制颜色值）
                            .lineWidth(aaChartModel.xAxisLineWidth);

                    aaOptions.xAxis(aaXAxis);
                }
@@ -916,6 +920,7 @@
                        .allowDecimals(aaChartModel.yAxisAllowDecimals) //是否允许显示小数
                        .reversed(aaChartModel.yAxisReversed)
                        .gridLineWidth(aaChartModel.yAxisGridLineWidth) //y轴网格线宽度
                        .gridLineColor(aaChartModel.yAxisGridLineColor)//y轴网格线颜色
                        .title(new AATitle()
                                .text(aaChartModel.yAxisTitle)
                                .style(new AAStyle()

 app/src/main/AndroidManifest.xml

@@ -5,10 +5,11 @@

    <uses-permission
        android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
        tools:ignore="ProtectedPermissions" /> <!-- &lt;!&ndash;Android13 照片&ndash;&gt; -->
    <!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> -->
        tools:ignore="ProtectedPermissions" />
    <!-- &lt;!&ndash;Android13 照片&ndash;&gt; -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
    <!-- &lt;!&ndash;Android13 视频&ndash;&gt; -->
    <!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> -->
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
    <!-- Android13 音频 -->
    <!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> -->
    <uses-permission android:name="android.permission.VIBRATE" /> <!-- honor 角标 -->
@@ -131,10 +132,11 @@
            android:exported="false" />

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

        <!--largeHeap="true" 临时缓解内存不足问题 -->
        <activity
            android:name=".ui.me.WebActivity"
            android:exported="false" />
            android:exported="false"
            android:largeHeap="true" />
        <activity
            android:name=".ui.me.AsRegardsActivity"
            android:exported="false" />

 app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java

@@ -10,6 +10,7 @@
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartZoomType;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAChart;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AADataLabels;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAStyle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATitle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
@@ -72,11 +73,10 @@
                "rgba(255,255,255,0)"//热情的粉红, alpha 透明度 0.1
        );
        //颜色字符串设置支持十六进制类型和 rgba 类型
//        AAStyle aaStyle = new AAStyle();
//        aaStyle.color("#FFFFFFFF");
        AAStyle aaStyle = new AAStyle();
        aaStyle.color("#66FFFFFF");
//        aaStyle.background("#FF555859");


        aaStyle.fontSize(12);
        AATooltip aaTooltip = new AATooltip()
                .enabled(true)
                .backgroundColor(AAColor.rgbaColor(51, 55, 56, 1f))
@@ -93,7 +93,7 @@
//                .tooltip(aaTooltip)
                .data(data);

//        AASeriesElement element2 = new AASeriesElement()
//        AASeriesElement element2 = new AASeriesElement();
//                .name("NewYork")
//                .data(new Object[]{0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36});
        return configureBasicOptions()
@@ -108,11 +108,13 @@
                .yAxisGridLineWidth(0.10)
                .yAxisAllowDecimals(true)
                .xAxisVisible(true)
                .xAxisLineWidth(0)
//                .yAxisMax(100)
                .yAxisMin(0)
                .titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色
                .titleStyle(aaStyle)//坐标轴字体颜色
//                .axesTextColor("#FFFFFF")//背景颜色
                .series(new AASeriesElement[]{element1});

    }

    public static AAChartModel configureStepAreaChartAndStepLineChart() {

 app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java

@@ -203,6 +203,7 @@
                .categories(categories)
                .yAxisGridLineWidth(0.10)
                .xAxisVisible(true)
                .xAxisLineWidth(0)
                .xAxisLabelsEnabled(true)
                .zoomType(AAChartZoomType.None)
                .legendEnabled(false)

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

@@ -115,18 +115,18 @@
                //Manifest.permission.WRITE_EXTERNAL_STORAGE 读写设备上的照片以及文件
                //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
                //Android 13以上用别的权限
//                if (Build.VERSION.SDK_INT >= 33) {
                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);
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
//                                return;
//                            }
//                            changedUserAvatar();
                    changedUserAvatar();
//                        }
//                    }, true);
//                } else {
                } else {
                // 未授权 如果应用程序没有所需的权限，则显示解释说明
                PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
@@ -140,7 +140,7 @@
                        changedUserAvatar();
                    }
                }, true);
//                }
                }
            }
        });


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

@@ -65,7 +65,6 @@
            viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
        }
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);

        if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
            //中文
            if (this.typeIntValue == 0) {

 app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java

@@ -35,10 +35,10 @@
        Activity activity = (Activity) context;

        activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));

        //只能通过这种方式调用

        Intent intent = new Intent();

        intent.setPackage("com.hdl.photovoltaic");

        intent.setAction("UniappService.ACTION");

        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);

//        Intent intent = new Intent();

//        intent.setPackage("com.hdl.photovoltaic");

//        intent.setAction("UniappService.ACTION");

//        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);



        return splashView;

    }


 app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java

@@ -33,11 +33,11 @@
        //设置导航条背景颜色

        Activity activity = (Activity) context;

        activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));

        //只能通过这种方式调用

        Intent intent = new Intent();

        intent.setPackage("com.hdl.photovoltaic");

        intent.setAction("UniappService.ACTION");

        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);

//        //只能通过这种方式调用

//        Intent intent = new Intent();

//        intent.setPackage("com.hdl.photovoltaic");

//        intent.setAction("UniappService.ACTION");

//        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);



        return splashView;

    }


 app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java

@@ -440,9 +440,13 @@
     * 从相册中获取图片
     */
    private void select_photo() {

        if (Build.VERSION.SDK_INT >= 33) {
            //默认成功
            openAlbum();
        } else {
        String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
        int status = PermissionUtils.getPermissionState(mContext, permission);

        switch (status) {
            case PermissionUtils.STATUS_SUCCESS:
                openAlbum();
@@ -470,6 +474,7 @@
                break;
        }
    }
    }

    /**
     * 打开相册的方法

 countrypicker/build.gradle

@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'

android {
    compileSdkVersion 30
    compileSdkVersion 33

    defaultConfig {
        minSdkVersion 15
        targetSdkVersion 30
        targetSdkVersion 33
        versionCode 300
        versionName "3.0.0"


 pickerview/build.gradle

@@ -4,11 +4,11 @@




android {

    compileSdkVersion 31

    compileSdkVersion 33



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 31

        targetSdkVersion 33

        versionCode 34

        versionName "4.1.9"

    }


 third-zxing/build.gradle

@@ -2,12 +2,12 @@




android {

    compileSdkVersion 30

    compileSdkVersion 33

    buildToolsVersion "29.0.1"



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 30

        targetSdkVersion 33

        versionCode 1

        versionName "1.0"




 wheelview/build.gradle

@@ -4,11 +4,11 @@




android {

    compileSdkVersion 31

    compileSdkVersion 33



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 31

        targetSdkVersion 33

        versionCode 31

        versionName "4.1.0"

    }

			@@ -1,11 +1,11 @@
			apply plugin: 'com.android.library'

			android {
			compileSdk 31
			compileSdkVersion 33

			defaultConfig {
			minSdk 23
			targetSdk 31
			minSdkVersion 23
			targetSdkVersion 33
			versionCode 1
			versionName "1.0"

			@@ -70,7 +70,11 @@
			public Integer xAxisTickInterval; //x 轴刻度点间隔数(设置每隔几个点显示一个 X轴的内容)
			public String[] categories; //x 轴是否显示数据
			public Number xAxisGridLineWidth; //x 轴网格线的宽度
			public String xAxisGridLineColor; //x 轴网格线的颜色
			public Boolean xAxisVisible; //x 轴是否显示
			public String xAxisColor; //x 轴颜色
			public Number xAxisLineWidth; //x 轴线宽度

			public Boolean yAxisVisible; //y 轴是否显示
			public Boolean yAxisLabelsEnabled; //y 轴是否显示数据
			public String yAxisTitle; //y 轴标题
			@@ -79,6 +83,7 @@
			public Number yAxisMax; //y 轴最大值
			public Boolean yAxisAllowDecimals; //y 轴是否允许显示小数
			public Number yAxisGridLineWidth; //y 轴网格线的宽度
			public String yAxisGridLineColor; //y 轴网格线的宽度
			public Object[] colorsTheme; //图表主题颜色数组
			public Boolean legendEnabled; //是否显示图例
			public Object backgroundColor; //图表背景色
			@@ -224,11 +229,33 @@
			return this;
			}

			public AAChartModel xAxisGridLineColor(String prop) {
			xAxisGridLineColor = prop;
			return this;


			}

			public AAChartModel xAxisColor(String prop) {
			xAxisColor = prop;
			return this;
			}

			public AAChartModel xAxisLineWidth(Number prop) {
			xAxisLineWidth = prop;
			return this;
			}

			public AAChartModel yAxisGridLineWidth(Number prop) {
			yAxisGridLineWidth = prop;
			return this;
			}

			public AAChartModel yAxisGridLineColor(String prop) {
			yAxisGridLineColor = prop;
			return this;
			}

			public AAChartModel xAxisVisible(Boolean prop) {
			xAxisVisible = prop;
			return this;

			@@ -646,9 +646,9 @@

			/**
			* -------------------------------------------------------------------------------
			*
			* <p>
			* 🌕 🌖 🌗 🌘 ❀❀❀ WARM TIPS!!! ❀❀❀ 🌑 🌒 🌓 🌔
			*
			* <p>
			* Please contact me on GitHub,if there are any problems encountered in use.
			* GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
			* -------------------------------------------------------------------------------
			@@ -657,9 +657,8 @@
			* StackOverflow : https://stackoverflow.com/users/7842508/codeforu
			* JianShu : http://www.jianshu.com/u/f1e6753d4254
			* SegmentFault : https://segmentfault.com/u/huanghunbieguan
			*
			* <p>
			* -------------------------------------------------------------------------------

			*/


			@@ -885,18 +884,23 @@
			Boolean aaXAxisLabelsEnabled = aaChartModel.xAxisLabelsEnabled;
			AALabels aaXAxisLabels = new AALabels()
			.enabled(aaXAxisLabelsEnabled);//设置 x 轴是否显示文字

			if (aaXAxisLabelsEnabled) {
			aaXAxisLabels.style(new AAStyle()
			.color(aaChartModel.axesTextColor));
			.color(aaChartModel.axesTextColor)
			);
			}

			AAXAxis aaXAxis = new AAXAxis()
			.labels(aaXAxisLabels) //设置 x 轴是否显示文字
			.reversed(aaChartModel.xAxisReversed)
			.gridLineWidth(aaChartModel.xAxisGridLineWidth) //x轴网格线宽度
			.gridLineColor(aaChartModel.xAxisGridLineColor) //x轴网格线宽度
			.categories(aaChartModel.categories)
			.visible(aaChartModel.xAxisVisible) //x轴是否可见
			.tickInterval(aaChartModel.xAxisTickInterval);//x轴坐标点间隔数
			.tickInterval(aaChartModel.xAxisTickInterval)//x轴坐标点间隔数
			.lineColor(aaChartModel.xAxisColor) // 设置 X 轴轴线颜色为红色（十六进制颜色值）
			.lineWidth(aaChartModel.xAxisLineWidth);

			aaOptions.xAxis(aaXAxis);
			}
			@@ -916,6 +920,7 @@
			.allowDecimals(aaChartModel.yAxisAllowDecimals) //是否允许显示小数
			.reversed(aaChartModel.yAxisReversed)
			.gridLineWidth(aaChartModel.yAxisGridLineWidth) //y轴网格线宽度
			.gridLineColor(aaChartModel.yAxisGridLineColor)//y轴网格线颜色
			.title(new AATitle()
			.text(aaChartModel.yAxisTitle)
			.style(new AAStyle()

			@@ -5,10 +5,11 @@

			<uses-permission
			android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
			tools:ignore="ProtectedPermissions" /> <!-- <!–Android13 照片–> -->
			<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> -->
			tools:ignore="ProtectedPermissions" />
			<!-- <!–Android13 照片–> -->
			<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
			<!-- <!–Android13 视频–> -->
			<!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> -->
			<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
			<!-- Android13 音频 -->
			<!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> -->
			<uses-permission android:name="android.permission.VIBRATE" /> <!-- honor 角标 -->
			@@ -131,10 +132,11 @@
			android:exported="false" />

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

			<!--largeHeap="true" 临时缓解内存不足问题 -->
			<activity
			android:name=".ui.me.WebActivity"
			android:exported="false" />
			android:exported="false"
			android:largeHeap="true" />
			<activity
			android:name=".ui.me.AsRegardsActivity"
			android:exported="false" />

			@@ -10,6 +10,7 @@
			import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
			import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartZoomType;
			import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAChart;
			import com.github.AAChartModel.AAChartCore.AAOptionsModel.AADataLabels;
			import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAStyle;
			import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATitle;
			import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
			@@ -72,11 +73,10 @@
			"rgba(255,255,255,0)"//热情的粉红, alpha 透明度 0.1
			);
			//颜色字符串设置支持十六进制类型和 rgba 类型
			// AAStyle aaStyle = new AAStyle();
			// aaStyle.color("#FFFFFFFF");
			AAStyle aaStyle = new AAStyle();
			aaStyle.color("#66FFFFFF");
			// aaStyle.background("#FF555859");


			aaStyle.fontSize(12);
			AATooltip aaTooltip = new AATooltip()
			.enabled(true)
			.backgroundColor(AAColor.rgbaColor(51, 55, 56, 1f))
			@@ -93,7 +93,7 @@
			// .tooltip(aaTooltip)
			.data(data);

			// AASeriesElement element2 = new AASeriesElement()
			// AASeriesElement element2 = new AASeriesElement();
			// .name("NewYork")
			// .data(new Object[]{0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36});
			return configureBasicOptions()
			@@ -108,11 +108,13 @@
			.yAxisGridLineWidth(0.10)
			.yAxisAllowDecimals(true)
			.xAxisVisible(true)
			.xAxisLineWidth(0)
			// .yAxisMax(100)
			.yAxisMin(0)
			.titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色
			.titleStyle(aaStyle)//坐标轴字体颜色
			// .axesTextColor("#FFFFFF")//背景颜色
			.series(new AASeriesElement[]{element1});

			}

			public static AAChartModel configureStepAreaChartAndStepLineChart() {

			@@ -203,6 +203,7 @@
			.categories(categories)
			.yAxisGridLineWidth(0.10)
			.xAxisVisible(true)
			.xAxisLineWidth(0)
			.xAxisLabelsEnabled(true)
			.zoomType(AAChartZoomType.None)
			.legendEnabled(false)

			@@ -115,18 +115,18 @@
			//Manifest.permission.WRITE_EXTERNAL_STORAGE 读写设备上的照片以及文件
			//generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
			//Android 13以上用别的权限
			// if (Build.VERSION.SDK_INT >= 33) {
			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);
			// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
			// return;
			// }
			// changedUserAvatar();
			changedUserAvatar();
			// }
			// }, true);
			// } else {
			} else {
			// 未授权如果应用程序没有所需的权限，则显示解释说明
			PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
			PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
			@@ -140,7 +140,7 @@
			changedUserAvatar();
			}
			}, true);
			// }
			}
			}
			});

			@@ -65,7 +65,6 @@
			viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
			}
			viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);

			if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
			//中文
			if (this.typeIntValue == 0) {

			@@ -35,10 +35,10 @@
			Activity activity = (Activity) context;
			activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));
			//只能通过这种方式调用
			Intent intent = new Intent();
			intent.setPackage("com.hdl.photovoltaic");
			intent.setAction("UniappService.ACTION");
			context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);
			// Intent intent = new Intent();
			// intent.setPackage("com.hdl.photovoltaic");
			// intent.setAction("UniappService.ACTION");
			// context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);

			return splashView;
			}

			@@ -33,11 +33,11 @@
			//设置导航条背景颜色
			Activity activity = (Activity) context;
			activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));
			//只能通过这种方式调用
			Intent intent = new Intent();
			intent.setPackage("com.hdl.photovoltaic");
			intent.setAction("UniappService.ACTION");
			context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);
			// //只能通过这种方式调用
			// Intent intent = new Intent();
			// intent.setPackage("com.hdl.photovoltaic");
			// intent.setAction("UniappService.ACTION");
			// context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);

			return splashView;
			}

			@@ -440,9 +440,13 @@
			* 从相册中获取图片
			*/
			private void select_photo() {

			if (Build.VERSION.SDK_INT >= 33) {
			//默认成功
			openAlbum();
			} else {
			String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
			int status = PermissionUtils.getPermissionState(mContext, permission);

			switch (status) {
			case PermissionUtils.STATUS_SUCCESS:
			openAlbum();
			@@ -470,6 +474,7 @@
			break;
			}
			}
			}

			/**
			* 打开相册的方法

			@@ -4,11 +4,11 @@


			android {
			compileSdkVersion 31
			compileSdkVersion 33

			defaultConfig {
			minSdkVersion 23
			targetSdkVersion 31
			targetSdkVersion 33
			versionCode 34
			versionName "4.1.9"
			}

			@@ -2,12 +2,12 @@


			android {
			compileSdkVersion 30
			compileSdkVersion 33
			buildToolsVersion "29.0.1"

			defaultConfig {
			minSdkVersion 23
			targetSdkVersion 30
			targetSdkVersion 33
			versionCode 1
			versionName "1.0"