aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
@@ -335,7 +335,7 @@ yAxisLabelsEnabled = true; yAxisGridLineWidth = 1f; legendEnabled = true; backgroundColor = "#FF333738"; backgroundColor = "#333738"; borderRadius = 0f;//柱状图长条图头部圆角半径(可用于设置头部的形状,仅对条形图,柱状图有效,设置为1000时,柱形图或者条形图头部为楔形) markerRadius = 6f;//折线连接点的半径长度,如果值设置为0,这样就相当于不显示了 } aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -552,6 +552,36 @@ * SegmentFault : https://segmentfault.com/u/huanghunbieguan * <p> * ------------------------------------------------------------------------------- * <p> * ------------------------------------------------------------------------------- * <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 * ------------------------------------------------------------------------------- * And if you want to contribute for this project, please contact me as well * GitHub : https://github.com/AAChartModel * StackOverflow : https://stackoverflow.com/users/7842508/codeforu * JianShu : http://www.jianshu.com/u/f1e6753d4254 * SegmentFault : https://segmentfault.com/u/huanghunbieguan * <p> * ------------------------------------------------------------------------------- * <p> * ------------------------------------------------------------------------------- * <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 * ------------------------------------------------------------------------------- * And if you want to contribute for this project, please contact me as well * GitHub : https://github.com/AAChartModel * StackOverflow : https://stackoverflow.com/users/7842508/codeforu * JianShu : http://www.jianshu.com/u/f1e6753d4254 * SegmentFault : https://segmentfault.com/u/huanghunbieguan * <p> * ------------------------------------------------------------------------------- */ /** @@ -634,7 +664,7 @@ .enabled(true) //启用浮动提示框 // .shared(true) //多组数据共享一个浮动提示框 .backgroundColor(AAColor.rgbaColor(85, 88, 89, 1f)) .borderRadius(8) .borderRadius(16) .borderWidth(0) .valueDecimals(2) .style(aaStyle) app/src/main/AndroidManifest.xml
@@ -70,10 +70,10 @@ <application android:name=".HDLApp" android:allowBackup="true" android:icon="@drawable/logo" android:icon="@drawable/desktop_logo" android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:roundIcon="@drawable/logo" android:roundIcon="@drawable/desktop_logo" android:supportsRtl="true" android:theme="@style/Theme.PhotovoltaicDebug"> <activity app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -123,7 +123,7 @@ //设置字体颜色 ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null)); // 去掉下划线 ds.setUnderlineText(!UserConfigManage.getInstance().isZh()); ds.setUnderlineText(true); } @@ -143,7 +143,7 @@ //设置字体颜色 ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null)); // 去掉下划线 ds.setUnderlineText(!UserConfigManage.getInstance().isZh()); ds.setUnderlineText(true); } @@ -538,7 +538,7 @@ //设置字体颜色 ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null)); // 去掉下划线 ds.setUnderlineText(!UserConfigManage.getInstance().isZh()); ds.setUnderlineText(true); } @@ -561,7 +561,7 @@ //设置字体颜色 ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null)); // 去掉下划线 ds.setUnderlineText(!UserConfigManage.getInstance().isZh()); ds.setUnderlineText(true); }
@@ -420,7 +420,7 @@ if(needDelay) { viewBinding.autoSizeMyAAChart.setX(10000);//直接打开有闪屏，在不显示的地方先显示，再移动到正常的位置。TODO 后续找到根源问题后去掉这个用法 aaChartView.aa_drawChartWithChartOptions(aaChartModel.aa_toAAOptions()); mHandler.sendEmptyMessageDelayed(100,800); mHandler.sendEmptyMessageDelayed(100,1000); } else{ aaChartView.aa_drawChartWithChartOptions(aaChartModel.aa_toAAOptions()); app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -25,7 +25,7 @@ .backgroundColor("#EDEFF2") // .backgroundColor("#4b2b7f") .dataLabelsEnabled(false) .yAxisGridLineWidth(0.5) // .yAxisGridLineWidth(0.5) .touchEventEnabled(true); } @@ -55,7 +55,7 @@ // .data(new Object[]{3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8}); return configureBasicOptions() .backgroundColor("#EDEFF2") .backgroundColor("#333738") .legendEnabled(false) .markerRadius(0) // .markerSymbol(AAChartSymbolType.Circle) app/src/main/res/drawable/desktop_logo.png
@@ -260,7 +260,7 @@ android:gravity="center" android:text="@string/home_login_logoin" android:textColor="@color/text_66FFFFFF" android:textSize="18sp" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" /> app/src/main/res/layout/dialog_agree_onagree.xml
@@ -12,7 +12,7 @@ android:layout_marginTop="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_48" android:layout_marginBottom="@dimen/dp_20" android:background="@drawable/loading_confirmation_bj" android:background="@drawable/bj_ff333738" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -23,7 +23,7 @@ android:layout_width="0dp" android:layout_height="@dimen/dp_25" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_24" android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_20" android:gravity="center" android:textColor="@color/text_030D1C" @@ -37,7 +37,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_43" android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_34" android:singleLine="false" @@ -55,22 +55,20 @@ android:id="@+id/dialog_confirm_bottom_line_ly" android:layout_width="0dp" android:layout_height="@dimen/dp_52" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content_tv"> <View android:layout_width="@dimen/dp_16" android:layout_height="match_parent" /> <LinearLayout android:id="@+id/dialog_cancel_ly" android:layout_width="@dimen/dp_120" android:layout_width="0dp" android:layout_height="match_parent" android:background="@drawable/fillet_line_00000000"> android:layout_weight="1" android:background="@drawable/bj_ff555859_no"> <TextView android:id="@+id/dialog_cancel_tv" @@ -78,8 +76,8 @@ android:layout_height="match_parent" android:gravity="center" android:text="@string/loading_on_agree" android:textColor="@color/text_FF245EC3" android:textSize="@dimen/text_18" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> @@ -90,19 +88,19 @@ <LinearLayout android:id="@+id/dialog_confirm_ly" android:layout_width="@dimen/dp_120" android:layout_width="0dp" android:layout_height="match_parent" android:background="@drawable/fillet_line_00000000"> android:layout_weight="1" android:background="@drawable/bj_ff555859"> <TextView android:id="@+id/dialog_confirm_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/checked" android:gravity="center" android:text="@string/loading_agree" android:textColor="@color/text_FFFFFFFF" android:textSize="@dimen/text_18" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> </LinearLayout> <!--底部间距--> app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -37,7 +37,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_43" android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_25" android:gravity="center" app/src/main/res/values-en/strings.xml
@@ -15,31 +15,31 @@ <string name="home_login_chinese">简体中文</string> <string name="home_login_hdl_stored_energy">HDL Solar Energy</string> <string name="home_login_an_installer">I am an installer</string> <string name="home_login_input_phone_email">Please enter your mobile number/email address</string> <string name="home_login_input_phone">Please enter your mobile number</string> <string name="home_login_input_phone_email"> Enter your mobile number/email address</string> <string name="home_login_input_phone"> Enter your mobile number</string> <string name="home_login_email_address">Email address</string> <string name="home_login_input_psw">Please enter your password</string> <string name="home_login_input_psw"> Enter your password</string> <string name="home_login_register"> Register</string> <string name="home_login_forget_password">Forgot password</string> <string name="home_login_change_password">Change password</string> <string name="home_login_logoin">Log in</string> <string name="home_login_be_logging_in">Logging in…</string> <string name="home_login_power_station">Demo Sites</string> <string name="home_login_consent_service_agreement">Agree to the 《Service Agreement》 and 《User Information Protection Regulations》</string> <string name="home_login_consent_service_agreement">I agree to the 《Terms of Service》 and 《Privacy Policy》</string> <string name="home_login_error_account_null">Account cannot be empty.</string> <string name="home_login_error_password_null">Password cannot be empty.</string> <string name="home_login_error_password_null"> Cannot be empty.</string> <string name="home_login_error_account_or_password">Incorrect account or password, please re-enter.</string> <string name="home_login_error_6_16_str">Password does not meet minimum security requirements, must be 6-16 characters.</string> <string name="home_login_error_password_6">Password cannot be less than 6 characters.</string> <string name="home_login_error_password_16">Password cannot be more than 16 characters.</string> <string name="home_login_input_6_16">Please enter a 6-16 character password</string> <string name="home_login_confirm_psw">Please confirm your password again</string> <string name="home_login_error_6_16_str"> Does not meet minimum security requirements, must be 6-16 characters.</string> <string name="home_login_error_password_6"> Cannot be less than 6 characters.</string> <string name="home_login_error_password_16"> Cannot be more than 16 characters.</string> <string name="home_login_input_6_16"> Enter a 6-16 character password</string> <string name="home_login_confirm_psw"> Confirm your password again</string> <string name="home_login_phone">Phone number</string> <string name="home_login_email">Email</string> <string name="home_login_input_mail">Please enter your email address</string> <string name="home_login_national_region">Please select country/region</string> <string name="home_login_input_mail"> Enter your email address</string> <string name="home_login_national_region"> Select country/region</string> <string name="home_login_verification_code">Get verification code</string> <string name="home_login_input_verification_code">Please enter verification code</string> <string name="home_login_input_verification_code"> Enter verification code</string> <string name="home_login_confirm_reset">Confirm reset</string> <string name="home_login_null_verification_code">Verification code cannot be empty.</string> <string name="home_login_phone_null">Phone number cannot be empty.</string> @@ -55,10 +55,10 @@ <string name="home_login_new_pws">New password</string> <string name="home_login_affirm_psw">Confirm password</string> <string name="home_login_affirm">Confirm</string> <string name="home_login_least6">Password must be at least 6 characters</string> <string name="home_login_input_old_pws">Please enter your current password</string> <string name="home_login_input_new_pws">Please enter your new password</string> <string name="home_login_input_affirm_psw">Please enter your new password again</string> <string name="home_login_least6"> Must be at least 6 characters</string> <string name="home_login_input_old_pws"> Enter your current password</string> <string name="home_login_input_new_pws"> Enter your new password</string> <string name="home_login_input_affirm_psw"> Enter your new password again</string> <string name="home_login_input_unlike_psw">New password and confirm password are different</string> <string name="home_login_change_name_succeed">successfully updated</string> <string name="verification">Verification code</string> @@ -66,7 +66,7 @@ <string name="home_chinese_mainland">Mainland China</string> <string name="home_password_changed_successfully_log_in">The password has been successfully changed. Please log in again.</string> <string name="home_old_password_not_new_password">The original password and the new password should not be identical.</string> <string name="home_account_registered_successfully">registered successfully.</string> <string name="home_account_registered_successfully">Registered successfully.</string> <!--我的电站--> app/src/main/res/values-zh/strings.xml
@@ -25,7 +25,7 @@ <string name="home_login_logoin">登录</string> <string name="home_login_be_logging_in">登录中…</string> <string name="home_login_power_station">体验电站</string> <string name="home_login_consent_service_agreement">同意《服务协议》和《用户信息保护规定》</string> <string name="home_login_consent_service_agreement">同意《用户协议》和《隐私协议》</string> <string name="home_login_error_account_null">账号不能为空.</string> <string name="home_login_error_password_null">密码不能为空.</string> <string name="home_login_error_account_or_password">账号或者密码不对,请重新输入.</string> @@ -178,7 +178,7 @@ <string name="loading_agree">同意并登录</string> <string name="loading_on_agree">不同意</string> <string name="loading_privacy">隐私权政策及服务条款</string> <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《隐私权政策》和《服务条款》</string> <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《用户协议》和《隐私协议》</string> <string name="kill_app">再按一次退出应用</string> <string name="loading_not_supported">抱歉,暂不支持</string> <string name="loading_title_tip">提示</string> app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@ <string name="home_login_logoin">登录</string> <string name="home_login_be_logging_in">登录中…</string> <string name="home_login_power_station">体验电站</string> <string name="home_login_consent_service_agreement">同意《服务协议》和《用户信息保护规定》</string> <string name="home_login_consent_service_agreement">同意《用户协议》和《隐私协议》</string> <string name="home_login_error_account_null">账号不能为空.</string> <string name="home_login_error_password_null">密码不能为空.</string> <string name="home_login_error_account_or_password">账号或者密码不对,请重新输入.</string> @@ -178,7 +178,7 @@ <string name="loading_agree">同意并登录</string> <string name="loading_on_agree">不同意</string> <string name="loading_privacy">隐私权政策及服务条款</string> <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《隐私权政策》和《服务条款》</string> <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《《用户协议》和《隐私协议》</string> <string name="kill_app">再按一次退出应用</string> <string name="loading_not_supported">抱歉,暂不支持</string> <string name="loading_title_tip">提示</string>
