Skip to content

Commit

Permalink
移除app-loader
Browse files Browse the repository at this point in the history
去掉资源更新功能,修改部分样式。
  • Loading branch information
jasonz1987 committed Jul 20, 2017
1 parent e5c546a commit 950911e
Show file tree
Hide file tree
Showing 202 changed files with 2,919 additions and 347,114 deletions.
6 changes: 6 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"devel": true,
"strict": false, // true: Requires all functions run in ES5 Strict Mode
"predef": ["angular","ionic","navigator","window"],
"-W041": false
}
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="3010" id="me.growu.drip" version="0.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-versionCode="3020" id="me.growu.drip" version="0.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>水滴打卡</name>
<description>
水滴打卡 - 一个目标管理和习惯养成的工具
Expand Down
22 changes: 11 additions & 11 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ gulp.task('build', function(){
'build-lib-js',
'build-index',
'build-fonts',
'build-img',
'build-manifest'
'build-img'
// 'build-manifest'
);
});

Expand All @@ -69,7 +69,7 @@ gulp.task('clean', function () {
// 生成通用库
gulp.task('build-comm-lib',function(){
var copyBower = gulp.src([
'./bower_components/ionic/release/js/ionic.bundle.js',
'./bower_components/ionic/release/js/ionic.bundle.min.js',
'./bower_components/ionic/release/fonts/**.*',
'./bower_components/moment/min/moment.min.js',
'./bower_components/moment/locale/zh-cn.js',
Expand Down Expand Up @@ -109,9 +109,9 @@ gulp.task('build-comm-lib',function(){
// 生成app的lib库
gulp.task('build-app-lib',function(){
var copyCordova = gulp.src([
'./bower_components/ngCordova/dist/ng-cordova.min.js',
'./bower_components/cordova-app-loader/dist/CordovaAppLoader.js',
'./bower_components/cordova-app-loader/dist/CordovaPromiseFS.js'
'./bower_components/ngCordova/dist/ng-cordova.min.js'
// './bower_components/cordova-app-loader/dist/CordovaAppLoader.js',
// './bower_components/cordova-app-loader/dist/CordovaPromiseFS.js'
], {base: './bower_components/'})
.pipe(gulp.dest('./tmp/lib'));

Expand Down Expand Up @@ -183,7 +183,7 @@ gulp.task('build-lib-css',function(){
gulp.task('build-lib-js',function(){
return gulp.src([
"./tmp/lib/jquery-1.9.1.min.js",
"./tmp/lib/ionic/release/js/ionic.bundle.js",
"./tmp/lib/ionic/release/js/ionic.bundle.min.js",
"./tmp/lib/moment/min/moment.min.js",
"./tmp/lib/moment/local/zh-cn.js",
"./tmp/lib/angular-moment/angular-moment.min.js",
Expand All @@ -196,14 +196,14 @@ gulp.task('build-lib-js',function(){

// 生成index.html
gulp.task('build-index',function(){
var injectIndex = gulp.src('./www_src/index.html')
return gulp.src('./www_src/index.html')
.pipe(inject(gulp.src(['./www/js/vendor.min.js','./www/js/app.min.js','./www/css/vendor.min.css','./www/css/app.min.css']),{ignorePath:'www',addRootSlash: false}))
.pipe(gulp.dest('./www'));

var copyManifest = gulp.src('./www_src/index.manifest')
.pipe(gulp.dest('./www'));
// var copyManifest = gulp.src('./www_src/index.manifest')
// .pipe(gulp.dest('./www'));

return merge(injectIndex,copyManifest);
// return merge(injectIndex,copyManifest);

});

Expand Down
2 changes: 1 addition & 1 deletion platforms/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="3010" android:versionName="0.3.1" package="me.growu.drip" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="3020" android:versionName="0.3.2" package="me.growu.drip" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
Expand Down
1 change: 1 addition & 0 deletions platforms/android/CordovaLib/CordovaLib.iml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<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/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#Wed Jul 12 10:24:45 CST 2017
#Thu Jul 20 17:21:54 CST 2017
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#Mon Jul 10 16:00:08 CST 2017
#Thu Jul 20 17:25:46 CST 2017
Binary file not shown.
2 changes: 2 additions & 0 deletions platforms/android/CordovaLib/build/tmp/sourcesJar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

158 changes: 0 additions & 158 deletions platforms/android/assets/www/bootstrap.js

This file was deleted.

Loading

0 comments on commit 950911e

Please sign in to comment.