fix eventName bug & appid check

Author: yhl

AnalysysJavasdk/src/main/java/cn/com/analysys/javasdk/AnalysysJavaSdk.java

@@ -35,6 +35,9 @@ public AnalysysJavaSdk(Collecter collecter, String appId){
 	 */
 	public AnalysysJavaSdk(Collecter collecter, String appId, Boolean autoDelParam){
 		this.collecter = collecter;
+		if(appId == null || appId.trim().length() == 0){
+			throw new RuntimeException("appKey is empty");
+		}
 		this.appId = appId;
 		this.egBaseProperties = new HashMap<String, Object>(3);
 		this.xcontextSuperProperties = new ConcurrentHashMap<String, Object>();
@@ -302,7 +305,7 @@ private void upload(String distinctId, boolean isLogin, String eventName, Map<St
 		eventMap.put("appid", appId);
 		Map<String, Object> newProperties = new HashMap<String, Object>(16);
 		String profile = "$profile";
-		if(!eventName.startsWith(profile) && !eventName.startsWith(EventName.ALIAS.getValue())){
+		if(!(eventName != null && (eventName.startsWith(profile) || eventName.startsWith(EventName.ALIAS.getValue())))){
 			newProperties.putAll(this.xcontextSuperProperties);
 		}
 		newProperties.put("$debug", debugMode);
@@ -318,8 +321,8 @@ private void upload(String distinctId, boolean isLogin, String eventName, Map<St
 		eventMap.put("xcontext", newProperties);
 		this.collecter.debug(isDebug());
 		boolean ret = this.collecter.send(eventMap);
-		if(eventName.startsWith(profile) && isDebug() && ret){
-			System.out.println(String.format("%s success.", eventName.substring(1)));
+		if(eventName != null && eventName.startsWith(profile) && isDebug() && ret){
+			System.out.println(String.format("%s success.", eventName));
 		}
 	}
 

AnalysysJavasdk/src/main/java/cn/com/analysys/javasdk/ValidHandle.java

@@ -163,16 +163,19 @@ public static void checkProperty(String distinctId, String eventName, Map<String
 		    	throw new AnalysysException(String.format("original_id %s is too long, max length is %s.", properties.get(originalId), idLength));
 		    }
 		}
-		
-		if (eventName == null || eventName.length() == 0) {
-			System.out.println(String.format("EventName %s is empty.", eventName));
+		if (eventName != null) {
+			if (eventName.length() == 0) {
+				System.out.println("EventName is empty.");
 		}
 		if (eventName.length() > eventNameLen) {
 			System.out.println(String.format("EventName %s is too long, max length is %s.", eventName, eventNameLen));
 		}
 		if (!(KEY_PATTERN.matcher(eventName).matches())) {
 			System.out.println(String.format("EventName %s is invalid.", eventName));
 		}
+		} else {
+			System.out.println("EventName is null.");
+		}
 		checkParam(eventName, properties);
 	}