Merge branch 'master' of https://github.com/mogujie/TeamTalk

zhengger · May 18, 2015 · dbe8ba6 · dbe8ba6
2 parents aae98d9 + b9ca8f5
commit dbe8ba6
Show file tree

Hide file tree

Showing 38 changed files with 363 additions and 208 deletions.
diff --git a/README.md b/README.md
@@ -2,3 +2,7 @@
 	TeamTalk is a solution for enterprise IM
 
 	具体文档见doc目录下,安装之前请仔细阅读相关文档。
+
+# 交流
+	* qq群1:341273218(已满)
+	* qq群2:437335108(已满)
diff --git a/android/.gitignore b/android/.gitignore
@@ -0,0 +1,40 @@
+# OSX
+.DS_Store
+
+# android generated
+bin/
+gen/
+
+# eclipse
+.classpath
+.settings
+.project
+
+local.properties
+project.properties
+
+# IDEA
+.idea/
+*.iml
+out/
+
+# gradle
+build/
+.gradle/
+gradle/
+gradlew
+gradlew.bat
+gradle.properties
+
+# build
+lint.xml
+lint.html
+proguard-rules.txt
+import-summary.txt
+
+run.sh
+com_crashlytics_export_strings.xml
+crashlytics-build.properties
+
+# test
+test.html
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
diff --git a/android/README.md b/android/README.md
@@ -0,0 +1,4 @@
+android TT编译环境要求
+* IDE使用Android-studio 
+* java 1.7
+* gradle 2.2.1
diff --git a/android/app/app.iml b/android/app/app.iml
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -12,6 +12,8 @@ android {
         applicationId "com.mogujie.tt"
         minSdkVersion 11
         targetSdkVersion 19
+        versionCode 5
+        versionName "2.0.0"
     }
 
     buildTypes {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogujie.tt"
-    android:versionCode="5"
-    android:versionName="2.0.0" > <!-- 11 means android3 at least -->
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
+    package="com.mogujie.tt">
 
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

diff --git a/android/app/src/main/java/com/mogujie/tt/DB/sp/SystemConfigSp.java b/android/app/src/main/java/com/mogujie/tt/DB/sp/SystemConfigSp.java
@@ -16,7 +16,7 @@ public class SystemConfigSp {
 
     public static SystemConfigSp instance() {
         if (systemConfigSp == null) {
-            synchronized (LoginSp.class) {
+            synchronized (SystemConfigSp.class) {
                 systemConfigSp = new SystemConfigSp();
             }
         }

diff --git a/android/app/src/main/java/com/mogujie/tt/imservice/manager/IMContactManager.java b/android/app/src/main/java/com/mogujie/tt/imservice/manager/IMContactManager.java
@@ -95,7 +95,7 @@ public void onLocalNetOk(){
 
         // 用户信息
         int updateTime = dbInterface.getUserInfoLastTime();
-        logger.d("contact#loadAllUserInfo req-updateTime:%d",updateTime);
+        logger.d("contact#loadAllUserInfo req-updateTime:%d", updateTime);
         reqGetAllUsers(updateTime);
     }
 
@@ -131,7 +131,7 @@ private void reqGetAllUsers(int lastUpdateTime) {
                 .setLatestUpdateTime(lastUpdateTime).build();
         int sid = IMBaseDefine.ServiceID.SID_BUDDY_LIST_VALUE;
         int cid = IMBaseDefine.BuddyListCmdID.CID_BUDDY_LIST_ALL_USER_REQUEST_VALUE;
-        imSocketManager.sendRequest(imAllUserReq,sid,cid);
+        imSocketManager.sendRequest(imAllUserReq, sid, cid);
 	}
 
     /**
@@ -198,7 +198,7 @@ public void reqGetDetaillUsers(ArrayList<Integer> userIds){
 
         int sid = IMBaseDefine.ServiceID.SID_BUDDY_LIST_VALUE;
         int cid = IMBaseDefine.BuddyListCmdID.CID_BUDDY_LIST_USER_INFO_REQUEST_VALUE;
-        imSocketManager.sendRequest(imUsersInfoReq,sid,cid);
+        imSocketManager.sendRequest(imUsersInfoReq, sid, cid);
     }
 
     /**
@@ -244,17 +244,15 @@ public DepartmentEntity findDepartment(int deptId){
     public  List<DepartmentEntity>  getDepartmentSortedList(){
         // todo eric efficiency
         List<DepartmentEntity> departmentList = new ArrayList<>(departmentMap.values());
-        Collections.sort(departmentList, new Comparator<DepartmentEntity>(){
+        Collections.sort(departmentList, new Comparator<DepartmentEntity>() {
             @Override
             public int compare(DepartmentEntity entity1, DepartmentEntity entity2) {
 
-                if(entity1.getPinyinElement().pinyin==null)
-                {
-                    PinYin.getPinYin(entity1.getDepartName(),entity1.getPinyinElement());
+                if (entity1.getPinyinElement().pinyin == null) {
+                    PinYin.getPinYin(entity1.getDepartName(), entity1.getPinyinElement());
                 }
-                if(entity2.getPinyinElement().pinyin==null)
-                {
-                    PinYin.getPinYin(entity2.getDepartName(),entity2.getPinyinElement());
+                if (entity2.getPinyinElement().pinyin == null) {
+                    PinYin.getPinYin(entity2.getDepartName(), entity2.getPinyinElement());
                 }
                 return entity1.getPinyinElement().pinyin.compareToIgnoreCase(entity2.getPinyinElement().pinyin);
 
@@ -322,7 +320,13 @@ public int compare(UserEntity entity1, UserEntity entity2) {
                     }
                     // end compare
                 } else {
-                    return dept1.getDepartName().compareToIgnoreCase(dept2.getDepartName());
+                    if(dept1!=null && dept2!=null && dept1.getDepartName()!=null && dept2.getDepartName()!=null)
+                    {
+                        return dept1.getDepartName().compareToIgnoreCase(dept2.getDepartName());
+                    }
+                    else
+                        return 1;
+
                 }
             }
         });

diff --git a/android/build.gradle b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 

diff --git a/android/daogenerator/build.gradle b/android/daogenerator/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'java'
 apply plugin: 'maven'
 //apply plugin:'application'
 
-//貌似没有什么用
 
 repositories {
     mavenLocal()

diff --git a/android/daogenerator/daogenerator.iml b/android/daogenerator/daogenerator.iml
diff --git a/android/mgimlibs/build.gradle b/android/mgimlibs/build.gradle
@@ -7,6 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
+        versionCode 5
+        versionName "2.0.0"
     }
 
     buildTypes {
@@ -19,6 +21,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/android/mgimlibs/mgimlibs.iml b/android/mgimlibs/mgimlibs.iml
diff --git a/android/mgimlibs/src/main/AndroidManifest.xml b/android/mgimlibs/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogujie.im.libs"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+    package="com.mogujie.im.libs">
 
     <application>
     </application>

diff --git a/php/application/controllers/user.php b/php/application/controllers/user.php
@@ -62,7 +62,7 @@ public function all()
 	public function del()
 	{
 		$id = $this->input->post('id');
-		$result = $this->user_model->update(array('status'=>1), $id);
+		$result = $this->user_model->update(array('status'=>3), $id);
 		if($result){
 			echo 'success';
 		}
@@ -200,4 +200,4 @@ public function _upload($filename)
 		return json_decode($result,1);
 	}
 
-}
+}