Ben 8 년 전
부모
커밋
ca04d74b1f

BIN
.vs/miaomiao/v14/.suo


BIN
miaomiao/bin/Android/Debug/android-debug-unaligned.apk


BIN
miaomiao/bin/Android/Debug/android-debug.apk


+ 76 - 76
miaomiao/config.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.ionictabs121641" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
 <widget id="com.ionicframework.ionictabs121641" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>喵喵</name>
   <name>喵喵</name>
   <description>
   <description>
@@ -7,85 +7,85 @@
   <author email="you@example.com" href="http://example.com.com/">
   <author email="you@example.com" href="http://example.com.com/">
       Your Name Here
       Your Name Here
     </author>
     </author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="android-minSdkVersion" value="16"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="KeepRunning" value="True"/>
-  <preference name="ShowTitle" value="True"/>
-  <preference name="InAppBrowserStorageEnabled" value="True"/>
-  <preference name="SuppressesIncrementalRendering" value="True"/>
-  <preference name="windows-target-version" value="10.0"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
+  <content src="index.html" />
+  <access origin="*" />
+  <preference name="webviewbounce" value="false" />
+  <preference name="UIWebViewBounce" value="false" />
+  <preference name="DisallowOverscroll" value="true" />
+  <preference name="android-minSdkVersion" value="16" />
+  <preference name="BackupWebStorage" value="none" />
+  <preference name="KeepRunning" value="True" />
+  <preference name="ShowTitle" value="True" />
+  <preference name="InAppBrowserStorageEnabled" value="True" />
+  <preference name="SuppressesIncrementalRendering" value="True" />
+  <preference name="windows-target-version" value="10.0" />
+  <preference name="SplashScreen" value="screen" />
+  <preference name="SplashScreenDelay" value="3000" />
   <feature name="StatusBar">
   <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar"/>
+    <param name="ios-package" onload="true" value="CDVStatusBar" />
   </feature>
   </feature>
   <platform name="ios">
   <platform name="ios">
-    <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
-    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
-    <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
-    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
-    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
-    <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
-    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
-    <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
-    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
-    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
-    <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
-    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
-    <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
-    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
-    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167"/>
-    <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
-    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
-    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
-    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
-    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
-    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
-    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
-    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
-    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732"/>
-    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
-    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
-    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048"/>
-    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
-    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
-    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
+    <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
+    <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
+    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
+    <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
+    <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
+    <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
+    <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
+    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
+    <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
+    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
+    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
+    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
+    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
+    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
   </platform>
   </platform>
   <platform name="android">
   <platform name="android">
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
+    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi" />
+    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi" />
+    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi" />
+    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi" />
+    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi" />
+    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi" />
+    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi" />
+    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi" />
+    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi" />
+    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi" />
+    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi" />
+    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi" />
+    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi" />
+    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi" />
+    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi" />
+    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi" />
+    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi" />
+    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi" />
   </platform>
   </platform>
-  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
-  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.1"/>
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
-  <plugin name="cordova-plugin-file-transfer" version="1.6.2"/>
-  <plugin name="cordova-plugin-file" version="4.3.2"/>
-  <plugin name="cordova-plugin-camera" version="2.4.0"/>
-  <plugin name="cordova-plugin-actionsheet" version="2.3.3"/>
-  <plugin name="cordova-plugin-media-capture" version="1.4.3"/>
-  <plugin name="cordova-plugin-compat" version="1.1.0"/>
-  <plugin name="cordova-plugin-splashscreen" version="4.0.3"/>
+  <plugin name="cordova-plugin-device" spec="~1.1.1" />
+  <plugin name="cordova-plugin-console" spec="~1.0.2" />
+  <plugin name="cordova-plugin-whitelist" spec="~1.2.1" />
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
+  <plugin name="cordova-plugin-file-transfer" version="1.6.2" />
+  <plugin name="cordova-plugin-file" version="4.3.2" />
+  <plugin name="cordova-plugin-camera" version="2.4.0" />
+  <plugin name="cordova-plugin-actionsheet" version="2.3.3" />
+  <plugin name="cordova-plugin-media-capture" version="1.4.3" />
+  <plugin name="cordova-plugin-compat" version="1.1.0" />
+  <plugin name="cordova-plugin-splashscreen" version="4.0.3" />
 </widget>
 </widget>

+ 68 - 1
miaomiao/platforms/android/build/intermediates/assets/debug/www/css/style.css

@@ -457,4 +457,71 @@ padding-right:3px;
             position:relative;
             position:relative;
             top:-4px;
             top:-4px;
         }
         }
- 
+ @-webkit-keyframes slideInBothWays {
+  0% {
+    -webkit-transform: translate3d(-100%,0,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(50%,0,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.slide-in-both-ways {
+   -webkit-animation: slideInBothWays ease-in 1; 
+  animation: slideInBothWays ease-in 1;
+  -webkit-animation-fill-mode: forwards;
+  animation-fill-mode: forwards;
+  -webkit-animation-duration: 750ms;
+  animation-duration: 750ms;
+}
+
+ 
+.list-grow-animation {
+  -webkit-animation: listGrow ease-in 1; 
+  animation: listGrow ease-in 1;
+  -webkit-animation-duration: 400ms;
+  animation-duration: 400ms;
+}
+@-webkit-keyframes listGrow {
+  0% {
+    -webkit-transform: scale3d(1, 0, 1);
+  }
+ 
+  100% {
+    -webkit-transform: scale3d(1, 1, 0);
+  }
+}
+
+@-webkit-keyframes bounce {
+  0% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  25% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  75% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.bounce-animation {
+  -webkit-animation: bounce ease-in 1; 
+  animation: bounce ease-in 1;
+  -webkit-animation-duration: 1000ms;
+  animation-duration: 1000ms;
+}

+ 34 - 12
miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/home.js

@@ -60,8 +60,8 @@
           
           
             //});
             //});
         }]);
         }]);
-    app.controller('dreamDetailCtrl', ["$scope", "$state", "msg","common","config", "homeService", "$ionicTabsDelegate","$stateParams","$ionicModal","$timeout"
-        , function ($scope, $state, msg,common, config, homeService, $ionicTabsDelegate,$stateParams,$ionicModal,$itemout) {
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout","$ionicScrollDelegate"
+        , function ($scope, $state, msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $itemout, $ionicScrollDelegate) {
             var id = $stateParams.id;
             var id = $stateParams.id;
             id=6;
             id=6;
             $scope.load = function (id) {
             $scope.load = function (id) {
@@ -77,6 +77,14 @@
             $scope.tosupport = false;
             $scope.tosupport = false;
             $scope.support = function ($event) {
             $scope.support = function ($event) {
                 $event.stopPropagation();
                 $event.stopPropagation();
+                //测试动画切换
+                $scope.sort.first = 'img/demo/head7.jpg';
+                $scope.sort.second = 'img/demo/head6.jpg';
+                $scope.sort.third = 'img/demo/head5.jpg';
+                $scope.sort.slide1 = 'list-grow-animation';
+                $scope.sort.slide2 = 'slide-in-both-ways';
+                $scope.sort.slide3 = 'bounce-animation';
+                return;
                 $scope.tosupport = true;
                 $scope.tosupport = true;
                 $scope.vm.coin = 0;
                 $scope.vm.coin = 0;
                 $scope.index = 0;
                 $scope.index = 0;
@@ -85,6 +93,7 @@
                 $scope.tosupport = false;
                 $scope.tosupport = false;
             }
             }
             $scope.changetype = function (type) {
             $scope.changetype = function (type) {
+                $ionicScrollDelegate.scrollTop(true);
                 $scope.type = type;
                 $scope.type = type;
             }
             }
             $scope.index = 0;
             $scope.index = 0;
@@ -104,7 +113,15 @@
                 $scope.index = index;
                 $scope.index = index;
                 $scope.vm.coin = index*5;
                 $scope.vm.coin = index*5;
             }
             }
-            $scope.supportDream = function(data){
+            //实时排行
+            $scope.sort = {
+                first: 'img/demo/head5.jpg',
+                second: 'img/demo/head6.jpg',
+                third: 'img/demo/head7.jpg',
+                slide: ''
+            }
+            $scope.supportDream = function (data) {
+                
                 if(!$scope.vm.coin){
                 if(!$scope.vm.coin){
                     msg.error("请选择梦想币数量!");
                     msg.error("请选择梦想币数量!");
                     return ;
                     return ;
@@ -113,6 +130,7 @@
                     id:id,
                     id:id,
                     coin:$scope.vm.coin
                     coin:$scope.vm.coin
                 };
                 };
+
                 homeService.supportDream(data).then(function(result){
                 homeService.supportDream(data).then(function(result){
                     $scope.tosupport = false;
                     $scope.tosupport = false;
                     number = result.data.data;
                     number = result.data.data;
@@ -132,18 +150,22 @@
                     "display" : "none"
                     "display" : "none"
                 }
                 }
             }
             }
-
-        $scope.placeholder="评论";
-        $scope.replay = function($event){
-            // $event.stopPropagation();
-            $scope.placeholder="回复百川";
-            $scope.addReplay=true;
+            $scope.input = {
+                placeholder: '评论',
+                focus:false
+            }
+         
+            $scope.replay = function ($event, name) {
+                $scope.input.focus = true;
+            //$event.stopPropagation();
+            $scope.input.placeholder = "回复" + name;
+            
             $scope.vm.comment='';
             $scope.vm.comment='';
         }
         }
         $scope.comment = function(){
         $scope.comment = function(){
-            $event.stopPropagation();
-            $scope.placeholder="评论"; 
-            $scope.addReplay=true; 
+          //  $event.stopPropagation();
+            $scope.input.placeholder = "评论";
+            $scope.input.focus = true;
             $scope.vm.comment='';
             $scope.vm.comment='';
         }
         }
         $scope.addpict = function () {
         $scope.addpict = function () {

+ 9 - 18
miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/my.js

@@ -2,7 +2,7 @@
     app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg"
     app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg"
         , function ($scope, $state, $http, storage, myService, common, config, msg) {
         , function ($scope, $state, $http, storage, myService, common, config, msg) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
-            myService.myIndex().then(function(result){
+            myService.myInfo().then(function(result){
               console.log(result.data.data);
               console.log(result.data.data);
               $scope.user = result.data.data
               $scope.user = result.data.data
             });
             });
@@ -22,30 +22,18 @@
             $state.go('app.my_profile');
             $state.go('app.my_profile');
         };
         };
 
 
-            //我的设置
-        $scope.setting = function(){
-            myService.setting().then(function(result){
-            });
-        };
- 
-            //修改个人信息
-            $scope.myMaterial = function(){
-                myService.myMaterial().then(function(result){
-                })
-            }
+       
+  
         }]);
         }]);
 
 
     app.controller('profileCtrl', ["$scope", "$state","$filter", "storage", "myService", "msg", "common"
     app.controller('profileCtrl', ["$scope", "$state","$filter", "storage", "myService", "msg", "common"
       , function ($scope, $state, $filter, storage, myService, msg, common) {
       , function ($scope, $state, $filter, storage, myService, msg, common) {
             $scope.setAvator = function () {
             $scope.setAvator = function () {
                 common.setAvator().then(function (result) {
                 common.setAvator().then(function (result) {
-                    debugger;
                     var response = JSON.parse(result.response);
                     var response = JSON.parse(result.response);
                     $timeout(function () {
                     $timeout(function () {
                         $scope.vm.user.avatar = response.data.md5;
                         $scope.vm.user.avatar = response.data.md5;
                     });
                     });
-                }, function (error) {
-                    msg.error(JSON.stringify(error));
                 });
                 });
             };
             };
           
           
@@ -60,7 +48,7 @@
             };
             };
             $scope.$on('$ionicView.beforeEnter', function () {
             $scope.$on('$ionicView.beforeEnter', function () {
                 msg.loading();
                 msg.loading();
-                myService.myIndex().then(function(result){
+                myService.myInfo().then(function(result){
                   // alert(JSON.stringify(result.data.data));
                   // alert(JSON.stringify(result.data.data));
                   $scope.vm = result.data.data;
                   $scope.vm = result.data.data;
                   $scope.vm.sex = $scope.vm.sex+'';
                   $scope.vm.sex = $scope.vm.sex+'';
@@ -72,7 +60,7 @@
                   msg.hide();
                   msg.hide();
                 },function(error){
                 },function(error){
                   msg.hide();
                   msg.hide();
-                  msg.error(error.data.message);
+                  // msg.error(error.data.message);
                 })
                 })
             });
             });
  
  
@@ -117,7 +105,10 @@
     app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
     app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
   , function ($scope, $state, myService, msg) {
   , function ($scope, $state, myService, msg) {
        $scope.$on('$ionicView.beforeEnter', function () {
        $scope.$on('$ionicView.beforeEnter', function () {
-
+           myService.myInfo().then(function(result){
+                // alert(JSON.stringify(result.data.data));
+                $scope.vm = result.data.data;
+              })
             $scope.vm = {
             $scope.vm = {
                 money:"",
                 money:"",
             }
             }

+ 11 - 4
miaomiao/platforms/android/build/intermediates/assets/debug/www/js/directives/directive.js

@@ -1,13 +1,20 @@
 (function (module) {
 (function (module) {
     module.directive('focusMe', function ($timeout) {
     module.directive('focusMe', function ($timeout) {
         return {
         return {
-            link: function (scope, element, attrs) {
-                $timeout(function () {
-                    element[0].focus();
-                }, 150);
+            scope: { trigger: '=focusMe' },
+            link: function (scope, element) {
+                scope.$watch('trigger', function (value) {
+                    if (value === true) {
+                        $timeout(function() {
+                        element[0].focus();
+                        scope.trigger = false;
+                        });
+                    }
+                });
             }
             }
         };
         };
     });
     });
+    
     module.filter("trustUrl", ['$sce', function ($sce) {
     module.filter("trustUrl", ['$sce', function ($sce) {
         return function (recordingUrl) {
         return function (recordingUrl) {
             return $sce.trustAsResourceUrl(recordingUrl);
             return $sce.trustAsResourceUrl(recordingUrl);

+ 0 - 1
miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/commonservice.js

@@ -67,7 +67,6 @@
                         case 1: //拍摄视频
                         case 1: //拍摄视频
                             var options1 = { limit: 1, duration:20};
                             var options1 = { limit: 1, duration:20};
                             navigator.device.capture.captureVideo(function (videos) {
                             navigator.device.capture.captureVideo(function (videos) {
-                                debugger;
                                 if (videos[0]) {
                                 if (videos[0]) {
                                     deferred.resolve(videos[0].fullPath);
                                     deferred.resolve(videos[0].fullPath);
                                 } else {
                                 } else {

+ 2 - 2
miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/myservice.js

@@ -64,9 +64,9 @@
                     method:"get"
                     method:"get"
                 })
                 })
             },
             },
-            myIndex:function(){
+            myInfo:function(){
               return $http({
               return $http({
-                  url:config.server + "api/my/index",
+                  url:config.server + "api/my/show",
                   method:"get"
                   method:"get"
               })
               })
             },
             },

+ 2 - 0
miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/home/index.html

@@ -8,6 +8,7 @@
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
     </ion-nav-buttons>
     </ion-nav-buttons>
     <ion-content>
     <ion-content>
+        
         <!--下拉刷新-->
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
         </ion-refresher>
@@ -25,6 +26,7 @@
             </div>
             </div>
         </div>
         </div>
         <div class="icontent">
         <div class="icontent">
+            <a ui-sref="app.my_dreamdetail">ttest</a>
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
                 <ion-slide-page ng-repeat="banner in index.banners">
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>  
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>  

+ 1 - 1
miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/my/my-recharge.html

@@ -8,7 +8,7 @@
         <div class="list">
         <div class="list">
             <div class="item" style="padding:20px">
             <div class="item" style="padding:20px">
                 <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
                 <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
-                <div class="re-num">50000</div>
+                <div class="re-num">{{vm.coin}}</div>
             </div>
             </div>
             <div class="item item-input">
             <div class="item item-input">
                 <span class="input-label">金额</span>
                 <span class="input-label">金额</span>

BIN
miaomiao/platforms/android/build/intermediates/res/resources-debug.ap_


BIN
miaomiao/platforms/android/build/outputs/apk/android-debug-unaligned.apk


+ 68 - 1
miaomiao/www/css/style.css

@@ -457,4 +457,71 @@ padding-right:3px;
             position:relative;
             position:relative;
             top:-4px;
             top:-4px;
         }
         }
- 
+ @-webkit-keyframes slideInBothWays {
+  0% {
+    -webkit-transform: translate3d(-100%,0,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(50%,0,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.slide-in-both-ways {
+   -webkit-animation: slideInBothWays ease-in 1; 
+  animation: slideInBothWays ease-in 1;
+  -webkit-animation-fill-mode: forwards;
+  animation-fill-mode: forwards;
+  -webkit-animation-duration: 750ms;
+  animation-duration: 750ms;
+}
+
+ 
+.list-grow-animation {
+  -webkit-animation: listGrow ease-in 1; 
+  animation: listGrow ease-in 1;
+  -webkit-animation-duration: 400ms;
+  animation-duration: 400ms;
+}
+@-webkit-keyframes listGrow {
+  0% {
+    -webkit-transform: scale3d(1, 0, 1);
+  }
+ 
+  100% {
+    -webkit-transform: scale3d(1, 1, 0);
+  }
+}
+
+@-webkit-keyframes bounce {
+  0% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  25% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  75% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.bounce-animation {
+  -webkit-animation: bounce ease-in 1; 
+  animation: bounce ease-in 1;
+  -webkit-animation-duration: 1000ms;
+  animation-duration: 1000ms;
+}

+ 30 - 9
miaomiao/www/js/controllers/home.js

@@ -77,6 +77,14 @@
             $scope.tosupport = false;
             $scope.tosupport = false;
             $scope.support = function ($event) {
             $scope.support = function ($event) {
                 $event.stopPropagation();
                 $event.stopPropagation();
+                //测试动画切换
+                $scope.sort.first = 'img/demo/head7.jpg';
+                $scope.sort.second = 'img/demo/head6.jpg';
+                $scope.sort.third = 'img/demo/head5.jpg';
+                $scope.sort.slide1 = 'list-grow-animation';
+                $scope.sort.slide2 = 'slide-in-both-ways';
+                $scope.sort.slide3 = 'bounce-animation';
+                return;
                 $scope.tosupport = true;
                 $scope.tosupport = true;
                 $scope.vm.coin = 0;
                 $scope.vm.coin = 0;
                 $scope.index = 0;
                 $scope.index = 0;
@@ -105,7 +113,15 @@
                 $scope.index = index;
                 $scope.index = index;
                 $scope.vm.coin = index*5;
                 $scope.vm.coin = index*5;
             }
             }
-            $scope.supportDream = function(data){
+            //实时排行
+            $scope.sort = {
+                first: 'img/demo/head5.jpg',
+                second: 'img/demo/head6.jpg',
+                third: 'img/demo/head7.jpg',
+                slide: ''
+            }
+            $scope.supportDream = function (data) {
+                
                 if(!$scope.vm.coin){
                 if(!$scope.vm.coin){
                     msg.error("请选择梦想币数量!");
                     msg.error("请选择梦想币数量!");
                     return ;
                     return ;
@@ -114,6 +130,7 @@
                     id:id,
                     id:id,
                     coin:$scope.vm.coin
                     coin:$scope.vm.coin
                 };
                 };
+
                 homeService.supportDream(data).then(function(result){
                 homeService.supportDream(data).then(function(result){
                     $scope.tosupport = false;
                     $scope.tosupport = false;
                     number = result.data.data;
                     number = result.data.data;
@@ -133,18 +150,22 @@
                     "display" : "none"
                     "display" : "none"
                 }
                 }
             }
             }
-
-        $scope.placeholder="评论";
-        $scope.replay = function($event,name){
-            // $event.stopPropagation();
-            $scope.placeholder = "回复" + name;
-            $scope.addReplay=true;
+            $scope.input = {
+                placeholder: '评论',
+                focus:false
+            }
+         
+            $scope.replay = function ($event, name) {
+                $scope.input.focus = true;
+            //$event.stopPropagation();
+            $scope.input.placeholder = "回复" + name;
+            
             $scope.vm.comment='';
             $scope.vm.comment='';
         }
         }
         $scope.comment = function(){
         $scope.comment = function(){
           //  $event.stopPropagation();
           //  $event.stopPropagation();
-            $scope.placeholder="评论"; 
-            $scope.addReplay=true; 
+            $scope.input.placeholder = "评论";
+            $scope.input.focus = true;
             $scope.vm.comment='';
             $scope.vm.comment='';
         }
         }
         $scope.addpict = function () {
         $scope.addpict = function () {

+ 11 - 4
miaomiao/www/js/directives/directive.js

@@ -1,13 +1,20 @@
 (function (module) {
 (function (module) {
     module.directive('focusMe', function ($timeout) {
     module.directive('focusMe', function ($timeout) {
         return {
         return {
-            link: function (scope, element, attrs) {
-                $timeout(function () {
-                    element[0].focus();
-                }, 150);
+            scope: { trigger: '=focusMe' },
+            link: function (scope, element) {
+                scope.$watch('trigger', function (value) {
+                    if (value === true) {
+                        $timeout(function() {
+                        element[0].focus();
+                        scope.trigger = false;
+                        });
+                    }
+                });
             }
             }
         };
         };
     });
     });
+    
     module.filter("trustUrl", ['$sce', function ($sce) {
     module.filter("trustUrl", ['$sce', function ($sce) {
         return function (recordingUrl) {
         return function (recordingUrl) {
             return $sce.trustAsResourceUrl(recordingUrl);
             return $sce.trustAsResourceUrl(recordingUrl);

+ 22 - 21
miaomiao/www/templates/home/dream-detail.html

@@ -4,6 +4,7 @@
         <!-- <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button> -->
         <!-- <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button> -->
     </ion-nav-buttons>
     </ion-nav-buttons>
     <ion-content style="background-color:#F3F3F3" ng-click="cancelsupport()">
     <ion-content style="background-color:#F3F3F3" ng-click="cancelsupport()">
+     
         <div class="tabs-striped tabs-top">
         <div class="tabs-striped tabs-top">
             <div class="tabs" style="top:0">
             <div class="tabs" style="top:0">
                 <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changetype(1)">
                 <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changetype(1)">
@@ -67,13 +68,13 @@
                         <div class="col" style="text-align:right">
                         <div class="col" style="text-align:right">
                             <h2>5000</h2>
                             <h2>5000</h2>
                             <p>我要求的梦想币</p>
                             <p>我要求的梦想币</p>
-                        </div>
+                        </div>                    
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="item row detail-head">
-                    <div class="col"><img ng-src="img/demo/head7.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head6.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head5.jpg" /></div>
+                <div class="item row detail-head "  >
+                    <div class="col"><img ng-src="{{sort.second}}"  ng-class="sort.slide2" /></div>
+                    <div class="col"><img ng-src="{{sort.first}}" ng-class="sort.slide1" /></div>
+                    <div class="col"><img ng-src="{{sort.third}}"  ng-class="sort.slide3"/></div>
                 </div>
                 </div>
                 <div class="item">
                 <div class="item">
                     <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×2.8</button>
                     <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×2.8</button>
@@ -98,34 +99,34 @@
                         <span class="utitle kz">剩余5天</span>
                         <span class="utitle kz">剩余5天</span>
                         <p class="subtile" style="white-space:normal">在斯德哥尔摩,那个只有黑白和灰色的咖啡馆里面坐下,喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
                         <p class="subtile" style="white-space:normal">在斯德哥尔摩,那个只有黑白和灰色的咖啡馆里面坐下,喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
                         <div class="picts">
                         <div class="picts">
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="list" style="margin-top:-22px;" ng-click="showForm=true; focusInput=true">
                 <div class="list" style="margin-top:-22px;" ng-click="showForm=true; focusInput=true">
-                    <div class="item subitem">
+                    <div class="item subitem" ng-click="replay($event,'百川1')">
                         <img ng-src="img/demo/head4.jpg" />
                         <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
+                        <span>百川1</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <div>你确定是去哪里了吗?你确定是去哪里了吗?</div>
                         <div>你确定是去哪里了吗?你确定是去哪里了吗?</div>
                     </div>
                     </div>
-                    <div class="item subitem" ng-click="replay($event)">
+                    <div class="item subitem" ng-click="replay($event,'百川2')">
                         <img ng-src="img/demo/head4.jpg" />
                         <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
+                        <span>百川2</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <div>你确定是去哪里了吗?你确定是去哪里了吗?</div>
                         <div>你确定是去哪里了吗?你确定是去哪里了吗?</div>
                     </div>
                     </div>
-                     <label class="item item-input">
-                         <input name="comment" type="text" placeholder="{{placeholder}}" ng-model="vm.comment" ng-init="addReplay=false" style="padding: 0 20px;">
-                     </label>
+                     <div class="item item-input">
+                         <input name="comment" type="text" focus-me="input.focus"   placeholder="{{input.placeholder}}" ng-model="vm.comment"  style="padding: 0 20px;">
+                     </div>
  
  
                 </div>
                 </div>
             </div>
             </div>

+ 2 - 0
miaomiao/www/templates/home/index.html

@@ -8,6 +8,7 @@
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
     </ion-nav-buttons>
     </ion-nav-buttons>
     <ion-content>
     <ion-content>
+        
         <!--下拉刷新-->
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
         </ion-refresher>
@@ -25,6 +26,7 @@
             </div>
             </div>
         </div>
         </div>
         <div class="icontent">
         <div class="icontent">
+            <a ui-sref="app.my_dreamdetail">ttest</a>
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
                 <ion-slide-page ng-repeat="banner in index.banners">
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>  
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>