rename

basic/HMAC_SHA1.cpp

@@ -5,7 +5,7 @@
 //******************************************************************************
 #include <iostream>
 #include <memory>
-#include "HMAC_SHA1.h"
+#include "hmac_sha1.h"
 
 
 void CHMAC_SHA1::HMAC_SHA1(BYTE *text, int text_len, BYTE *key, int key_len, BYTE *digest)

basic/HMAC_SHA1.h

@@ -7,7 +7,7 @@
 #ifndef __HMAC_SHA1_H__
 #define __HMAC_SHA1_H__
 
-#include "SHA1.h"
+#include "sha1.h"
 
 typedef unsigned char BYTE ;
 

basic/JSON.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "JSON.h"
-#include "McZip.h"
+#include "Zip.h"
 #include <float.h>
 
 using namespace mc;

basic/SHA1.cpp

@@ -29,7 +29,7 @@
 		34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
 */
 
-#include "SHA1.h"
+#include "sha1.h"
 
 #ifdef SHA1_UTILITY_FUNCTIONS
 #define SHA1_MAX_FILE_BUFFER 8000

basic/Thread.cpp

@@ -1,4 +1,4 @@
-#include "Thread.h"
+#include "thread.h"
 #ifdef __ANDROID__
 #include <jni.h>
 #endif

basic/ThreadPool.cpp

@@ -6,7 +6,7 @@
  * history:
  */
 
-#include "ThreadPool.h"
+#include "threadpool.h"
 
 #pragma --mark "工作者线程"
 ThreadWork::ThreadWork(pthread_mutex_t* lock, pthread_cond_t* ready, std::queue<thread_task_t>* queue){
@@ -53,24 +53,24 @@ void ThreadWork::loop(){
 }
 
 #pragma --mark "线程池"
-ThreadPool* ThreadPool::m_instance = NULL;
+threadpool* threadpool::m_instance = NULL;
 
-ThreadPool* ThreadPool::shareInstance(){
+threadpool* threadpool::shareInstance(){
     if (m_instance==NULL) {
-        m_instance = new ThreadPool();
+        m_instance = new threadpool();
     }
 
     return m_instance;
 }
 
-void ThreadPool::destroyInstance(){
+void threadpool::destroyInstance(){
     if (m_instance!=NULL) {
         delete m_instance;
         m_instance = NULL;
     }
 }
 
-ThreadPool::ThreadPool(int thread_num){
+threadpool::threadpool(int thread_num){
     m_threads.resize(thread_num);
     pthread_mutex_init(&m_lock, NULL);
     pthread_cond_init(&m_ready, NULL);
@@ -81,19 +81,19 @@ ThreadPool::ThreadPool(int thread_num){
     }
 }
 
-ThreadPool::~ThreadPool(){
+threadpool::~threadpool(){
     destroy();
 }
 
-void ThreadPool::add(void*   (*run)(void*),void* arg){
+void threadpool::add(void*   (*run)(void*),void* arg){
     pthread_mutex_lock(&m_lock);
     thread_task_t task = {run , arg};
     m_queue.push(task);
     pthread_cond_signal(&m_ready);
     pthread_mutex_unlock(&m_lock);
 }
 
-void ThreadPool::destroy(){
+void threadpool::destroy(){
     if (m_threads.size()==0) {
         return;
     }
@@ -121,5 +121,5 @@ void ThreadPool::destroy(){
 }
 
 void async_run(void*   (*run)(void*), void* arg){
-    ThreadPool::shareInstance()->add(run, arg);
+    threadpool::shareInstance()->add(run, arg);
 }

basic/ThreadPool.h

@@ -13,7 +13,7 @@
 #include <queue>
 #include <vector>
 #include "bs.h"
-#include "Thread.h"
+#include "thread.h"
 
 using namespace std;
 typedef struct thread_task_t{
@@ -36,19 +36,19 @@ class ThreadWork:public LoopThread{
     pthread_cond_t              m_queue_ready;
 };
 
-class ThreadPool{
+class threadpool{
 public:
-    static ThreadPool* shareInstance();
+    static threadpool* shareInstance();
     static void destroyInstance();
 
-    ThreadPool(int thread_num = 20);
-    ~ThreadPool();
+    threadpool(int thread_num = 2);
+    ~threadpool();
 
     void add(void*   (*run)(void*),void* arg);
     void destroy();
 
 protected:
-    static ThreadPool*          m_instance;
+    static threadpool*          m_instance;
 
     std::vector<ThreadWork*>    m_threads;
     std::queue<thread_task_t>   m_queue;

basic/android/McDevice.cpp → basic/android/device.cpp

@@ -9,8 +9,8 @@
 #include <iostream>
 #include <string>
 #include "bs.h"
-#include "../McDevice.h"
-#include "../McFile.h"
+#include "device.h"
+#include "file.h"
 
 using namespace std;
 

basic/android/McResource.cpp → basic/android/resource.cpp

@@ -9,7 +9,7 @@
 #include <jni.h>
 #include <android/asset_manager.h>
 #include <android/asset_manager_jni.h>
-#include "../McFile.h"
+#include "file.h"
 
 extern JavaVM*  g_jvm;
 

basic/McBasic.h → basic/basic.h

@@ -9,17 +9,17 @@
 #ifndef __basic_h
 #define __basic_h
 
-#include "JSON.h"
-#include "McDevice.h"
-#include "McFile.h"
-#include "McHttp.h"
-#include "McZip.h"
-#include "Thread.h"
-#include "McReference.h"
-#include "SharedPreferences.h"
-#include "McTask.h"
-#include "ThreadPool.h"
-#include "McTimer.h"
+#include "json.h"
+#include "device.h"
+#include "file.h"
+#include "http.h"
+#include "zip.h"
+#include "thread.h"
+#include "reference.h"
+#include "shared_preferences.h"
+#include "task.h"
+#include "threadpool.h"
+#include "timer.h"
 
 // 内存管理好烦啊
 // 异步删除内存，用于回调中删除自己

basic/McFile.cpp → basic/file.cpp

@@ -8,8 +8,8 @@
 
 #include <iostream>
 #include <string>
-#include "McFile.h"
-#include "McDevice.h"
+#include "file.h"
+#include "device.h"
 
 using namespace mc;
 

basic/McHmacAuth.cpp → basic/hmac_auth.cpp

@@ -6,9 +6,9 @@
 //  Copyright © 2017年 Rex. All rights reserved.
 //
 
-#include "McHmacAuth.h"
+#include "hmac_auth.h"
 #include <string.h>
-#include "HMAC_SHA1.h"
+#include "hmac_sha1.h"
 
 #define MAX_MESSAGE_LENGTH 4096
 

basic/McHttp.cpp → basic/http.cpp

@@ -7,14 +7,14 @@
  */
 
 #include "bs.h"
-#include "McDevice.h"
-#include "McHttp.h"
-#include "McFile.h"
-#include "McTask.h"
-#include "ThreadPool.h"
-#include "SharedPreferences.h"
-#include "McFile.h"
-#include "McZip.h"
+#include "device.h"
+#include "http.h"
+#include "file.h"
+#include "task.h"
+#include "threadpool.h"
+#include "shared_preferences.h"
+#include "file.h"
+#include "Zip.h"
 #include <iterator>
 #include "JSON.h"
 
@@ -98,7 +98,7 @@ bool HttpSession::http_show_log = false;
 
 HttpSession::HttpSession(void *threadpool) {
     if (threadpool == NULL) {
-        m_thread_pool = ThreadPool::shareInstance();
+        m_thread_pool = threadpool::shareInstance();
     } else {
         m_thread_pool = threadpool;
     }
@@ -148,7 +148,7 @@ void HttpSession::http(const char *url, const char *method, const char *body, ui
     void **para = (void **) malloc(sizeof(void *) * 2);
     para[0] = h;
     para[1] = this;
-    ((ThreadPool *) m_thread_pool)->add(thread_http, para);
+    ((threadpool *) m_thread_pool)->add(thread_http, para);
 }
 
 void HttpSession::download(const char *url, const char *path, HttpFileCallback *callback) {
@@ -261,7 +261,7 @@ void HttpSession::saveCookie(const char *cookie) {
     int64_t crysize = crypt.encryptByCompress((byte *) str, (uint32_t) strlen(str));
 
     char path[1024];
-    SharedPreferences::path("__CurrentCookie", path, sizeof(path));
+    shared_preferences::path("__CurrentCookie", path, sizeof(path));
     FileManager::write(path, crypt.bytes(), (size_t) crysize);
 }
 
@@ -271,7 +271,7 @@ void HttpSession::setCookie(const char *cookie) {
 
 void HttpSession::clearCookie() {
     char path[1024];
-    SharedPreferences::path("__CurrentCookie", path, sizeof(path));
+    shared_preferences::path("__CurrentCookie", path, sizeof(path));
     FileManager::remove(path);
     map<string, string>::iterator cookie = m_headers.find("Cookie");
     m_headers.erase(cookie);

basic/ios/McDevice.mm → basic/ios/device.mm

@@ -10,11 +10,11 @@
 #import <Foundation/Foundation.h>
 #include <sys/utsname.h>
 #import <CommonCrypto/CommonDigest.h>
-#include "McDevice.h"
+#include "device.h"
 #import "SecureUDID.h"
 #include <sys/sysctl.h>
 #include <net/if_dl.h>
-#include "McDevice.h"
+#include "device.h"
 #include "SFHFKeychainUtils.h"
 #include <string.h>
 

basic/ios/McFile.mm → basic/ios/file.mm

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #include <stdio.h>
 #include <string.h>
-#include "McFile.h"
+#include "file.h"
 using namespace mc;
 
 //const char* FileManager::m_root_path = [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex:0] UTF8String];

basic/McReference.cpp → basic/reference.cpp

@@ -6,7 +6,7 @@
  * history:
  */
 
-#include "McReference.h"
+#include "reference.h"
 
 using namespace mc;
 
@@ -33,7 +33,7 @@ ReferenceCache::~ReferenceCache(){
     m_cache.clear();
 }
 
-Reference* ReferenceCache::get(){
+reference* ReferenceCache::get(){
     for (int i=0; i<m_cache.size(); i++) {
         if (m_cache[i]->idle()) {
             return m_cache[i];

basic/McReference.h → basic/reference.h

@@ -14,9 +14,9 @@
 #include <vector>
 
 namespace mc {
-    class Reference{
+    class reference{
     public:
-        Reference(){
+        reference(){
             m_referencecount = 0;
             m_is_reference = true;
         }
@@ -68,16 +68,16 @@ namespace mc {
 
         ~ReferenceCache();
 
-        virtual Reference* get();
+        virtual reference* get();
 
         // 必须是new出来的对象
-        inline void add(Reference* r){
+        inline void add(reference* r){
             m_cache.push_back(r);
         }
 
     protected:
         static ReferenceCache*  m_instance;
-        std::vector<Reference*>      m_cache;
+        std::vector<reference*>      m_cache;
     };
 }
 

basic/SharedPreferences.cpp → basic/shared_preferences.cpp

@@ -6,15 +6,15 @@
  * history:
  */
 
-#include "SharedPreferences.h"
-#include "McZip.h"
+#include "shared_preferences.h"
+#include "Zip.h"
 
 using namespace mc;
 
 static char g_root_path[1024];
-const char* SharedPreferences::m_root_path = NULL;
+const char* shared_preferences::m_root_path = NULL;
 
-SharedPreferences::SharedPreferences(const char* name){
+shared_preferences::shared_preferences(const char* name){
     if (name != NULL) {
         path(name, m_path, sizeof(m_path));
         if(open(m_path)){
@@ -26,15 +26,15 @@ SharedPreferences::SharedPreferences(const char* name){
     }
 }
 
-bool SharedPreferences::commit(){
+bool shared_preferences::commit(){
     const char* b = toString();
     Crypt crypt;
     int64_t size = crypt.encryptByCompress((byte*)b, (uint32_t)strlen(b));
     FileManager::write(m_path, crypt.bytes(), (uint32_t)size);
     return true;
 }
 
-const char* SharedPreferences::path(const char* name, char* path, uint32_t size){
+const char* shared_preferences::path(const char* name, char* path, uint32_t size){
     if (m_root_path == NULL) {
         snprintf(g_root_path, sizeof(g_root_path), "%s/__shared_prefs", FileManager::rootPath());
         // 如果不存在则创建文件夹