1. 服务器支持 Windows 操作系统编译、调试和部署，可以直接使用 Visual Studio 2019 打开 FlamingoSe…

…rver.sln 文件即可一键编译到底；

2. 安卓版本实现了除发送图片以外的所有功能（发送图片下一版更新）；
3. 网络库优化。

docs/协议说明.txt

@@ -0,0 +1,5 @@
+聊天服务器协议定义于：
+flamingoserver/chatserversrc/Msg.h
+
+文件传输协议定义于：
+flamingoserver/fileserversrc/FileMsg.h

docs/添加好友.md

@@ -0,0 +1,30 @@
+# 添加好友
+
+## 流程
+
+### 搜索好友
+
+```java
+//请求，使用用户名搜索
+cmd = 1004, seq = 0, {"type": 1, "username": "zhangyl"}
+
+//应答
+cmd = 1004, seq = 0, { "code": 0, "msg": "ok", "userinfo": [{"userid": 2, "username": "qqq", "nickname": "qqq123", "facetype":0}] }
+```
+
+facetype 为用户头像编号，在本地取。
+
+### 添加好友
+
+```java
+//A向B发出加好友申请
+cmd = 1005, seq = 0, {"userid": 9, "type": 1}
+//B收到A的好友申请，存数据库，进入添加好友页面时显示
+cmd = 1005, seq = 0, {"userid": 9, "type": 2, "username": "xxx"}
+//B在添加好友页面点击同意，向服务器发数据
+cmd = 1005, seq = 0, {"userid": 9, "type": 3, "username": "xxx", "accept": 1}
+// A收到B的同意信息，存入数据库。 和 msg.h 有差异
+cmd = 1005, seq = 0, {"userid": 9, "type": 3, "username": "xxx", "accept": 1}
+```
+
+

flamingoAndroid/app/build.gradle

@@ -1,8 +1,9 @@
 apply plugin: 'com.android.application'
+apply plugin: 'org.greenrobot.greendao'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
     useLibrary 'org.apache.http.legacy'
 
     aaptOptions {
@@ -12,8 +13,8 @@ android {
 
     defaultConfig {
         applicationId "org.hootina.flamingo"
-        minSdkVersion 9
-        targetSdkVersion 21
+        minSdkVersion 11
+        targetSdkVersion 19
     }
 
     buildTypes {
@@ -22,19 +23,34 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    greendao {
+        schemaVersion 1 //数据库版本号
+        daoPackage 'org.hootina.platform.db'
+        // 设置DaoMaster、DaoSession、Dao 包名
+        targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
+    }
+
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.protobuf:protobuf-java:2.5.0'
-    compile files('libs/commons-lang-2.5.jar')
-    compile files('libs/commons-logging-1.1.1.jar')
-    compile files('libs/ezmorph-1.0.6.jar')
-    compile files('libs/fastjson-1.0.4-sources.jar')
-    compile files('libs/fastjson-1.1.33.jar')
-    compile files('libs/json-lib-2.4-jdk15.jar')
-    compile files('libs/json.jar')
-    compile files('libs/universal-image-loader-1.9.3.jar')
-    compile files('libs/xlistview.jar')
-    compile files('libs/xUtils-2.6.14.jar')
+    implementation 'com.tencent.bugly:crashreport:2.1.5'
+
+    implementation 'com.google.protobuf:protobuf-java:2.5.0'
+    implementation files('libs/commons-lang-2.5.jar')
+    implementation files('libs/commons-logging-1.1.1.jar')
+    implementation files('libs/ezmorph-1.0.6.jar')
+    implementation files('libs/fastjson-1.0.4-sources.jar')
+    implementation files('libs/fastjson-1.1.33.jar')
+    implementation files('libs/json-lib-2.4-jdk15.jar')
+    implementation files('libs/json.jar')
+    implementation files('libs/universal-image-loader-1.9.3.jar')
+    implementation files('libs/xlistview.jar')
+    implementation files('libs/xUtils-2.6.14.jar')
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.android.support:appcompat-v7:24.2.1'
+    implementation 'com.android.support:support-v4:24.2.1'
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.android.support:recyclerview-v7:24.2.1'
+    implementation 'org.greenrobot:greendao:3.2.2'
 }

flamingoAndroid/app/proguard-rules.pro

@@ -0,0 +1,20 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}

flamingoAndroid/app/src/main/AndroidManifest.xml

@@ -30,8 +30,13 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RESTART_PACKAGES" >
-    </uses-permission>
+    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
+    <!-- bugly权限 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
     <application
         android:name=".FlamingoApplication"
@@ -104,15 +109,15 @@
             android:screenOrientation="portrait" />
         <!-- 收藏 -->
         <activity
-            android:name=".activities.member.ShoucangActivity"
+            android:name=".activities.member.FavoriteActivity"
             android:screenOrientation="portrait" />
         <!-- 个人信息 -->
         <activity
-            android:name=".activities.member.MyPersonInfo"
+            android:name=".activities.member.MyPersonInfoActivity"
             android:screenOrientation="portrait" />
          <!-- 群列表-->
         <activity
-            android:name=".activities.member.GroupActivity"
+            android:name=".activities.member.GroupListActivity"
             android:screenOrientation="portrait" />
         <!-- 好友详细资料 -->
         <activity