Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# OSX
#
.DS_Store

# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
project.xcworkspace

ios/Pods/
ios/project.xcworkspace
ios/build
Pods/
Podfile.lock
ios/Podfile.lock

# Android/IntelliJ
#
build/
.idea
.gradle
.settings
android/build/
android/.idea
android/.gradle
android/local.properties
*.iml
.idea

# node.js
#
node_modules/
npm-debug.log
yarn-error.log
yarn.lock

# BUCK
buck-out/
\.buckd/
*.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots

# Bundle artifact
*.jsbundle
package-lock.json
./package-lock.json

.vscode/
6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ android {
applicationVariants.all { variant ->
if (variant.buildType.name.contains('release')) {
variant.outputs.each { output ->
def relativeRootDir = output.packageApplication.outputDirectory.toPath()
.relativize(rootDir.toPath()).toFile()
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
def fileName = "ikvStockChart-" + defaultConfig.versionName + "-release.apk"
output.outputFile = new File(outputFile.parent, fileName)
output.outputFileName = new File("$relativeRootDir/release", fileName)
}
}
}
Expand Down Expand Up @@ -67,7 +69,7 @@ dependencies {
// 设置状态栏颜色
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
// multidex
compile 'com.android.support:multidex:1.0.1'
compile 'com.android.support:multidex:1.0.3'
// 下拉刷新, 支持ScrollView、RecyclerView
compile 'com.chanven.lib:cptr:1.1.0'

Expand Down
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<!-- ################################# 其它设定 ######################################### -->

<!-- 与服务器接口通信的版本号,勿在这里手工修改此值,在编译时本值会自动由gradle设置上 -->
<meta-data
android:name="server_http_url_version"
android:value="${SERVER_HTTP_URL_VERSION}" />


<application
android:name=".app.App"
android:icon="@mipmap/ic_launcher"
Expand Down Expand Up @@ -60,13 +68,5 @@
android:name=".activity.Simple_TimeLine_Example_Activity"
android:screenOrientation="portrait" />

<!-- ################################# 其它设定 ######################################### -->

<!-- 与服务器接口通信的版本号,勿在这里手工修改此值,在编译时本值会自动由gradle设置上 -->
<meta-entryData
android:name="server_http_url_version"
android:value="${SERVER_HTTP_URL_VERSION}" />

</application>

</manifest>
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:3.3.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
maven { url "https://jitpack.io" }
mavenCentral()
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip