Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
fb2d983
增加了通知时点亮屏幕的用户设置开关
JohnnySun Nov 19, 2015
ee7b1a8
智能判断当前游戏是否处于前台,如果处于前台,则不进行更新,以免发生掉线问题,如果处于后台,则更新
JohnnySun Nov 19, 2015
2f84760
修复了一个逻辑错误
JohnnySun Nov 20, 2015
7c998e4
Create .travis.yml
JohnnySun Jan 22, 2016
873bba1
Update .travis.yml
JohnnySun Jan 23, 2016
860f9a0
Update .travis.yml
JohnnySun Jan 23, 2016
1c44160
permission access for travis
JohnnySun Jan 23, 2016
2dd8034
Merge branch 'master' of github.com:JohnnySun/ZjsnViewer
JohnnySun Jan 23, 2016
5903bf2
Update .travis.yml
JohnnySun Jan 23, 2016
4238575
Update .travis.yml
JohnnySun Jan 23, 2016
a0d0329
Update .travis.yml
JohnnySun Jan 23, 2016
ec1caa7
Update .travis.yml
JohnnySun Jan 23, 2016
5700a1a
add lintOptions
JohnnySun Jan 23, 2016
e7116cd
Update .travis.yml
JohnnySun Jan 23, 2016
26748d2
Merge branch 'master' of github.com:JohnnySun/ZjsnViewer
JohnnySun Jan 23, 2016
9f4981e
Update .travis.yml
JohnnySun Jan 23, 2016
7c46c29
Add release key
JohnnySun Jan 23, 2016
04d4f21
update: .travis.yml
JohnnySun Jan 23, 2016
6558baf
Merge branch 'master' of github.com:JohnnySun/ZjsnViewer
JohnnySun Jan 23, 2016
48fccd3
update: .travis.yml
JohnnySun Jan 23, 2016
22f6818
Update: update .travis.yml
JohnnySun Jan 23, 2016
acb984a
Update: update .travis.yml
JohnnySun Jan 23, 2016
37ca86d
update
JohnnySun Jan 23, 2016
2507eb2
update build.gradle
JohnnySun Jan 23, 2016
107ba64
add keyfile
JohnnySun Jan 23, 2016
cdadb30
add keyfile
JohnnySun Jan 23, 2016
f18882c
Update README.md
JohnnySun Jan 23, 2016
168194d
Update: Change org.huanmeng.Zhanjian2 to com.huanmeng.zhanjian2
JohnnySun Jan 23, 2016
84cfb01
Update: Fix Notification setContentIntent, open com.huanmeng.jiannian…
JohnnySun Jan 23, 2016
f6269e5
添加[台]埃塞克斯
ElvisSong May 4, 2016
89e00f3
添加[台]埃塞克斯服务器地址
ElvisSong May 4, 2016
4dcd18b
添加[台]埃塞克斯服务器地址
ElvisSong May 4, 2016
49b9adc
Merge pull request #1 from ElvisSong/master
JohnnySun May 4, 2016
112b0a6
Update: Change org.huanmeng.Zhanjian2 to com.huanmeng.zhanjian2
wangqr May 21, 2016
0dbd6f1
Merge pull request #2 from wangqr/master
JohnnySun May 21, 2016
2877808
abandon PACKAGE_USAGE_STATS permission which works quite complex on A…
PaleNeutron May 25, 2016
4c356c5
The service now starts with the application and will restart after ki…
PaleNeutron May 25, 2016
e786677
Edit default font size from 48 to 24
PaleNeutron May 25, 2016
2ebc9a7
fix main widget's game_running_state on API 23
PaleNeutron May 26, 2016
5959712
Change click action of main widget from open the game to update infom…
PaleNeutron May 26, 2016
6a5289c
force refresh main widget
PaleNeutron May 26, 2016
c8e22cb
fix async network problem.
PaleNeutron May 27, 2016
43ce3ba
Merge pull request #3 from PaleNeutron/master
JohnnySun May 28, 2016
3ee9e51
fresh all widget
PaleNeutron May 28, 2016
ae51689
Notification modify & AsyncTask bug fix
PaleNeutron May 30, 2016
2a65c96
Merge remote-tracking branch 'origin/master'
PaleNeutron May 30, 2016
9d558b9
Notification modify & Add vibration checkbox
PaleNeutron May 30, 2016
fd5fcf4
modify server name & add IOS servers of hm
PaleNeutron May 30, 2016
5e092eb
fix ios server
PaleNeutron May 30, 2016
ce1b211
fix ios server
PaleNeutron May 30, 2016
23569fd
fix server addresses
PaleNeutron May 30, 2016
eaa0e04
spelling mistake fix
PaleNeutron Jun 1, 2016
020280d
fix notification vibration, setVibration would not work after setDefa…
PaleNeutron Jun 1, 2016
8ca04a9
Merge pull request #4 from PaleNeutron/master
JohnnySun Jun 1, 2016
2bf34d1
Update .travis.yml
JohnnySun Jun 1, 2016
86600cc
Update .travis.yml
JohnnySun Jun 1, 2016
6ebddc8
1增加了提督信息的页面,可以直接查看名字等级各种时间
traburiss Jun 2, 2016
20310bf
趁着写文档的时间优化了一下界面,看起来好看多了点
traburiss Jun 2, 2016
12ef214
Merge pull request #1 from traburiss/master
PaleNeutron Jun 2, 2016
f9eca86
细节优化
traburiss Jun 2, 2016
7188b76
Add manual refresh to image button of InfoActivity
PaleNeutron Jun 3, 2016
1c606c5
1、页面逻辑改动
traburiss Jun 3, 2016
a1a4656
颜色怎么搞都不好看啊~~
traburiss Jun 3, 2016
6be6e81
颜色怎么搞都不好看啊~~
traburiss Jun 3, 2016
10a99a8
感觉颜色差不多了
traburiss Jun 3, 2016
258463c
不知道怎么把fork的工程的改动同步过来于是手改PaleNeutron的改动了
traburiss Jun 3, 2016
f962638
1、点击头像加载数据加入了loadingdialog以提示
traburiss Jun 3, 2016
79854bd
Merge remote-tracking branch 'upstream/master'
traburiss Jun 3, 2016
da90c23
Merge pull request #2 from traburiss/master
PaleNeutron Jun 4, 2016
4a8682f
hotfix server url
PaleNeutron Jun 4, 2016
0774ba4
Merge pull request #1 from PaleNeutron/master
traburiss Jun 4, 2016
25ac973
timeservice的timer会在每次异步任务执行完毕后检查是否需要重设定时器间隔,用以降低功耗
traburiss Jun 5, 2016
59e4b73
1、将timeservice放到了application里面执行
traburiss Jun 6, 2016
c169d17
Merge pull request #4 from traburiss/master
PaleNeutron Jun 6, 2016
8e58e50
reset DEFAULT_VIBRATE will disable ringtone and light, use DEFAULT_AL…
PaleNeutron Jun 7, 2016
34b1963
make service foreground
PaleNeutron Jun 8, 2016
a0d83fa
Merge pull request #2 from PaleNeutron/master
traburiss Jun 8, 2016
bf55576
1、增加通知常驻的开关
traburiss Jun 10, 2016
f6c30eb
1、区分常驻通知与非常住通知秘书舰title的形式
traburiss Jun 10, 2016
d47f924
1、细节修整
traburiss Jun 10, 2016
f74af02
Merge pull request #5 from traburiss/master
PaleNeutron Jun 10, 2016
34734b5
Merge pull request #5 from PaleNeutron/master
JohnnySun Jun 11, 2016
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
4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: android
jdk: openjdk7
android:
components:
- build-tools-23.0.2
- android-23
- extra-android-support
- extra-google-m2repository
- extra-android-m2repository
- sys-img-armeabi-v7a-android-21
script:
- "./gradlew assembleRelease"
before_deploy:
- mv app/build/outputs/apk/app-release.apk app/build/outputs/apk/Zjsnviewer.apk
deploy:
provider: releases
api_key:
secure: Jmz8pk7OTjM7VMHTYdQxWQz+Tng0NFgIgpW2dPqNRlmwro4cFaKwelt0uckGNJCdTf7oZngtCoP1IFiD6ZqisSRqxp1spd1Xtqv0pxeTKXoY5EQthHl5iM3QLnQtE/Uwbcg387TFhC/lZt34khmFI5Pe9GNPGuf4yYa/MspNcR8AUnoo60p/LHgcQgr9tLViFgE4+1grSFPFnW3JksadFYkGlAxL4Yf6pbEKDKtoGJm34E2MkQFeKiw3g2RJRBjguWzPub8O3gz7q1P/9v6ysBxiwUMWdOsFUoQ7ysVm+CRgwKagIAmdYaU/31lkw+XLU43rAFi3u8hbCbyqC3mzGNdRL8sXKdVMmHJJcSOhynfwKAH8SFX9WHmAbw4xbs68+dI7zdt8vVF4/GZj2uXSD6jrzMOna6IF8jSgYLa7HhNVEqHS1rZA3J3mxob9MWTsoxhDXXhwnmcRhRRuwHIFGvzAH4zyAUt2tbYsI+l8paml5s4KEU3zVRNSNyUWRyzNa8ZEBnlNP+tbdIMzHi2Z9f7zGwFzy4aJrSjFZeFlffYNkdbGZARQqGYpz7x4gL2uVkYbtTkb9p047Q0n//1ApEayERAJ06CNHDMmC9bzpcST1qxfRg+q3PNs5jk9ORw9RmlmuYfAvWHTFocxmzc2wiwvnrXfPvLlJxajwM6jnjU=
file: app/build/outputs/apk/Zjsnviewer.apk
skip_cleanup: true
on:
tags: true
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Travis CI: [![Travis CI](https://travis-ci.org/JohnnySun/ZjsnViewer.svg?branch=master)](https://travis-ci.org/JohnnySun/ZjsnViewer)
原作者貌似不再支持,fork来此工程进行继续开发。
---
# ZjsnViewer
by Tidu no JB

Expand Down
2 changes: 1 addition & 1 deletion ZjsnViewer.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
69 changes: 50 additions & 19 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
Expand All @@ -28,9 +25,10 @@
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
Expand All @@ -50,48 +48,81 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.constraint/constraint-layout/1.0.0-alpha1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton/butterknife/8.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jaredrummler/android-processes/1.0.8/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.0-alpha1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
<orderEntry type="library" exported="" name="butterknife-8.0.1" level="project" />
<orderEntry type="library" exported="" name="android-processes-1.0.8" level="project" />
<orderEntry type="library" exported="" name="butterknife-annotations-8.0.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
<orderEntry type="library" exported="" name="constraint-layout-1.0.0-alpha1" level="project" />
</component>
</module>
41 changes: 35 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,54 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "21.1.2"
buildToolsVersion '23.0.3'

defaultConfig {
applicationId "me.crafter.android.zjsnviewer"
minSdkVersion 16
targetSdkVersion 23
versionCode 26
versionName "2.6 - G"
versionCode 31
versionName "2.8.1"
}
lintOptions {
abortOnError false
}
signingConfigs {
release {
storeFile file("../johnny.moe.jks")
storePassword System.getenv("KEYSTORE_PASS")
keyAlias System.getenv("ALIAS_NAME")
keyPassword System.getenv("ALIAS_PASS")
}
}
buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

}

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

apply plugin: 'com.neenbedankt.android-apt'

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-v4:23.4.0'
compile 'com.jaredrummler:android-processes:1.0.8'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha1'

compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
}
Loading