Merge branch 'master' of http://106.75.192.252:10080/easygame_sdk/easygame_sdk_android

 # EasyGame客户端对接文档 #
 # EasyGame客户端对接文档 #
+
+## 更新日志 ##
+- 2016-9-15
+```xml
+FB登录改成 GRAPH_API_VERSION = "v2.7"
+```
+
+- 2016-8-25
+```xml
+修复google play的风险提示
+```
+
+## 以下参数需游戏客户端根据实际情况修改 ##
+
+`res/values/p7725sdk_app_private_yijidq140515.xml`
+```xml
+<string name="com_7725_app_name">这里填写游戏名字</string>
+<string name="com_7725_game_main_activity">程序入口的类名和包名</string>
+<string name="com_7725_sdkProtocolToken">Token由我方提供</string>
+<string name="com_7725_sdkProtocolGame">游戏简称由我方提供</string>
+<string name="com_7725_facebookSdkApplicationId">游戏FaceBook的APPID</string>
+```
+
 ## 1.配置开发环境 ##
 ## 1.配置开发环境 ##
 - 使用easygameSDK环境配置需要完成下面几个步骤：
 - 使用easygameSDK环境配置需要完成下面几个步骤：
 
 
@@ -281,8 +304,8 @@ UserManager.setRole(context, roleid, rolename);
 ### 特殊情况： ###
 ### 特殊情况： ###
 如果游戏记录玩家的历史登录记录，并且提供快速选服选角色进入游戏的，则需同时调用
 如果游戏记录玩家的历史登录记录，并且提供快速选服选角色进入游戏的，则需同时调用
 ```java
 ```java
-UserManager.setRole(context, Role,Roleid);
-UserManager.setServer(context, server, noticeUrl);
+UserManager.setRole(context, roleid, rolename);
+UserManager.setServer(context, serverid);
 ```
 ```
 ### 5.进入充值界面 ###
 ### 5.进入充值界面 ###
 
 

@@ -41,32 +41,32 @@
 	<string name="com_7725_enable_mobile_bearMedia_advertisement_tracker">false</string>
 	<string name="com_7725_enable_mobile_bearMedia_advertisement_tracker">false</string>
 
 
 	<!-- InMobi manifest -->
 	<!-- InMobi manifest -->
-	<string name="com_7725_enable_mobile_inmobi_advertisement_tracker">true</string>
+	<string name="com_7725_enable_mobile_inmobi_advertisement_tracker">false</string>
 	<string name="com_7725_inmobi_appid">8ce54673ed0346a7b84c299f688bd043</string>
 	<string name="com_7725_inmobi_appid">8ce54673ed0346a7b84c299f688bd043</string>
 
 
 	<!-- KuADCPA manifest -->
 	<!-- KuADCPA manifest -->
-	<string name="com_7725_enable_mobile_kuadcpa_advertisement_tracker">true</string>
+	<string name="com_7725_enable_mobile_kuadcpa_advertisement_tracker">false</string>
 	<string name="com_7725_kuadcpa_appid">2015020400002</string>
 	<string name="com_7725_kuadcpa_appid">2015020400002</string>
 	<string name="com_7725_kuadcpa_appkey">a424a879a8994e4fd136c9d05efbb1b6</string>
 	<string name="com_7725_kuadcpa_appkey">a424a879a8994e4fd136c9d05efbb1b6</string>
 	
 	
 	<!-- Advertiser manifest -->
 	<!-- Advertiser manifest -->
-	<string name="com_7725_enable_mobile_advertiser_advertisement_tracker">true</string>
+	<string name="com_7725_enable_mobile_advertiser_advertisement_tracker">false</string>
 	<string name="com_7725_advertiser_appid">fy_ctzj2_hk_tw</string>
 	<string name="com_7725_advertiser_appid">fy_ctzj2_hk_tw</string>
 	
 	
 	
 	
 	<!-- MdotM manifest -->
 	<!-- MdotM manifest -->
-	<string name="com_7725_enable_mobile_MdotM_advertisement_tracker">true</string>
+	<string name="com_7725_enable_mobile_MdotM_advertisement_tracker">false</string>
 	
 	
 	<!-- MillennialMedia manifest -->
 	<!-- MillennialMedia manifest -->
-	<string name="com_7725_enable_mobile_millennialMedia_advertisement_tracker">true</string>
+	<string name="com_7725_enable_mobile_millennialMedia_advertisement_tracker">false</string>
 	<string name="com_7725_millennialMedia_appid">46050</string>
 	<string name="com_7725_millennialMedia_appid">46050</string>
 
 
 	<!-- google analytics manifest -->
 	<!-- google analytics manifest -->
 	<!-- Replace placeholder ID with your tracking ID -->
 	<!-- Replace placeholder ID with your tracking ID -->
 	<string name="ga_trackingId">UA-42392414-18</string>
 	<string name="ga_trackingId">UA-42392414-18</string>
 	<!-- Enable automatic activity tracking -->
 	<!-- Enable automatic activity tracking -->
-	<bool name="ga_autoActivityTracking">true</bool>
+	<bool name="ga_autoActivityTracking">false</bool>
 	<!-- Enable automatic exception tracking -->
 	<!-- Enable automatic exception tracking -->
-	<bool name="ga_reportUncaughtExceptions">true</bool>
+	<bool name="ga_reportUncaughtExceptions">false</bool>
    
    
 </resources>
 </resources>
\ No newline at end of file