HF_Q 4 years ago
parent
commit
14add530fe
100 changed files with 1253 additions and 64 deletions
  1. 500 6
      smartRhino.xcodeproj/project.pbxproj
  2. BIN
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate
  3. 1 53
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 3 0
      smartRhino/AppDelegate.m
  5. 0 1
      smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/Contents.json
  6. BIN
      smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon.png
  7. BIN
      smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon@2x.png
  8. BIN
      smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon@3x.png
  9. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Book_Music_select@2x.png
  10. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Book_Music_select@3x.png
  11. 22 0
      smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Contents.json
  12. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Book_Music_select_gray@2x.png
  13. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Book_Music_select_gray@3x.png
  14. 22 0
      smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Contents.json
  15. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Book_Music_unSelect@2x.png
  16. BIN
      smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Book_Music_unSelect@3x.png
  17. 22 0
      smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Contents.json
  18. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Book_Read_A@2x.png
  19. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Book_Read_A@3x.png
  20. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Contents.json
  21. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Book_Read_Amax@2x.png
  22. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Book_Read_Amax@3x.png
  23. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Contents.json
  24. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Book_Read_Amin@2x.png
  25. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Book_Read_Amin@3x.png
  26. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Contents.json
  27. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Book_Read_BottomSearch@2x.png
  28. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Book_Read_BottomSearch@3x.png
  29. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Contents.json
  30. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Book_Read_CloseBtn@2x.png
  31. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Book_Read_CloseBtn@3x.png
  32. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Contents.json
  33. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Book_Read_Collect@2x.png
  34. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Book_Read_Collect@3x.png
  35. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Contents.json
  36. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Book_Read_FontJian@2x.png
  37. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Book_Read_FontJian@3x.png
  38. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Contents.json
  39. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Book_Read_Listsearch@2x.png
  40. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Book_Read_Listsearch@3x.png
  41. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Contents.json
  42. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Book_Read_Menu@2x.png
  43. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Book_Read_Menu@3x.png
  44. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Contents.json
  45. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Book_Read_PlayBtn@2x.png
  46. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Book_Read_PlayBtn@3x.png
  47. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Contents.json
  48. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Book_Read_Playplace@2x.png
  49. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Book_Read_Playplace@3x.png
  50. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Contents.json
  51. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Book_Read_Search@2x.png
  52. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Book_Read_Search@3x.png
  53. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Contents.json
  54. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Book_Read_Selected@2x.png
  55. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Book_Read_Selected@3x.png
  56. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Contents.json
  57. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Book_Read_Share@2x.png
  58. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Book_Read_Share@3x.png
  59. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Contents.json
  60. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Book_Read_listen@2x.png
  61. BIN
      smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Book_Read_listen@3x.png
  62. 22 0
      smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Contents.json
  63. BIN
      smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Book_Search_Icon@2x.png
  64. BIN
      smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Book_Search_Icon@3x.png
  65. 22 0
      smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Contents.json
  66. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Book_Video_CloseIcon@2x.png
  67. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Book_Video_CloseIcon@3x.png
  68. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Contents.json
  69. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Book_Video_Microphone@2x.png
  70. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Book_Video_Microphone@3x.png
  71. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Contents.json
  72. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Book_Video_NextIcon@2x.png
  73. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Book_Video_NextIcon@3x.png
  74. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Contents.json
  75. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Book_Video_PlayIcon@2x.png
  76. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Book_Video_PlayIcon@3x.png
  77. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Contents.json
  78. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Book_Video_SetIcon@2x.png
  79. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Book_Video_SetIcon@3x.png
  80. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Contents.json
  81. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Book_Video_Speed@2x.png
  82. BIN
      smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Book_Video_Speed@3x.png
  83. 22 0
      smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Contents.json
  84. 22 0
      smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/Contents.json
  85. BIN
      smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/GroupSynopsis_bg@2x.png
  86. BIN
      smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/GroupSynopsis_bg@3x.png
  87. 22 0
      smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/Contents.json
  88. BIN
      smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/chat_phone_list@2x.png
  89. BIN
      smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/chat_phone_list@3x.png
  90. 22 0
      smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/Contents.json
  91. BIN
      smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/chat_replay_me@2x.png
  92. BIN
      smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/chat_replay_me@3x.png
  93. 22 0
      smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/Contents.json
  94. BIN
      smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/chat_yan_message@2x.png
  95. BIN
      smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/chat_yan_message@3x.png
  96. 1 0
      smartRhino/FwzAppConfig.h
  97. 4 0
      smartRhino/Project/Base/SubClass/Button/ShowBtn.h
  98. 33 4
      smartRhino/Project/Base/SubClass/Button/ShowBtn.m
  99. 73 0
      smartRhino/Project/Base/SubClass/Circle/PNCircleChart.h
  100. 0 0
      smartRhino/Project/Base/SubClass/Circle/PNCircleChart.m

File diff suppressed because it is too large
+ 500 - 6
smartRhino.xcodeproj/project.pbxproj


BIN
smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 53
smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -5,61 +5,9 @@
    version = "2.0">
    <Breakpoints>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "3970A22D-468F-4F18-8BB5-10FD5F994275"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
-         <BreakpointContent
-            uuid = "BD7D423F-C087-4E51-8772-A6CF3EA04167"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            symbolName = ""
-            moduleName = "">
-            <Actions>
-               <BreakpointActionProxy
-                  ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
-                  <ActionContent
-                     consoleCommand = "">
-                  </ActionContent>
-               </BreakpointActionProxy>
-            </Actions>
-            <Locations>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.RuntimeIssueBreakpoint">
-         <BreakpointContent
-            uuid = "7A633598-A559-4F7C-B719-EA351581B988"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            type = "65535">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
-         <BreakpointContent
-            uuid = "01C9F169-8195-42D5-A994-BCFD423D8DAB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.IDEConstraintErrorBreakpoint">
          <BreakpointContent
-            uuid = "B948653C-7D6D-4E9E-828A-1DE2612CDB56"
+            uuid = "DB8EACCE-5748-456A-A682-F9F1819C5541"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"

+ 3 - 0
smartRhino/AppDelegate.m

@@ -10,6 +10,7 @@
 #import "TabBarController.h"
 #import "WorkFlowTabbarController.h"
 #import "WXApi.h"
+#import "HKFloatManager.h"
 
 @interface AppDelegate ()<JPUSHRegisterDelegate,WXApiDelegate>
 
@@ -48,6 +49,8 @@
         self.window.rootViewController =  [StoryboardManager shared].login.instantiateInitialViewController;
     }
     [self.window makeKeyAndVisible];
+    
+    [HKFloatManager addFloatVcs:@[@"HKSecondViewController"]];
     return YES;
 }
 

+ 0 - 1
smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "login_wechat_icon.png",
       "scale" : "1x"
     },
     {

BIN
smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon.png


BIN
smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon@2x.png


BIN
smartRhino/Assets.xcassets/Login/login_wechat_icon.imageset/login_wechat_icon@3x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Book_Music_select@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Book_Music_select@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Music_select.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Book_Music_select_gray@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Book_Music_select_gray@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Music_select_gray.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_select_gray@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_select_gray@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Book_Music_unSelect@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Book_Music_unSelect@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Music_unSelect.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_unSelect@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Music_unSelect@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Book_Read_A@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Book_Read_A@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_A.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_A@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_A@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Book_Read_Amax@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Book_Read_Amax@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Amax.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Amax@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Amax@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Book_Read_Amin@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Book_Read_Amin@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Amin.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Amin@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Amin@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Book_Read_BottomSearch@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Book_Read_BottomSearch@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_BottomSearch.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_BottomSearch@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_BottomSearch@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Book_Read_CloseBtn@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Book_Read_CloseBtn@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_CloseBtn.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_CloseBtn@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_CloseBtn@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Book_Read_Collect@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Book_Read_Collect@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Collect.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Collect@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Collect@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Book_Read_FontJian@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Book_Read_FontJian@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_FontJian.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_FontJian@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_FontJian@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Book_Read_Listsearch@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Book_Read_Listsearch@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Listsearch.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Listsearch@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Listsearch@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Book_Read_Menu@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Book_Read_Menu@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Menu.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Menu@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Menu@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Book_Read_PlayBtn@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Book_Read_PlayBtn@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_PlayBtn.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_PlayBtn@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_PlayBtn@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Book_Read_Playplace@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Book_Read_Playplace@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Playplace.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Playplace@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Playplace@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Book_Read_Search@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Book_Read_Search@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Search.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Search@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Search@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Book_Read_Selected@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Book_Read_Selected@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Selected.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Selected@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Selected@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Book_Read_Share@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Book_Read_Share@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_Share.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Share@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_Share@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Book_Read_listen@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Book_Read_listen@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Read_listen.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_listen@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Read_listen@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Book_Search_Icon@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Book_Search_Icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Search_Icon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Search_Icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Search_Icon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Book_Video_CloseIcon@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Book_Video_CloseIcon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_CloseIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_CloseIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_CloseIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Book_Video_Microphone@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Book_Video_Microphone@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_Microphone.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_Microphone@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_Microphone@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Book_Video_NextIcon@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Book_Video_NextIcon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_NextIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_NextIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_NextIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Book_Video_PlayIcon@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Book_Video_PlayIcon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_PlayIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_PlayIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_PlayIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Book_Video_SetIcon@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Book_Video_SetIcon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_SetIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_SetIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_SetIcon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Book_Video_Speed@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Book_Video_Speed@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_Video_Speed.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_Speed@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Book_Video_Speed@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 22 - 0
smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "GroupSynopsis_bg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "GroupSynopsis_bg@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/GroupSynopsis_bg@2x.png


BIN
smartRhino/Assets.xcassets/首页/GroupSynopsis_bg.imageset/GroupSynopsis_bg@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_phone_list@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_phone_list@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/chat_phone_list@2x.png


BIN
smartRhino/Assets.xcassets/首页/chat_phone_list.imageset/chat_phone_list@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_replay_me@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_replay_me@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/chat_replay_me@2x.png


BIN
smartRhino/Assets.xcassets/首页/chat_replay_me.imageset/chat_replay_me@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_yan_message@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "chat_yan_message@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/chat_yan_message@2x.png


BIN
smartRhino/Assets.xcassets/首页/chat_yan_message.imageset/chat_yan_message@3x.png


+ 1 - 0
smartRhino/FwzAppConfig.h

@@ -395,4 +395,5 @@ typedef enum BookChanelType{
 #define NOTIFI_NoteBookSelectNoteBook @"NOTIFI_NoteBookSelectNoteBook"
 #define NOTIFI_SelectPeopleAndDepartMent @"NOTIFI_SelectPeopleAndDepartMent"
 #define NOTIFI_SELECTCREATENOTEFOLDER @"NOTIFI_SELECTCREATENOTEFOLDER"
+#define BOOKMUSICSELECTARRAY   @"BOOKMUSICSELECTARRAY"
 #endif /* FwzAppConfig_h */

+ 4 - 0
smartRhino/Project/Base/SubClass/Button/ShowBtn.h

@@ -15,6 +15,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setLabelTitle:(NSString *)title;
 - (void)show;
 - (void)dismiss;
+
+- (void)setcomTitle:(NSString *)title;
+- (void)showCom;
+- (void)dismissCom;
 @end
 
 NS_ASSUME_NONNULL_END

+ 33 - 4
smartRhino/Project/Base/SubClass/Button/ShowBtn.m

@@ -19,8 +19,8 @@
 }
 - (void)setLabelTitle:(NSString *)title
 {
-    self.title = [NSString stringWithFormat:@" %@ ",title];
-    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
+    self.title = [NSString stringWithFormat:@"%@ ",title];
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
     NSTextAttachment *attach = [[NSTextAttachment alloc] init];
     attach.image = [UIImage imageNamed:@"chatmsg_notice_showAll_icon"];
     NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
@@ -30,7 +30,7 @@
 }
 - (void)show
 {
-    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
     NSTextAttachment *attach = [[NSTextAttachment alloc] init];
     attach.image = [UIImage imageNamed:@"chatmsg_notice_hideAll_icon"];
     NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
@@ -39,7 +39,36 @@
 }
 - (void)dismiss
 {
-    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17],NSForegroundColorAttributeName:UIColorHex(0x000000)}];
+    NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+    attach.image = [UIImage imageNamed:@"chatmsg_notice_showAll_icon"];
+    NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
+    [attStr appendAttributedString:collegeStr];
+    [self setAttributedTitle:attStr forState:UIControlStateNormal];
+}
+- (void)setcomTitle:(NSString *)title
+{
+    self.title = [NSString stringWithFormat:@"%@ ",title];
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorHex(0x666666)}];
+    NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+    attach.image = [UIImage imageNamed:@"chatmsg_notice_showAll_icon"];
+    NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
+    [attStr appendAttributedString:collegeStr];
+    [attStr appendAttributedString:[[NSAttributedString alloc] initWithString:@" "]];
+    [self setAttributedTitle:attStr forState:UIControlStateNormal];
+}
+- (void)showCom
+{
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorHex(0x666666)}];
+    NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+    attach.image = [UIImage imageNamed:@"chatmsg_notice_hideAll_icon"];
+    NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
+    [attStr appendAttributedString:collegeStr];
+    [self setAttributedTitle:attStr forState:UIControlStateNormal];
+}
+- (void)dismissCom
+{
+    NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:self.title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorHex(0x666666)}];
     NSTextAttachment *attach = [[NSTextAttachment alloc] init];
     attach.image = [UIImage imageNamed:@"chatmsg_notice_showAll_icon"];
     NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];

+ 73 - 0
smartRhino/Project/Base/SubClass/Circle/PNCircleChart.h

@@ -0,0 +1,73 @@
+//
+//  PNCircleChart.h
+//  PNChartDemo
+//
+//  Created by kevinzhow on 13-11-30.
+//  Copyright (c) 2013年 kevinzhow. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "UICountingLabel.h"
+
+typedef NS_ENUM (NSUInteger, PNChartFormatType) {
+    PNChartFormatTypePercent,
+    PNChartFormatTypeDollar,
+    PNChartFormatTypeNone,
+    PNChartFormatTypeDecimal,
+    PNChartFormatTypeDecimalTwoPlaces,
+};
+
+#define DEGREES_TO_RADIANS(angle) ((angle) / 180.0 * M_PI)
+
+@interface PNCircleChart : UIView
+
+- (void)strokeChart;
+- (void)growChartByAmount:(NSNumber *)growAmount;
+- (void)updateChartByCurrent:(NSNumber *)current;
+- (void)updateChartByCurrent:(NSNumber *)current byTotal:(NSNumber *)total;
+//- (id)initWithFrame:(CGRect)frame
+//              total:(NSNumber *)total
+//            current:(NSNumber *)current
+//          clockwise:(BOOL)clockwise;
+//
+//- (id)initWithFrame:(CGRect)frame
+//              total:(NSNumber *)total
+//            current:(NSNumber *)current
+//          clockwise:(BOOL)clockwise
+//             shadow:(BOOL)hasBackgroundShadow
+//        shadowColor:(UIColor *)backgroundShadowColor;
+//
+//- (id)initWithFrame:(CGRect)frame
+//              total:(NSNumber *)total
+//            current:(NSNumber *)current
+//          clockwise:(BOOL)clockwise
+//             shadow:(BOOL)hasBackgroundShadow
+//        shadowColor:(UIColor *)backgroundShadowColor
+//displayCountingLabel:(BOOL)displayCountingLabel;
+
+- (id)initWithFrame:(CGRect)frame
+              total:(NSNumber *)total
+            current:(NSNumber *)current
+          clockwise:(BOOL)clockwise
+             shadow:(BOOL)hasBackgroundShadow
+        shadowColor:(UIColor *)backgroundShadowColor
+displayCountingLabel:(BOOL)displayCountingLabel
+  overrideLineWidth:(NSNumber *)overrideLineWidth
+        strokeColor:(UIColor *)strokeColor;
+@property (strong, nonatomic) UICountingLabel *countingLabel;
+@property (nonatomic) UIColor *strokeColor;
+@property (nonatomic) UIColor *strokeColorGradientStart;
+@property (nonatomic) NSNumber *total;
+@property (nonatomic) NSNumber *current;
+@property (nonatomic) NSNumber *lineWidth;
+@property (nonatomic) NSTimeInterval duration;
+@property (nonatomic) PNChartFormatType chartType;
+
+@property (nonatomic) CAShapeLayer *circle;
+@property (nonatomic) CAShapeLayer *gradientMask;
+@property (nonatomic) CAShapeLayer *circleBackground;
+
+@property (nonatomic) BOOL displayCountingLabel;
+@property (nonatomic) BOOL displayAnimated;
+
+@end

+ 0 - 0
smartRhino/Project/Base/SubClass/Circle/PNCircleChart.m


Some files were not shown because too many files changed in this diff