Merge pull request #112 from jpush/dev

Dev
jpush · Nov 29, 2016 · 57df985 · 57df985
2 parents a68af2d + 94a2b9f
commit 57df985
Show file tree

Hide file tree

Showing 93 changed files with 3,295 additions and 530 deletions.
diff --git a/JChat/AndroidManifest.xml b/JChat/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.jchat.android"
-    android:versionCode="55"
-    android:versionName="1.3.3">
+    android:versionCode="56"
+    android:versionName="1.3.4">
 
     <uses-sdk
         android:minSdkVersion="9"
@@ -23,30 +23,39 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
 
     <!-- JMessage Demo required for record audio-->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <!-- Optional for location -->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
     <application
         android:name="io.jchat.android.application.JChatDemoApplication"
         android:allowBackup="true"
         android:configChanges="fontScale"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/noTitle"
-        android:screenOrientation="portrait">
+        android:screenOrientation="portrait"
+        android:theme="@style/noTitle">
+
+        <meta-data android:name="AA_DB_NAME" android:value="jchat.db"/>
+        <meta-data
+            android:name="AA_MODELS"
+            android:value="io.jchat.android.database.UserEntry, io.jchat.android.database.FriendEntry,
+             io.jchat.android.database.FriendRecommendEntry" />
+        <meta-data
+            android:name="AA_DB_VERSION"
+            android:value="4"/>
 
         <!-- Required Push SDK核心功能-->
         <service
@@ -129,6 +138,12 @@
 
         </service>
 
+        <service android:name="com.baidu.location.f" android:enabled="true"
+            android:process=":remote">
+        </service>
+        <meta-data android:name="com.baidu.lbsapi.API_KEY"
+            android:value="UAkQeBK84ioVGzYgA1rSWYfuD4xYtpmV"/>
+
         <!-- Required. Enable it you can get statistics data with channel -->
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -140,16 +155,17 @@
 
         <activity
             android:name="io.jchat.android.activity.BaseActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="io.jchat.android.activity.LoginActivity"
-            android:theme="@style/noTitle"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden"/>
+            android:theme="@style/noTitle"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
         <activity
             android:name="io.jchat.android.activity.MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -159,62 +175,52 @@
         <activity
             android:name="io.jchat.android.activity.RegisterActivity"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="io.jchat.android.activity.MeInfoActivity" />
+        <activity android:name="io.jchat.android.activity.MeInfoActivity" />
         <activity
             android:name="io.jchat.android.chatting.ChatActivity"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="io.jchat.android.activity.ReloginActivity"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden"/>
-        <activity
-            android:name="io.jchat.android.activity.ChatDetailActivity" />
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        <activity android:name="io.jchat.android.activity.ChatDetailActivity" />
         <activity
             android:name="io.jchat.android.activity.GroupSettingActivity"
             android:theme="@style/group_setting_dialog" />
-        <activity
-            android:name="io.jchat.android.activity.FriendInfoActivity" />
-        <activity
-            android:name="io.jchat.android.activity.CreateGroupActivity" />
-        <activity
-            android:name="io.jchat.android.activity.PickPictureTotalActivity" />
-        <activity
-            android:name="io.jchat.android.activity.PickPictureActivity" />
-        <activity
-            android:name="io.jchat.android.activity.BrowserViewPagerActivity" />
-        <activity
-            android:name="io.jchat.android.activity.SettingActivity" />
-        <activity
-            android:name="io.jchat.android.activity.NotificationSettingActivity" />
-        <activity
-            android:name="io.jchat.android.activity.DisturbSettingActivity" />
+        <activity android:name="io.jchat.android.activity.FriendInfoActivity" />
+        <activity android:name="io.jchat.android.activity.CreateGroupActivity" />
+        <activity android:name="io.jchat.android.activity.PickPictureTotalActivity" />
+        <activity android:name="io.jchat.android.activity.PickPictureActivity" />
+        <activity android:name="io.jchat.android.activity.BrowserViewPagerActivity" />
+        <activity android:name="io.jchat.android.activity.SettingActivity" />
+        <activity android:name="io.jchat.android.activity.NotificationSettingActivity" />
+        <activity android:name="io.jchat.android.activity.DisturbSettingActivity" />
         <activity
             android:name="io.jchat.android.activity.ResetPasswordActivity"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible"/>
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
         <activity
             android:name="io.jchat.android.activity.FixProfileActivity"
             android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
         <activity
             android:name="io.jchat.android.activity.ResetNickNameActivity"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible"/>
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
         <activity
             android:name="io.jchat.android.activity.SelectAreaActivity"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible"/>
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
         <activity
             android:name="io.jchat.android.activity.EditSignatureActivity"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible"/>
-        <activity
-            android:name="io.jchat.android.activity.EditNoteNameActivity" />
-        <activity
-            android:name="io.jchat.android.activity.AboutActivity" />
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
+        <activity android:name="io.jchat.android.activity.EditNoteNameActivity" />
+        <activity android:name="io.jchat.android.activity.AboutActivity" />
         <activity
             android:name="io.jchat.android.activity.SelectFriendActivity"
-            android:windowSoftInputMode="adjustPan"/>
-        <activity
-            android:name="io.jchat.android.activity.MembersInChatActivity" />
-        <activity
-            android:name="io.jchat.android.activity.CropImageActivity" />
-
+            android:windowSoftInputMode="adjustPan" />
+        <activity android:name="io.jchat.android.activity.MembersInChatActivity" />
+        <activity android:name="io.jchat.android.activity.CropImageActivity" />
+        <activity android:name="io.jchat.android.activity.FriendRecommendActivity" />
+        <activity android:name="io.jchat.android.activity.SearchFriendActivity" />
+        <activity android:name="io.jchat.android.activity.SearchFriendDetailActivity" />
+        <activity android:name="io.jchat.android.activity.SendInvitationActivity" />
+        <activity android:name="io.jchat.android.activity.SendLocationActivity"/>
     </application>
 
 </manifest>
diff --git a/JChat/build.gradle b/JChat/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "io.jchat.android"
@@ -74,6 +74,8 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
+    compile files('libs/BaiduLBS_Android.jar')
 }
 
 

diff --git a/JChat/libs/BaiduLBS_Android.jar b/JChat/libs/BaiduLBS_Android.jar
diff --git a/JChat/libs/arm64-v8a/libBaiduMapSDK_base_v4_1_1.so b/JChat/libs/arm64-v8a/libBaiduMapSDK_base_v4_1_1.so
diff --git a/JChat/libs/arm64-v8a/libBaiduMapSDK_map_v4_1_1.so b/JChat/libs/arm64-v8a/libBaiduMapSDK_map_v4_1_1.so
diff --git a/JChat/libs/arm64-v8a/liblocSDK7.so b/JChat/libs/arm64-v8a/liblocSDK7.so
diff --git a/JChat/libs/armeabi-v7a/libBaiduMapSDK_base_v4_1_1.so b/JChat/libs/armeabi-v7a/libBaiduMapSDK_base_v4_1_1.so
diff --git a/JChat/libs/armeabi-v7a/libBaiduMapSDK_map_v4_1_1.so b/JChat/libs/armeabi-v7a/libBaiduMapSDK_map_v4_1_1.so
diff --git a/JChat/libs/armeabi-v7a/liblocSDK7.so b/JChat/libs/armeabi-v7a/liblocSDK7.so
diff --git a/JChat/libs/armeabi/libBaiduMapSDK_base_v4_1_1.so b/JChat/libs/armeabi/libBaiduMapSDK_base_v4_1_1.so
diff --git a/JChat/libs/armeabi/libBaiduMapSDK_map_v4_1_1.so b/JChat/libs/armeabi/libBaiduMapSDK_map_v4_1_1.so
diff --git a/JChat/libs/armeabi/liblocSDK7.so b/JChat/libs/armeabi/liblocSDK7.so
diff --git a/JChat/libs/x86/libBaiduMapSDK_base_v4_1_1.so b/JChat/libs/x86/libBaiduMapSDK_base_v4_1_1.so
diff --git a/JChat/libs/x86/libBaiduMapSDK_map_v4_1_1.so b/JChat/libs/x86/libBaiduMapSDK_map_v4_1_1.so
diff --git a/JChat/libs/x86/liblocSDK7.so b/JChat/libs/x86/liblocSDK7.so
diff --git a/JChat/libs/x86_64/libBaiduMapSDK_base_v4_1_1.so b/JChat/libs/x86_64/libBaiduMapSDK_base_v4_1_1.so
diff --git a/JChat/libs/x86_64/libBaiduMapSDK_map_v4_1_1.so b/JChat/libs/x86_64/libBaiduMapSDK_map_v4_1_1.so
diff --git a/JChat/libs/x86_64/liblocSDK7.so b/JChat/libs/x86_64/liblocSDK7.so
diff --git a/JChat/res/drawable-hdpi/custom_loc.png b/JChat/res/drawable-hdpi/custom_loc.png
diff --git a/JChat/res/drawable-hdpi/location.png b/JChat/res/drawable-hdpi/location.png
diff --git a/JChat/res/drawable-hdpi/location_tips.9.png b/JChat/res/drawable-hdpi/location_tips.9.png
diff --git a/JChat/res/drawable-hdpi/oval.png b/JChat/res/drawable-hdpi/oval.png
diff --git a/JChat/res/drawable/contact_divider.xml b/JChat/res/drawable/contact_divider.xml
@@ -0,0 +1,5 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/me_split_line_color" />
+</shape>
diff --git a/JChat/res/drawable/default_input_without_bg.xml b/JChat/res/drawable/default_input_without_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <solid android:color="#FFFFFF" />
+
+            <stroke android:width="0dp" android:color="#E5E5E5" />
+
+        </shape>
+    </item>
+
+</selector>
diff --git a/JChat/res/drawable/jmui_rounded_bg.xml b/JChat/res/drawable/jmui_rounded_bg.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/item_click_bg_color" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+
+</selector>
diff --git a/JChat/res/drawable/letter_hint_bg.xml b/JChat/res/drawable/letter_hint_bg.xml
@@ -2,11 +2,7 @@
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <gradient
-        android:startColor="@color/letter_hint_start_color"
-        android:endColor="@color/leter_hint_end_color"
-        android:angle="90">
-    </gradient>
+    <solid android:color="#858585"/>
 
     <corners android:radius="10dp"/>
 

diff --git a/JChat/res/drawable/search_btn_bg.xml b/JChat/res/drawable/search_btn_bg.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <gradient
-        android:angle="270"
-        android:endColor="#6AA8FD"
-        android:startColor="#9AC4FF" />
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/jmui_jpush_blue"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:angle="270"
+                android:endColor="#6AA8FD"
+                android:startColor="#9AC4FF" />
+        </shape>
+    </item>
 
-</shape>
+</selector>
diff --git a/JChat/res/layout/activity_all_members.xml b/JChat/res/layout/activity_all_members.xml
@@ -43,6 +43,7 @@
             android:id="@+id/right_btn"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:padding="10dp"
             android:layout_alignParentRight="true"
             android:background="@drawable/send_picture_btn_bg"
             android:text="@string/add"

diff --git a/JChat/res/layout/activity_friend_recommend.xml b/JChat/res/layout/activity_friend_recommend.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff">
+
+    <include layout="@layout/menu_title_bar"/>
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/friend_recommend_list_view">
+
+    </ListView>
+
+</LinearLayout>
diff --git a/JChat/res/layout/activity_search_friend.xml b/JChat/res/layout/activity_search_friend.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff">
+
+    <include layout="@layout/menu_title_bar_with_button"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="visible">
+
+        <EditText
+            android:id="@+id/search_et"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="10"
+            android:background="@drawable/jmui_chat_input_bg"
+            android:cursorVisible="true"
+            android:textCursorDrawable="@drawable/jmui_text_cursor_bg"
+            android:hint="@string/search"
+            android:padding="10dp"
+            android:textColor="#808080"
+            android:textSize="20sp" />
+
+        <ImageButton
+            android:id="@+id/search_btn"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:src="@drawable/search"
+            android:background="@drawable/search_btn_bg" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/me_split_line_color"/>
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/search_list_view">
+    </ListView>
+
+</LinearLayout>