From df7c5aad59e9a923e0764fabd35edb850c6e7b82 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 24 一月 2022 11:26:20 +0800
Subject: [PATCH] ios友盟sdk

---
 DLL/UMeng/UMCommon.framework/Headers/UMCommon.h                            |   20 +
 HDL-ON_iOS/ViewController.cs                                               |    5 
 DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMCommon.h                 |   19 +
 DLL/UMeng/UMCommon.framework/Versions/Current/Headers/MobClick.h           |  220 ++++++++++++
 HDL-ON_iOS/HDL-ON_iOS.csproj                                               |    7 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs |    2 
 DLL/UMeng/UMCommon.framework/UMCommon                                      |    0 
 DLL/UMeng/UMCommon.framework/Versions/A/Headers/MobClick.h                 |  220 ++++++++++++
 DLL/UMeng/UMCommon.framework/7.3.5_4da14cb265_20210810144036               |    1 
 DLL/UMeng/UMCommon.framework/Headers/MobClick.h                            |  220 ++++++++++++
 DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMCommon.h           |   19 +
 DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMConfigure.h        |   45 ++
 DLL/UMeng/UMDevice.framework/UMDevice                                      |    0 
 DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMConfigure.h              |   45 ++
 UMSdk/ApiDefinition.cs                                                     |   68 ---
 DLL/UMeng/UMCommon.framework/Headers/UMConfigure.h                         |   45 ++
 DLL/UMeng/UMCommon.framework/Versions/Current/UMCommon                     |    0 
 HDL_ON/DAL/Server/HttpUtil.cs                                              |    4 
 DLL/UMeng/UMDevice.framework/Headers/UMZid.h                               |   29 +
 DLL/UMeng/libHDLUMSDK.a                                                    |    0 
 DLL/UMeng/UMCommon.framework/Versions/A/UMCommon                           |    0 
 SiriIntents/Server/HttpUtil.cs                                             |    4 
 22 files changed, 906 insertions(+), 67 deletions(-)

diff --git a/DLL/UMeng/UMCommon.framework/7.3.5_4da14cb265_20210810144036 b/DLL/UMeng/UMCommon.framework/7.3.5_4da14cb265_20210810144036
new file mode 100644
index 0000000..d9edd15
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/7.3.5_4da14cb265_20210810144036
@@ -0,0 +1 @@
+7.3.5
diff --git a/DLL/UMeng/UMCommon.framework/Headers/MobClick.h b/DLL/UMeng/UMCommon.framework/Headers/MobClick.h
new file mode 100644
index 0000000..059931d
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Headers/MobClick.h
@@ -0,0 +1,220 @@
+//
+//  MobClick.h
+//  Analytics
+//
+//  Copyright (C) 2010-2017 Umeng.com . All rights reserved.
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+@interface MobClick : NSObject
+
+#pragma mark basics
+
+///---------------------------------------------------------------------------------------
+/// @name  璁剧疆
+///---------------------------------------------------------------------------------------
+
+
+
+#pragma mark event logs
+///---------------------------------------------------------------------------------------
+/// @name  椤甸潰璁℃椂
+///---------------------------------------------------------------------------------------
+
+/** 鎵嬪姩椤甸潰鏃堕暱缁熻, 璁板綍鏌愪釜椤甸潰灞曠ず鐨勬椂闀�.
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @param seconds 鍗曚綅涓虹锛宨nt鍨�.
+ @return void.
+ */
++ (void)logPageView:(NSString *)pageName seconds:(int)seconds;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 寮�濮嬭褰曟煇涓〉闈㈠睍绀烘椂闀�.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)beginLogPageView:(NSString *)pageName;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 缁撴潫璁板綍鏌愪釜椤甸潰灞曠ず鏃堕暱.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)endLogPageView:(NSString *)pageName;
+
+
+///---------------------------------------------------------------------------------------
+/// @name  浜嬩欢缁熻
+///---------------------------------------------------------------------------------------
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  accumulation 绱姞鍊笺�備负鍑忓皯缃戠粶浜や簰锛屽彲浠ヨ嚜琛屽鏌愪竴浜嬩欢ID鐨勬煇涓�鍒嗙被鏍囩杩涜绱姞锛屽啀浼犲叆娆℃暟浣滀负鍙傛暟銆�
+ @return void.
+ */
++ (void)event:(NSString *)eventId; //绛夊悓浜� event:eventId label:eventId;
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId label:(NSString *)label; // label涓簄il鎴朄""鏃讹紝绛夊悓浜� event:eventId label:eventId;
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes;
+
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes counter:(int)number;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+    浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+    beginEvent,endEvent瑕侀厤瀵逛娇鐢�,涔熷彲浠ヨ嚜宸辫鏃跺悗閫氳繃durations鍙傛暟浼犻�掕繘鏉�
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  primarykey 杩欎釜鍙傛暟鐢ㄤ簬鍜宔vent_id涓�璧锋爣绀轰竴涓敮涓�浜嬩欢锛屽苟涓嶄細琚粺璁★紱瀵逛簬鍚屼竴涓簨浠跺湪beginEvent鍜宔ndEvent 涓浼犻�掔浉鍚岀殑eventId 鍜� primarykey
+ @param millisecond 鑷繁璁℃椂闇�瑕佺殑璇濋渶瑕佷紶姣杩涙潵
+ @return void.
+ 
+ @warning 姣忎釜event鐨刟ttributes涓嶈兘瓒呰繃100涓�
+    eventId銆乤ttributes涓璳ey鍜寁alue閮戒笉鑳戒娇鐢ㄧ┖鏍煎拰鐗规畩瀛楃锛屽繀椤绘槸NSString,涓旈暱搴︿笉鑳借秴杩�255涓瓧绗︼紙鍚﹀垯灏嗘埅鍙栧墠255涓瓧绗︼級
+    id锛� ts锛� du鏄繚鐣欏瓧娈碉紝涓嶈兘浣滀负eventId鍙妅ey鐨勫悕绉�
+*/
++ (void)beginEvent:(NSString *)eventId;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId primarykey :(NSString *)keyName attributes:(NSDictionary *)attributes;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId primarykey:(NSString *)keyName;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId label:(NSString *)label durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes durations:(int)millisecond;
+
+
+#pragma mark - user methods
+/** active user sign-in.
+ 浣跨敤sign-In鍑芥暟鍚庯紝濡傛灉缁撴潫璇UID鐨勭粺璁★紝闇�瑕佽皟鐢╯ign-Off鍑芥暟
+ @param puid : user's ID
+ @param provider : 涓嶈兘浠ヤ笅鍒掔嚎"_"寮�澶达紝浣跨敤澶у啓瀛楁瘝鍜屾暟瀛楁爣璇�; 濡傛灉鏄笂甯傚叕鍙革紝寤鸿浣跨敤鑲＄エ浠ｇ爜銆�
+ @return void.
+ */
++ (void)profileSignInWithPUID:(NSString *)puid;
++ (void)profileSignInWithPUID:(NSString *)puid provider:(NSString *)provider;
+
+/** active user sign-off.
+ 鍋滄sign-in PUID鐨勭粺璁�
+ @return void.
+ */
++ (void)profileSignOff;
+
+///---------------------------------------------------------------------------------------
+/// @name 鍦扮悊浣嶇疆璁剧疆
+/// 闇�瑕侀摼鎺� CoreLocation.framework 骞朵笖 #import <CoreLocation/CoreLocation.h>
+///---------------------------------------------------------------------------------------
+
+/** 璁剧疆缁忕含搴︿俊鎭�
+ @param latitude 绾害.
+ @param longitude 缁忓害.
+ @return void
+ */
++ (void)setLatitude:(double)latitude longitude:(double)longitude;
+
+
+///---------------------------------------------------------------------------------------
+/// @name Utility鍑芥暟
+///---------------------------------------------------------------------------------------
+
+/** 鍒ゆ柇璁惧鏄惁瓒婄嫳锛屼緷鎹槸鍚﹀瓨鍦╝pt鍜孋ydia.app
+ */
++ (BOOL)isJailbroken;
+
+/** 鍒ゆ柇App鏄惁琚牬瑙�
+ */
++ (BOOL)isPirated;
+
+/** 璁剧疆 app secret
+ @param secret string
+ @return void.
+ */
++ (void)setSecret:(NSString *)secret;
+
+
+/**
+ * 璁剧疆棰勭疆浜嬩欢灞炴�� 閿�煎 浼氳鐩栧悓鍚嶇殑key
+ */
++(void) registerPreProperties:(NSDictionary *)property;
+
+/**
+ *
+ * 鍒犻櫎鎸囧畾棰勭疆浜嬩欢灞炴��
+ @param key
+ */
++(void) unregisterPreProperty:(NSString *)propertyName;
+
+/**
+ * 鑾峰彇棰勭疆浜嬩欢鎵�鏈夊睘鎬э紱濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炵┖銆�
+ */
++(NSDictionary *)getPreProperties;
+
+/**
+ *娓呯┖鎵�鏈夐缃簨浠跺睘鎬с��
+ */
++(void)clearPreProperties;
+
+
+/**
+ * 璁剧疆鍏虫敞浜嬩欢鏄惁棣栨瑙﹀彂,鍙叧娉╡ventList鍓嶄簲涓悎娉昬ventID.鍙宸茬粡淇濆瓨浜斾釜,姝ゆ帴鍙ｆ棤鏁�
+ */
++(void)setFirstLaunchEvent:(NSArray *)eventList;
+
+/** 璁剧疆鏄惁鑷姩閲囬泦椤甸潰, 榛樿NO(涓嶈嚜鍔ㄩ噰闆�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鑷姩閲囬泦椤甸潰淇℃伅
+ */
++ (void)setAutoPageEnabled:(BOOL)value;
+
+/**
+ *闆嗘垚娴嬭瘯銆�
+ */
++ (BOOL)handleUrl:(NSURL *)url;
+
+
+@end
+
+
diff --git a/DLL/UMeng/UMCommon.framework/Headers/UMCommon.h b/DLL/UMeng/UMCommon.framework/Headers/UMCommon.h
new file mode 100644
index 0000000..61fd961
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Headers/UMCommon.h
@@ -0,0 +1,20 @@
+
+//
+//  UMCommon.h
+//  UMCommon
+//
+//  Created by San Zhang on 11/2/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for UMCommon.
+FOUNDATION_EXPORT double UMCommonVersionNumber;
+
+//! Project version string for UMCommon.
+FOUNDATION_EXPORT const unsigned char UMCommonVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <UMCommon/PublicHeader.h>
+
+#import <UMCommon/UMConfigure.h>
diff --git a/DLL/UMeng/UMCommon.framework/Headers/UMConfigure.h b/DLL/UMeng/UMCommon.framework/Headers/UMConfigure.h
new file mode 100644
index 0000000..be79988
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Headers/UMConfigure.h
@@ -0,0 +1,45 @@
+//
+//  UMConfigure.h
+//  UMCommon
+//
+//  Created by San Zhang on 9/6/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UMConfigure : NSObject
+
+/** 鍒濆鍖栧弸鐩熸墍鏈夌粍浠朵骇鍝�
+ @param appKey 寮�鍙戣�呭湪鍙嬬洘瀹樼綉鐢宠鐨刟ppkey.
+ @param channel 娓犻亾鏍囪瘑锛屽彲璁剧疆nil琛ㄧず"App Store".
+ */
++ (void)initWithAppkey:(NSString *)appKey channel:(NSString *)channel;
+
+/** 璁剧疆鏄惁鍦╟onsole杈撳嚭sdk鐨刲og淇℃伅.
+ @param bFlag 榛樿NO(涓嶈緭鍑簂og); 璁剧疆涓篩ES, 杈撳嚭鍙緵璋冭瘯鍙傝�冪殑log淇℃伅. 鍙戝竷浜у搧鏃跺繀椤昏缃负NO.
+ */
++ (void)setLogEnabled:(BOOL)bFlag;
+
+/** 璁剧疆鏄惁瀵规棩蹇椾俊鎭繘琛屽姞瀵�, 榛樿NO(涓嶅姞瀵�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鏃ュ織淇℃伅鍋氬姞瀵嗗鐞�
+ */
++ (void)setEncryptEnabled:(BOOL)value;
+
++ (NSString *)umidString;
+
+/**
+ 闆嗘垚娴嬭瘯闇�瑕乨evice_id
+ */
++ (NSString*)deviceIDForIntegration;
+
+/** 鏄惁寮�鍚粺璁★紝榛樿涓篩ES(寮�鍚姸鎬�)
+ @param value 璁剧疆涓篘O,鍙叧闂弸鐩熺粺璁″姛鑳�.
+ @return void.
+*/
++ (void)setAnalyticsEnabled:(BOOL)value;
+
+//鑾峰彇zid
++ (NSString *)getUmengZID;
+
+@end
diff --git a/DLL/UMeng/UMCommon.framework/UMCommon b/DLL/UMeng/UMCommon.framework/UMCommon
new file mode 100644
index 0000000..995e6b5
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/UMCommon
Binary files differ
diff --git a/DLL/UMeng/UMCommon.framework/Versions/A/Headers/MobClick.h b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/MobClick.h
new file mode 100644
index 0000000..059931d
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/MobClick.h
@@ -0,0 +1,220 @@
+//
+//  MobClick.h
+//  Analytics
+//
+//  Copyright (C) 2010-2017 Umeng.com . All rights reserved.
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+@interface MobClick : NSObject
+
+#pragma mark basics
+
+///---------------------------------------------------------------------------------------
+/// @name  璁剧疆
+///---------------------------------------------------------------------------------------
+
+
+
+#pragma mark event logs
+///---------------------------------------------------------------------------------------
+/// @name  椤甸潰璁℃椂
+///---------------------------------------------------------------------------------------
+
+/** 鎵嬪姩椤甸潰鏃堕暱缁熻, 璁板綍鏌愪釜椤甸潰灞曠ず鐨勬椂闀�.
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @param seconds 鍗曚綅涓虹锛宨nt鍨�.
+ @return void.
+ */
++ (void)logPageView:(NSString *)pageName seconds:(int)seconds;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 寮�濮嬭褰曟煇涓〉闈㈠睍绀烘椂闀�.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)beginLogPageView:(NSString *)pageName;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 缁撴潫璁板綍鏌愪釜椤甸潰灞曠ず鏃堕暱.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)endLogPageView:(NSString *)pageName;
+
+
+///---------------------------------------------------------------------------------------
+/// @name  浜嬩欢缁熻
+///---------------------------------------------------------------------------------------
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  accumulation 绱姞鍊笺�備负鍑忓皯缃戠粶浜や簰锛屽彲浠ヨ嚜琛屽鏌愪竴浜嬩欢ID鐨勬煇涓�鍒嗙被鏍囩杩涜绱姞锛屽啀浼犲叆娆℃暟浣滀负鍙傛暟銆�
+ @return void.
+ */
++ (void)event:(NSString *)eventId; //绛夊悓浜� event:eventId label:eventId;
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId label:(NSString *)label; // label涓簄il鎴朄""鏃讹紝绛夊悓浜� event:eventId label:eventId;
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes;
+
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes counter:(int)number;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+    浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+    beginEvent,endEvent瑕侀厤瀵逛娇鐢�,涔熷彲浠ヨ嚜宸辫鏃跺悗閫氳繃durations鍙傛暟浼犻�掕繘鏉�
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  primarykey 杩欎釜鍙傛暟鐢ㄤ簬鍜宔vent_id涓�璧锋爣绀轰竴涓敮涓�浜嬩欢锛屽苟涓嶄細琚粺璁★紱瀵逛簬鍚屼竴涓簨浠跺湪beginEvent鍜宔ndEvent 涓浼犻�掔浉鍚岀殑eventId 鍜� primarykey
+ @param millisecond 鑷繁璁℃椂闇�瑕佺殑璇濋渶瑕佷紶姣杩涙潵
+ @return void.
+ 
+ @warning 姣忎釜event鐨刟ttributes涓嶈兘瓒呰繃100涓�
+    eventId銆乤ttributes涓璳ey鍜寁alue閮戒笉鑳戒娇鐢ㄧ┖鏍煎拰鐗规畩瀛楃锛屽繀椤绘槸NSString,涓旈暱搴︿笉鑳借秴杩�255涓瓧绗︼紙鍚﹀垯灏嗘埅鍙栧墠255涓瓧绗︼級
+    id锛� ts锛� du鏄繚鐣欏瓧娈碉紝涓嶈兘浣滀负eventId鍙妅ey鐨勫悕绉�
+*/
++ (void)beginEvent:(NSString *)eventId;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId primarykey :(NSString *)keyName attributes:(NSDictionary *)attributes;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId primarykey:(NSString *)keyName;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId label:(NSString *)label durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes durations:(int)millisecond;
+
+
+#pragma mark - user methods
+/** active user sign-in.
+ 浣跨敤sign-In鍑芥暟鍚庯紝濡傛灉缁撴潫璇UID鐨勭粺璁★紝闇�瑕佽皟鐢╯ign-Off鍑芥暟
+ @param puid : user's ID
+ @param provider : 涓嶈兘浠ヤ笅鍒掔嚎"_"寮�澶达紝浣跨敤澶у啓瀛楁瘝鍜屾暟瀛楁爣璇�; 濡傛灉鏄笂甯傚叕鍙革紝寤鸿浣跨敤鑲＄エ浠ｇ爜銆�
+ @return void.
+ */
++ (void)profileSignInWithPUID:(NSString *)puid;
++ (void)profileSignInWithPUID:(NSString *)puid provider:(NSString *)provider;
+
+/** active user sign-off.
+ 鍋滄sign-in PUID鐨勭粺璁�
+ @return void.
+ */
++ (void)profileSignOff;
+
+///---------------------------------------------------------------------------------------
+/// @name 鍦扮悊浣嶇疆璁剧疆
+/// 闇�瑕侀摼鎺� CoreLocation.framework 骞朵笖 #import <CoreLocation/CoreLocation.h>
+///---------------------------------------------------------------------------------------
+
+/** 璁剧疆缁忕含搴︿俊鎭�
+ @param latitude 绾害.
+ @param longitude 缁忓害.
+ @return void
+ */
++ (void)setLatitude:(double)latitude longitude:(double)longitude;
+
+
+///---------------------------------------------------------------------------------------
+/// @name Utility鍑芥暟
+///---------------------------------------------------------------------------------------
+
+/** 鍒ゆ柇璁惧鏄惁瓒婄嫳锛屼緷鎹槸鍚﹀瓨鍦╝pt鍜孋ydia.app
+ */
++ (BOOL)isJailbroken;
+
+/** 鍒ゆ柇App鏄惁琚牬瑙�
+ */
++ (BOOL)isPirated;
+
+/** 璁剧疆 app secret
+ @param secret string
+ @return void.
+ */
++ (void)setSecret:(NSString *)secret;
+
+
+/**
+ * 璁剧疆棰勭疆浜嬩欢灞炴�� 閿�煎 浼氳鐩栧悓鍚嶇殑key
+ */
++(void) registerPreProperties:(NSDictionary *)property;
+
+/**
+ *
+ * 鍒犻櫎鎸囧畾棰勭疆浜嬩欢灞炴��
+ @param key
+ */
++(void) unregisterPreProperty:(NSString *)propertyName;
+
+/**
+ * 鑾峰彇棰勭疆浜嬩欢鎵�鏈夊睘鎬э紱濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炵┖銆�
+ */
++(NSDictionary *)getPreProperties;
+
+/**
+ *娓呯┖鎵�鏈夐缃簨浠跺睘鎬с��
+ */
++(void)clearPreProperties;
+
+
+/**
+ * 璁剧疆鍏虫敞浜嬩欢鏄惁棣栨瑙﹀彂,鍙叧娉╡ventList鍓嶄簲涓悎娉昬ventID.鍙宸茬粡淇濆瓨浜斾釜,姝ゆ帴鍙ｆ棤鏁�
+ */
++(void)setFirstLaunchEvent:(NSArray *)eventList;
+
+/** 璁剧疆鏄惁鑷姩閲囬泦椤甸潰, 榛樿NO(涓嶈嚜鍔ㄩ噰闆�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鑷姩閲囬泦椤甸潰淇℃伅
+ */
++ (void)setAutoPageEnabled:(BOOL)value;
+
+/**
+ *闆嗘垚娴嬭瘯銆�
+ */
++ (BOOL)handleUrl:(NSURL *)url;
+
+
+@end
+
+
diff --git a/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMCommon.h b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMCommon.h
new file mode 100644
index 0000000..3b6f087
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMCommon.h
@@ -0,0 +1,19 @@
+//
+//  UMCommon.h
+//  UMCommon
+//
+//  Created by San Zhang on 11/2/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for UMCommon.
+FOUNDATION_EXPORT double UMCommonVersionNumber;
+
+//! Project version string for UMCommon.
+FOUNDATION_EXPORT const unsigned char UMCommonVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <UMCommon/PublicHeader.h>
+
+#import <UMCommon/UMConfigure.h>
diff --git a/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMConfigure.h b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMConfigure.h
new file mode 100644
index 0000000..be79988
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/A/Headers/UMConfigure.h
@@ -0,0 +1,45 @@
+//
+//  UMConfigure.h
+//  UMCommon
+//
+//  Created by San Zhang on 9/6/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UMConfigure : NSObject
+
+/** 鍒濆鍖栧弸鐩熸墍鏈夌粍浠朵骇鍝�
+ @param appKey 寮�鍙戣�呭湪鍙嬬洘瀹樼綉鐢宠鐨刟ppkey.
+ @param channel 娓犻亾鏍囪瘑锛屽彲璁剧疆nil琛ㄧず"App Store".
+ */
++ (void)initWithAppkey:(NSString *)appKey channel:(NSString *)channel;
+
+/** 璁剧疆鏄惁鍦╟onsole杈撳嚭sdk鐨刲og淇℃伅.
+ @param bFlag 榛樿NO(涓嶈緭鍑簂og); 璁剧疆涓篩ES, 杈撳嚭鍙緵璋冭瘯鍙傝�冪殑log淇℃伅. 鍙戝竷浜у搧鏃跺繀椤昏缃负NO.
+ */
++ (void)setLogEnabled:(BOOL)bFlag;
+
+/** 璁剧疆鏄惁瀵规棩蹇椾俊鎭繘琛屽姞瀵�, 榛樿NO(涓嶅姞瀵�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鏃ュ織淇℃伅鍋氬姞瀵嗗鐞�
+ */
++ (void)setEncryptEnabled:(BOOL)value;
+
++ (NSString *)umidString;
+
+/**
+ 闆嗘垚娴嬭瘯闇�瑕乨evice_id
+ */
++ (NSString*)deviceIDForIntegration;
+
+/** 鏄惁寮�鍚粺璁★紝榛樿涓篩ES(寮�鍚姸鎬�)
+ @param value 璁剧疆涓篘O,鍙叧闂弸鐩熺粺璁″姛鑳�.
+ @return void.
+*/
++ (void)setAnalyticsEnabled:(BOOL)value;
+
+//鑾峰彇zid
++ (NSString *)getUmengZID;
+
+@end
diff --git a/DLL/UMeng/UMCommon.framework/Versions/A/UMCommon b/DLL/UMeng/UMCommon.framework/Versions/A/UMCommon
new file mode 100644
index 0000000..995e6b5
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/A/UMCommon
Binary files differ
diff --git a/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/MobClick.h b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/MobClick.h
new file mode 100644
index 0000000..059931d
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/MobClick.h
@@ -0,0 +1,220 @@
+//
+//  MobClick.h
+//  Analytics
+//
+//  Copyright (C) 2010-2017 Umeng.com . All rights reserved.
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+@interface MobClick : NSObject
+
+#pragma mark basics
+
+///---------------------------------------------------------------------------------------
+/// @name  璁剧疆
+///---------------------------------------------------------------------------------------
+
+
+
+#pragma mark event logs
+///---------------------------------------------------------------------------------------
+/// @name  椤甸潰璁℃椂
+///---------------------------------------------------------------------------------------
+
+/** 鎵嬪姩椤甸潰鏃堕暱缁熻, 璁板綍鏌愪釜椤甸潰灞曠ず鐨勬椂闀�.
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @param seconds 鍗曚綅涓虹锛宨nt鍨�.
+ @return void.
+ */
++ (void)logPageView:(NSString *)pageName seconds:(int)seconds;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 寮�濮嬭褰曟煇涓〉闈㈠睍绀烘椂闀�.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)beginLogPageView:(NSString *)pageName;
+
+/** 鑷姩椤甸潰鏃堕暱缁熻, 缁撴潫璁板綍鏌愪釜椤甸潰灞曠ず鏃堕暱.
+ 浣跨敤鏂规硶锛氬繀椤婚厤瀵硅皟鐢╞eginLogPageView:鍜宔ndLogPageView:涓や釜鍑芥暟鏉ュ畬鎴愯嚜鍔ㄧ粺璁★紝鑻ュ彧璋冪敤鏌愪竴涓嚱鏁颁笉浼氱敓鎴愭湁鏁堟暟鎹��
+ 鍦ㄨ椤甸潰灞曠ず鏃惰皟鐢╞eginLogPageView:锛屽綋閫�鍑鸿椤甸潰鏃惰皟鐢╡ndLogPageView:
+ @param pageName 缁熻鐨勯〉闈㈠悕绉�.
+ @return void.
+ */
++ (void)endLogPageView:(NSString *)pageName;
+
+
+///---------------------------------------------------------------------------------------
+/// @name  浜嬩欢缁熻
+///---------------------------------------------------------------------------------------
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  accumulation 绱姞鍊笺�備负鍑忓皯缃戠粶浜や簰锛屽彲浠ヨ嚜琛屽鏌愪竴浜嬩欢ID鐨勬煇涓�鍒嗙被鏍囩杩涜绱姞锛屽啀浼犲叆娆℃暟浣滀负鍙傛暟銆�
+ @return void.
+ */
++ (void)event:(NSString *)eventId; //绛夊悓浜� event:eventId label:eventId;
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId label:(NSString *)label; // label涓簄il鎴朄""鏃讹紝绛夊悓浜� event:eventId label:eventId;
+
+/** 鑷畾涔変簨浠�,鏁伴噺缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes;
+
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes counter:(int)number;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+    浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+    beginEvent,endEvent瑕侀厤瀵逛娇鐢�,涔熷彲浠ヨ嚜宸辫鏃跺悗閫氳繃durations鍙傛暟浼犻�掕繘鏉�
+ 
+ @param  eventId 缃戠珯涓婃敞鍐岀殑浜嬩欢Id.
+ @param  label 鍒嗙被鏍囩銆備笉鍚岀殑鏍囩浼氬垎鍒繘琛岀粺璁★紝鏂逛究鍚屼竴浜嬩欢鐨勪笉鍚屾爣绛剧殑瀵规瘮,涓簄il鎴栫┖瀛楃涓叉椂鍚庡彴浼氱敓鎴愬拰eventId鍚屽悕鐨勬爣绛�.
+ @param  primarykey 杩欎釜鍙傛暟鐢ㄤ簬鍜宔vent_id涓�璧锋爣绀轰竴涓敮涓�浜嬩欢锛屽苟涓嶄細琚粺璁★紱瀵逛簬鍚屼竴涓簨浠跺湪beginEvent鍜宔ndEvent 涓浼犻�掔浉鍚岀殑eventId 鍜� primarykey
+ @param millisecond 鑷繁璁℃椂闇�瑕佺殑璇濋渶瑕佷紶姣杩涙潵
+ @return void.
+ 
+ @warning 姣忎釜event鐨刟ttributes涓嶈兘瓒呰繃100涓�
+    eventId銆乤ttributes涓璳ey鍜寁alue閮戒笉鑳戒娇鐢ㄧ┖鏍煎拰鐗规畩瀛楃锛屽繀椤绘槸NSString,涓旈暱搴︿笉鑳借秴杩�255涓瓧绗︼紙鍚﹀垯灏嗘埅鍙栧墠255涓瓧绗︼級
+    id锛� ts锛� du鏄繚鐣欏瓧娈碉紝涓嶈兘浣滀负eventId鍙妅ey鐨勫悕绉�
+*/
++ (void)beginEvent:(NSString *)eventId;
+
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId label:(NSString *)label;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId primarykey :(NSString *)keyName attributes:(NSDictionary *)attributes;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)endEvent:(NSString *)eventId primarykey:(NSString *)keyName;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
+
++ (void)event:(NSString *)eventId label:(NSString *)label durations:(int)millisecond;
+/** 鑷畾涔変簨浠�,鏃堕暱缁熻.
+ 浣跨敤鍓嶏紝璇峰厛鍒板弸鐩烝pp绠＄悊鍚庡彴鐨勮缃�->缂栬緫鑷畾涔変簨浠� 涓坊鍔犵浉搴旂殑浜嬩欢ID锛岀劧鍚庡湪宸ョ▼涓紶鍏ョ浉搴旂殑浜嬩欢ID.
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes durations:(int)millisecond;
+
+
+#pragma mark - user methods
+/** active user sign-in.
+ 浣跨敤sign-In鍑芥暟鍚庯紝濡傛灉缁撴潫璇UID鐨勭粺璁★紝闇�瑕佽皟鐢╯ign-Off鍑芥暟
+ @param puid : user's ID
+ @param provider : 涓嶈兘浠ヤ笅鍒掔嚎"_"寮�澶达紝浣跨敤澶у啓瀛楁瘝鍜屾暟瀛楁爣璇�; 濡傛灉鏄笂甯傚叕鍙革紝寤鸿浣跨敤鑲＄エ浠ｇ爜銆�
+ @return void.
+ */
++ (void)profileSignInWithPUID:(NSString *)puid;
++ (void)profileSignInWithPUID:(NSString *)puid provider:(NSString *)provider;
+
+/** active user sign-off.
+ 鍋滄sign-in PUID鐨勭粺璁�
+ @return void.
+ */
++ (void)profileSignOff;
+
+///---------------------------------------------------------------------------------------
+/// @name 鍦扮悊浣嶇疆璁剧疆
+/// 闇�瑕侀摼鎺� CoreLocation.framework 骞朵笖 #import <CoreLocation/CoreLocation.h>
+///---------------------------------------------------------------------------------------
+
+/** 璁剧疆缁忕含搴︿俊鎭�
+ @param latitude 绾害.
+ @param longitude 缁忓害.
+ @return void
+ */
++ (void)setLatitude:(double)latitude longitude:(double)longitude;
+
+
+///---------------------------------------------------------------------------------------
+/// @name Utility鍑芥暟
+///---------------------------------------------------------------------------------------
+
+/** 鍒ゆ柇璁惧鏄惁瓒婄嫳锛屼緷鎹槸鍚﹀瓨鍦╝pt鍜孋ydia.app
+ */
++ (BOOL)isJailbroken;
+
+/** 鍒ゆ柇App鏄惁琚牬瑙�
+ */
++ (BOOL)isPirated;
+
+/** 璁剧疆 app secret
+ @param secret string
+ @return void.
+ */
++ (void)setSecret:(NSString *)secret;
+
+
+/**
+ * 璁剧疆棰勭疆浜嬩欢灞炴�� 閿�煎 浼氳鐩栧悓鍚嶇殑key
+ */
++(void) registerPreProperties:(NSDictionary *)property;
+
+/**
+ *
+ * 鍒犻櫎鎸囧畾棰勭疆浜嬩欢灞炴��
+ @param key
+ */
++(void) unregisterPreProperty:(NSString *)propertyName;
+
+/**
+ * 鑾峰彇棰勭疆浜嬩欢鎵�鏈夊睘鎬э紱濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炵┖銆�
+ */
++(NSDictionary *)getPreProperties;
+
+/**
+ *娓呯┖鎵�鏈夐缃簨浠跺睘鎬с��
+ */
++(void)clearPreProperties;
+
+
+/**
+ * 璁剧疆鍏虫敞浜嬩欢鏄惁棣栨瑙﹀彂,鍙叧娉╡ventList鍓嶄簲涓悎娉昬ventID.鍙宸茬粡淇濆瓨浜斾釜,姝ゆ帴鍙ｆ棤鏁�
+ */
++(void)setFirstLaunchEvent:(NSArray *)eventList;
+
+/** 璁剧疆鏄惁鑷姩閲囬泦椤甸潰, 榛樿NO(涓嶈嚜鍔ㄩ噰闆�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鑷姩閲囬泦椤甸潰淇℃伅
+ */
++ (void)setAutoPageEnabled:(BOOL)value;
+
+/**
+ *闆嗘垚娴嬭瘯銆�
+ */
++ (BOOL)handleUrl:(NSURL *)url;
+
+
+@end
+
+
diff --git a/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMCommon.h b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMCommon.h
new file mode 100644
index 0000000..3b6f087
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMCommon.h
@@ -0,0 +1,19 @@
+//
+//  UMCommon.h
+//  UMCommon
+//
+//  Created by San Zhang on 11/2/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for UMCommon.
+FOUNDATION_EXPORT double UMCommonVersionNumber;
+
+//! Project version string for UMCommon.
+FOUNDATION_EXPORT const unsigned char UMCommonVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <UMCommon/PublicHeader.h>
+
+#import <UMCommon/UMConfigure.h>
diff --git a/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMConfigure.h b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMConfigure.h
new file mode 100644
index 0000000..be79988
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/Current/Headers/UMConfigure.h
@@ -0,0 +1,45 @@
+//
+//  UMConfigure.h
+//  UMCommon
+//
+//  Created by San Zhang on 9/6/16.
+//  Copyright 漏 2016 UMeng. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UMConfigure : NSObject
+
+/** 鍒濆鍖栧弸鐩熸墍鏈夌粍浠朵骇鍝�
+ @param appKey 寮�鍙戣�呭湪鍙嬬洘瀹樼綉鐢宠鐨刟ppkey.
+ @param channel 娓犻亾鏍囪瘑锛屽彲璁剧疆nil琛ㄧず"App Store".
+ */
++ (void)initWithAppkey:(NSString *)appKey channel:(NSString *)channel;
+
+/** 璁剧疆鏄惁鍦╟onsole杈撳嚭sdk鐨刲og淇℃伅.
+ @param bFlag 榛樿NO(涓嶈緭鍑簂og); 璁剧疆涓篩ES, 杈撳嚭鍙緵璋冭瘯鍙傝�冪殑log淇℃伅. 鍙戝竷浜у搧鏃跺繀椤昏缃负NO.
+ */
++ (void)setLogEnabled:(BOOL)bFlag;
+
+/** 璁剧疆鏄惁瀵规棩蹇椾俊鎭繘琛屽姞瀵�, 榛樿NO(涓嶅姞瀵�).
+ @param value 璁剧疆涓篩ES, umeng SDK 浼氬皢鏃ュ織淇℃伅鍋氬姞瀵嗗鐞�
+ */
++ (void)setEncryptEnabled:(BOOL)value;
+
++ (NSString *)umidString;
+
+/**
+ 闆嗘垚娴嬭瘯闇�瑕乨evice_id
+ */
++ (NSString*)deviceIDForIntegration;
+
+/** 鏄惁寮�鍚粺璁★紝榛樿涓篩ES(寮�鍚姸鎬�)
+ @param value 璁剧疆涓篘O,鍙叧闂弸鐩熺粺璁″姛鑳�.
+ @return void.
+*/
++ (void)setAnalyticsEnabled:(BOOL)value;
+
+//鑾峰彇zid
++ (NSString *)getUmengZID;
+
+@end
diff --git a/DLL/UMeng/UMCommon.framework/Versions/Current/UMCommon b/DLL/UMeng/UMCommon.framework/Versions/Current/UMCommon
new file mode 100644
index 0000000..995e6b5
--- /dev/null
+++ b/DLL/UMeng/UMCommon.framework/Versions/Current/UMCommon
Binary files differ
diff --git a/DLL/UMeng/UMDevice.framework/Headers/UMZid.h b/DLL/UMeng/UMDevice.framework/Headers/UMZid.h
new file mode 100644
index 0000000..56af630
--- /dev/null
+++ b/DLL/UMeng/UMDevice.framework/Headers/UMZid.h
@@ -0,0 +1,29 @@
+//
+//  UMZid.h
+//  UMZid
+//
+//  Created by UMZid on 8/29/20.
+//  Copyright 漏 2020 UMZid. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UMZid : NSObject
+
+/// SDK鍒濆鍖栵紝寮傛璇锋眰uToken
+/// @param appkey     appkey
+/// @param completion 璇锋眰uToken鐨勫洖璋冿紝uToken涓鸿繑鍥炲�硷紝濡傛灉澶辫触锛寀Token涓虹┖瀛楃涓睝鈥溾��
++ (void)initWithAppKey:(NSString *)appkey completion:(void (^)(NSString *uToken))completion;
+
+/// 鍚屾鑾峰緱uToken锛屽け璐ヨ繑鍥炵┖瀛楃涓睝鈥溾��
++ (NSString *)getZID;
+
+/// 鑾峰彇SDK鐗堟湰鍙�
++ (NSString *)getSDKVersion;
+
+/// 鑾峰緱resetToken
++ (NSString *)getResetToken;
+
+/// 鑾峰緱at
++ (NSString *)getATStr;
+@end
diff --git a/DLL/UMeng/UMDevice.framework/UMDevice b/DLL/UMeng/UMDevice.framework/UMDevice
new file mode 100644
index 0000000..ce6f18f
--- /dev/null
+++ b/DLL/UMeng/UMDevice.framework/UMDevice
Binary files differ
diff --git a/DLL/UMeng/libHDLUMSDK.a b/DLL/UMeng/libHDLUMSDK.a
new file mode 100644
index 0000000..d5cb10d
--- /dev/null
+++ b/DLL/UMeng/libHDLUMSDK.a
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 97b08bc..8dcc9a6 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -110,9 +110,6 @@
         <Reference Include="Shared.IOS.HDLSceneSiri">
           <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath>
         </Reference>
-        <Reference Include="UMSdk">
-          <HintPath>..\DLL\UMeng\UMSdk.dll</HintPath>
-        </Reference>
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json">
@@ -1431,6 +1428,10 @@
         <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
         <Name>SiriKit</Name>
       </ProjectReference>
+      <ProjectReference Include="..\UMSdk\UMSdk.csproj">
+        <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
+        <Name>UMSdk</Name>
+      </ProjectReference>
     </ItemGroup>
     <ItemGroup>
       <Content Include="Base.lproj\Intents.intentdefinition" />
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 478b9b5..dfcbc4c 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -54,8 +54,9 @@
                 {
                     if (OnAppConfig.Instance.IsLogin)
                     {
-                        var um = new UMSdk.HDLUMSDK();
-                        um.InitUMSDKWithAppKey("61d56642e0f9bb492bbc3e72", "IOS");
+                        //var um = new UMSdk.HDLUMSDK();
+                        UMSdk.HDLUMSDK.InitUMSDKWithAppKey("61d56642e0f9bb492bbc3e72", "IOS");
+                        break;
                     }
                     System.Threading.Thread.Sleep(1000);
                 }
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 315e9a2..6c692b6 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
         /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
         /// </summary>
-        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
-        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
         /// <summary>
         /// RegionMark
         /// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index aeb5a12..ea27379 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -243,7 +243,7 @@
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(50),
-                Height = Application.GetRealHeight(400),
+                Height = Application.GetRealHeight(390),
                 Radius = (uint)Application.GetRealWidth(12),
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index f61de04..56a78a0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
         /// 鍥哄畾鍩熷悕,姝ｅ紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
         /// </summary>
-        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
-        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
         /// <summary>
         /// RegionMark
         /// </summary>
diff --git a/UMSdk/ApiDefinition.cs b/UMSdk/ApiDefinition.cs
index cbde070..3729511 100644
--- a/UMSdk/ApiDefinition.cs
+++ b/UMSdk/ApiDefinition.cs
@@ -4,63 +4,17 @@
 using Foundation;
 using UIKit;
 
-namespace NativeLibrary
+namespace UMSdk
 {
-    // The first step to creating a binding is to add your native library ("libNativeLibrary.a")
-    // to the project by right-clicking (or Control-clicking) the folder containing this source
-    // file and clicking "Add files..." and then simply select the native library (or libraries)
-    // that you want to bind.
-    //
-    // When you do that, you'll notice that MonoDevelop generates a code-behind file for each
-    // native library which will contain a [LinkWith] attribute. VisualStudio auto-detects the
-    // architectures that the native library supports and fills in that information for you,
-    // however, it cannot auto-detect any Frameworks or other system libraries that the
-    // native library may depend on, so you'll need to fill in that information yourself.
-    //
-    // Once you've done that, you're ready to move on to binding the API...
-    //
-    //
-    // Here is where you'd define your API definition for the native Objective-C library.
-    //
-    // For example, to bind the following Objective-C class:
-    //
-    //     @interface Widget : NSObject {
-    //     }
-    //
-    // The C# binding would look like this:
-    //
-    //     [BaseType (typeof (NSObject))]
-    //     interface Widget {
-    //     }
-    //
-    // To bind Objective-C properties, such as:
-    //
-    //     @property (nonatomic, readwrite, assign) CGPoint center;
-    //
-    // You would add a property definition in the C# interface like so:
-    //
-    //     [Export ("center")]
-    //     CGPoint Center { get; set; }
-    //
-    // To bind an Objective-C method, such as:
-    //
-    //     -(void) doSomething:(NSObject *)object atIndex:(NSInteger)index;
-    //
-    // You would add a method definition to the C# interface like so:
-    //
-    //     [Export ("doSomething:atIndex:")]
-    //     void DoSomething (NSObject object, int index);
-    //
-    // Objective-C "constructors" such as:
-    //
-    //     -(id)initWithElmo:(ElmoMuppet *)elmo;
-    //
-    // Can be bound as:
-    //
-    //     [Export ("initWithElmo:")]
-    //     IntPtr Constructor (ElmoMuppet elmo);
-    //
-    // For more information, see https://aka.ms/ios-binding
-    //
+	// @interface HDLUMSDK : NSObject
+	[BaseType(typeof(NSObject))]
+	[Protocol]
+	interface HDLUMSDK
+	{
+		// +(void)initUMSDKWithAppKey:(NSString *)appKey channel:(NSString *)channel;
+		[Static]
+		[Export("initUMSDKWithAppKey:channel:")]
+		void InitUMSDKWithAppKey(string appKey, string channel);
+	}
 }
 

--
Gitblit v1.8.0