From 579da4e0056080c878ed4d0a479a631db9610ee1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 25 三月 2025 21:35:32 +0800
Subject: [PATCH] 2025年03月25日21:35:30
---
countrypicker/build.gradle | 4
third-zxing/build.gradle | 4
wheelview/build.gradle | 4
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 14 ++-
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 36 ++++----
app/src/main/AndroidManifest.xml | 12 +-
aa_chart_core/build.gradle | 6
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java | 1
app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java | 8 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 1
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java | 19 +++-
app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java | 55 +++++++------
pickerview/build.gradle | 4
app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java | 10 +-
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java | 27 ++++++
15 files changed, 123 insertions(+), 82 deletions(-)
diff --git a/aa_chart_core/build.gradle b/aa_chart_core/build.gradle
index 85c958f..6a6b2f0 100644
--- a/aa_chart_core/build.gradle
+++ b/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"
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
index e0f7914..4b0caf0 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
+++ b/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;
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
index 4667bd3..981fe76 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -646,9 +646,9 @@
/**
* -------------------------------------------------------------------------------
- *
- * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
- *
+ * <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()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ad6a98..ae10be4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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" />
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
index 0fe0505..1f62425 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
+++ b/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() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
index f9aa629..8bb5bb4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
+++ b/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)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index fe0ecac..638eab9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -113,34 +113,34 @@
@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) {
+// 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);
+// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
// return;
// }
-// changedUserAvatar();
+ changedUserAvatar();
// }
// }, true);
-// } 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() {
- @Override
- public void Success(int value) {
- PermissionExplanationDialog.getInstance().dismiss();
- if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
+ } 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() {
+ @Override
+ public void Success(int value) {
+ PermissionExplanationDialog.getInstance().dismiss();
+ if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
- return;
+ return;
+ }
+ changedUserAvatar();
}
- changedUserAvatar();
- }
- }, true);
-// }
+ }, true);
+ }
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index 82ec784..406f571 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/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) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
index 87fc38d..a05f8a8 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
+++ b/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;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
index cc4fa22..7b09d9e 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
+++ b/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;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
index 7d19b72..cfcdf76 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
@@ -440,34 +440,39 @@
* 浠庣浉鍐屼腑鑾峰彇鍥剧墖
*/
private void select_photo() {
- String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
- int status = PermissionUtils.getPermissionState(mContext, permission);
- switch (status) {
- case PermissionUtils.STATUS_SUCCESS:
- openAlbum();
- break;
- case PermissionUtils.STATUS_REFUSE:
- case PermissionUtils.STATUS_DEFAULT:
- XXPermissions.with(mContext)
- .permission(permission)
- .request(new OnPermissionCallback() {
- @Override
- public void onGranted(List<String> permissions, boolean all) {
- SharedPreUtils.putBoolean(permission, true);
- openAlbum();
- }
+ 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();
+ break;
+ case PermissionUtils.STATUS_REFUSE:
+ case PermissionUtils.STATUS_DEFAULT:
+ XXPermissions.with(mContext)
+ .permission(permission)
+ .request(new OnPermissionCallback() {
+ @Override
+ public void onGranted(List<String> permissions, boolean all) {
+ SharedPreUtils.putBoolean(permission, true);
+ openAlbum();
+ }
- @Override
- public void onDenied(List<String> permissions, boolean never) {
- SharedPreUtils.putBoolean(permission, true);
- }
- });
- break;
- case PermissionUtils.STATUS_REFUSE_PERMANENT:
+ @Override
+ public void onDenied(List<String> permissions, boolean never) {
+ SharedPreUtils.putBoolean(permission, true);
+ }
+ });
+ break;
+ case PermissionUtils.STATUS_REFUSE_PERMANENT:
// HdlThreadLogic.toast(mContext, R.string.permission_open);
- HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
- break;
+ HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
+ break;
+ }
}
}
diff --git a/countrypicker/build.gradle b/countrypicker/build.gradle
index 31e9713..b9c3af2 100644
--- a/countrypicker/build.gradle
+++ b/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"
diff --git a/pickerview/build.gradle b/pickerview/build.gradle
index 338d980..1183484 100644
--- a/pickerview/build.gradle
+++ b/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"
}
diff --git a/third-zxing/build.gradle b/third-zxing/build.gradle
index c39f127..9b1be11 100644
--- a/third-zxing/build.gradle
+++ b/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"
diff --git a/wheelview/build.gradle b/wheelview/build.gradle
index 6bd966b..f7425a1 100644
--- a/wheelview/build.gradle
+++ b/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"
}
--
Gitblit v1.8.0