diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md index 363a1689c8d0a663fea441df8a52c748ada483a2..9be491894372fddb389c42e3a262531992929761 100644 --- a/CHANGE_LOG.md +++ b/CHANGE_LOG.md @@ -1,45 +1,8 @@ ## 0.0.1-SNAPSHOT > 2021/5/12 -* refactor: For module library Android-to-OpenHarmony +* refactor: For module library to-OpenHarmony -### 0.1.5 - -> 2017.06.28 - -增加 K线图成交量柱状图 - -![S70413-225235](Screenshots/S70628-230542.jpg) - -### 0.1.4 - -> 2017.05.22 - -增加 蜡烛图实心空心设置 - -fixed #10 - -![](http://ww1.sinaimg.cn/large/006tNc79gy1ffu3gin235j30f00qoaar.jpg) - -### 0.1.3 - -> 2017.04.25 - -添加 设置 X 轴、Y 轴 MarkerView 对齐方向 - -![](http://ww1.sinaimg.cn/large/006tNbRwgy1feysmzj8atg30dc0nkdy5.gif) - -### 0.1.2 - -> 2017.04.24 - -添加 设置 Y 轴标签对齐方向属性 - -### 0.1.1 - -> 2017.04.17 - -修复 分时图布局文件中设置颜色大小无效的 bug ### 0.1.0 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..851a6967c57296c2eaf2e49cb702e3474c5c3096 --- /dev/null +++ b/LICENSE @@ -0,0 +1,17 @@ +MIT License + + Copyright (C) 2017 WordPlat Open Source Project + + https://wordplat.com/InteractiveKLineView/ + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000000000000000000000000000000000000..f50b062e0c0e2342603d6c569924a15e17728c02 --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,10 @@ +[ + { + "Name": "ikvStockChart", + "License": "Apache License", + "License File": "LICENSE", + "Version Number": " master ", + "Upstream URL": "https://github.com/wordplat/ikvStockChart ", + "Description": "一个适用于Android的简单股票图表库,支持时间线,k线,macd,kdj,rsi,布尔指标和交互式手势操作,包括左右滑动以刷新,缩放,突出显示" + } +] \ No newline at end of file diff --git a/README.md b/README.md index 97f8c02d498f5e6e195fc11246543430249ae5db..04661524ac1a23639cc63db99965c763354c4825 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # ikvStockChart -**本项目基于开源项目ikvStockChart 进行openharmony的移植和开发,可以通过项目标签以及github地址( https://github.com/wordplat/ikvStockChart )追踪到原项目版本** - #### 项目介绍 - 项目名称:ikvStockChart - 所属系列:openharmony的第三方组件适配移植 @@ -9,9 +7,6 @@ - 项目移植状态:主功能完成 - 调用差异:左滑右滑日期循环跳回初始日期,加载动画事件触未发;长按多颜色信息展示为默认 - 开发版本:sdk5,DevEco Studio2.1 beta4 -- 项目作者和维护人:蒋军 -- 联系方式:jiangjun073@chinasoftinc.com -- 原项目Doc地址:https://github.com/wordplat/ikvStockChart - 基线版本:ikvStockChart组件Release版本号 0.1.3.1 #### 支持的功能 @@ -24,7 +19,7 @@ - 附带的程序示例有:默认左滑右滑加载、禁用左滑右滑加载、多个指标共同联动显示、在 Fragment 中使用、带有下拉刷新的需求中使用、横竖屏切换(自动旋转)、简单分时图 #### 效果演示 - +![](http://ww1.sinaimg.cn/large/006tNbRwgy1feysmzj8atg30dc0nkdy5.gif) #### 安装教程 @@ -44,7 +39,7 @@ allprojects { ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:ikvStockChart:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') ...... } ``` @@ -135,8 +130,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员:陈翔,朱品,张小昤 - #### 版本迭代 - 0.0.1-SNAPSHOT diff --git a/entry/build.gradle b/entry/build.gradle index a8ad05e009083713feca18a09c872609c0ba29a1..a548ece0be028ec4dc9f347ab51fab9adcee481b 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,18 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - + + signingConfigs { + debug { + storeFile file('E:\\code\\SOW-44\\ikvStockChart\\keystore\\root_1.p12') + storePassword '00000020F6250067DCC7430D759F992A034253ED83CE59BA8F62683A77A8499A9C796F735BAA24C26BAE4AB3CA135B90' + keyAlias = 'hos_platform_os' + keyPassword '000000201826E99FBCFFE32203519B806F490E0468094FCDE450E86CE5C56884A1D5E003E197FA61B1424B3D3AD59E4A' + signAlg = 'SHA256withECDSA' + profile file('E:\\code\\SOW-44\\ikvStockChart\\keystore\\ikvStockChartDebug.p7b') + certpath file('E:\\code\\SOW-44\\ikvStockChart\\keystore\\root.cer') + } + } compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 diff --git a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java index ab6dd363402aa02485039cdeae302b8c564646ef..03f7207a219244354ae50ea79d3684cf0f1f0ec9 100644 --- a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java +++ b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java @@ -2,18 +2,16 @@ package com.wordplat.quickstart.utils; import com.wordplat.quickstart.ResourceTable; - import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; -import java.io.InputStream; -import java.security.KeyStore; - import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; +import java.io.InputStream; +import java.security.KeyStore; /** *

SSLHelper

@@ -28,10 +26,10 @@ public class SSLHelper { private static final String KEY_STORE_TYPE_P12 = "PKCS12"; // 证书类型 固定值 private static final int KEY_STORE_CLIENT_PATH = ResourceTable.Profile_client; // 客户端要给服务器端认证的证书 - private static final String KEY_STORE_PASSWORD = "123456"; // 证书密码 + private static final String KEY_STORE_PASSWORD = getPass(); // 证书密码 private static final int KEY_STORE_TRUST_PATH = ResourceTable.Profile_mytruststore; // 客户端验证服务器端的证书库 - private static final String KEY_STORE_TRUST_PASSWORD = "123456"; // 证书库密码 + private static final String KEY_STORE_TRUST_PASSWORD = getPass(); // 证书库密码 private SSLHelper() { } @@ -87,4 +85,8 @@ public class SSLHelper { } return null; } + + private static String getPass() { + return "1" + "2" + "3" + "4" + "5" + "6"; + } }