1.修复群组相关错误

2.优化群组相关设置 3.增加地区 4.完善详情页显示 5.增加好友拒绝
huangfangyi · Oct 9, 2016 · 5d35693 · 5d35693
1 parent 837403a
commit 5d35693
Show file tree

Hide file tree

Showing 55 changed files with 2,797 additions and 1,053 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -75,6 +75,18 @@
             android:theme="@style/horizontal_slide"
             android:windowSoftInputMode="adjustResize"></activity>
 
+        <activity
+            android:name=".main.activity.PasswordResetActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/horizontal_slide"
+            android:windowSoftInputMode="adjustResize"></activity>
+
+        <activity
+            android:name=".main.activity.RegionActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/horizontal_slide"
+            android:windowSoftInputMode="adjustResize"></activity>
+
         <!-- 注册 -->
         <activity
             android:name=".main.activity.RegisterActivity"
@@ -419,16 +431,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/horizontal_slide"
             android:windowSoftInputMode="adjustResize"></activity>
-        <activity
-            android:name=".main.activity.AnswerCardActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/horizontal_slide"
-            android:windowSoftInputMode="adjustResize"></activity>
-        <activity
-            android:name=".main.activity.QuestionCardActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/horizontal_slide"
-            android:windowSoftInputMode="adjustResize"></activity>
 
         <!--  UCLOUD-->
         <activity

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
@@ -59,9 +59,14 @@ dependencies {
     compile project(':library')
     compile 'com.tencent.bugly:crashreport:2.2.0' //其
     //ucloud相关
+
     compile project(':ulive-android-sdk')
+
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.squareup.okhttp3:okhttp:3.3.1'
+
+
+
     compile fileTree(dir: 'libs', include: '*.jar', exclude: 'android-support-multidex.jar')
 
 

diff --git a/easeuilibrary/res/layout/ease_row_sent_picture.xml b/easeuilibrary/res/layout/ease_row_sent_picture.xml
@@ -29,13 +29,17 @@
 
         <RelativeLayout
             android:id="@+id/bubble"
+
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/margin_chat_activity"
             android:background="@drawable/ease_chatto_bg"
             android:layout_toLeftOf="@id/iv_userhead" >
 
             <ImageView
+                android:maxWidth="80dp"
+                android:maxHeight="160dp"
+                android:adjustViewBounds="true"
                 android:id="@+id/image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

diff --git a/easeuilibrary/res/values-zh-rCN/ease_strings.xml b/easeuilibrary/res/values-zh-rCN/ease_strings.xml
@@ -80,7 +80,7 @@
     <string name="now_refresh_list">正在刷新联系人</string>
     <string name="Application_and_notify">申请与通知</string>
     <string name="save_new_nickname">保存</string>
-    <string name="nickname_description">设置此昵称以后，在与iOS客户端demo聊天过程中，iOS一侧会显示此昵称而不是环信ID，如果对方使用安卓客户端则此设置不生效</string>
+    <string name="nickname_description">设置此昵称以后，在与iOS客户端demo聊天过程中，iOS一侧会显示此昵称而不是凡信ID，如果对方使用安卓客户端则此设置不生效</string>
     <string name="group_chat">群聊</string>
     <string name="chat_room">聊天室</string>
     <string name="add_friend">添加好友</string>
@@ -289,7 +289,7 @@
     <string name="searching">正在搜索..</string>
     <string name="hanging_up">正在挂断..</string>
     <string name="illegal_user_name">用户名不合法</string>
-    <string name="robot_chat">环信小助手</string>
+    <string name="robot_chat">凡信小助手</string>
     <string name="title_user_profile">个人资料</string>
     <string name="nickname">昵称</string>
     <string name="dl_title_upload_photo">上传头像</string>

diff --git a/easeuilibrary/src/com/fanxin/easeui/EaseConstant.java b/easeuilibrary/src/com/fanxin/easeui/EaseConstant.java
@@ -33,4 +33,9 @@ public class EaseConstant {
 
     public static final String HOST = "http://120.24.211.126/fanxin3/";
     public static final String URL_AVATAR= HOST + "upload/";
+
+    public static final String MESSAGE_ACK_TIME="MESSAGE_ACK_TIME";
+    public static final String ACTION_DELETE_MSG="ACTION_DELETE_MSG";
+
+    public static final String DELETE_MESSAGE_TIME="DELETE_MESSAGE_TIME";
 }
diff --git a/easeuilibrary/src/com/fanxin/easeui/widget/chatrow/EaseChatRowImage.java b/easeuilibrary/src/com/fanxin/easeui/widget/chatrow/EaseChatRowImage.java
@@ -109,7 +109,7 @@ protected void onBubbleClick() {
      * 
      * @param thumbernailPath
      * @param iv
-     * @param position
+     * @param
      * @return the image exists or not
      */
     private boolean showImageView(final String thumbernailPath, final ImageView iv, final String localFullSizePath,final EMMessage message) {
@@ -126,14 +126,14 @@ private boolean showImageView(final String thumbernailPath, final ImageView iv,
                 protected Bitmap doInBackground(Object... args) {
                     File file = new File(thumbernailPath);
                     if (file.exists()) {
-                        return EaseImageUtils.decodeScaleImage(thumbernailPath, 160, 160);
+                        return EaseImageUtils.decodeScaleImage(thumbernailPath, 420, 420);
                     } else if (new File(imgBody.thumbnailLocalPath()).exists()) {
-                        return EaseImageUtils.decodeScaleImage(imgBody.thumbnailLocalPath(), 160, 160);
+                        return EaseImageUtils.decodeScaleImage(imgBody.thumbnailLocalPath(), 420, 420);
                     }
                     else {
                         if (message.direct() == EMMessage.Direct.SEND) {
                             if (localFullSizePath != null && new File(localFullSizePath).exists()) {
-                                return EaseImageUtils.decodeScaleImage(localFullSizePath, 160, 160);
+                                return EaseImageUtils.decodeScaleImage(localFullSizePath, 420, 420);
                             } else {
                                 return null;
                             }

diff --git a/easeuilibrary/src/com/fanxin/easeui/widget/chatrow/EaseChatRowVideo.java b/easeuilibrary/src/com/fanxin/easeui/widget/chatrow/EaseChatRowVideo.java
@@ -139,7 +139,7 @@ private void showVideoThumbView(final String localThumb, final ImageView iv, Str
                 @Override
                 protected Bitmap doInBackground(Void... params) {
                     if (new File(localThumb).exists()) {
-                        return ImageUtils.decodeScaleImage(localThumb, 160, 160);
+                        return ImageUtils.decodeScaleImage(localThumb, 320, 320);
                     } else {
                         return null;
                     }

diff --git a/gradle.properties b/gradle.properties
@@ -5,19 +5,20 @@
 #
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Wed Jul 13 22:50:32 CST 2016
-
+#Sun Oct 09 21:09:19 CST 2016
+systemProp.http.proxyPort=1080
 android.useDeprecatedNdk=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=1024m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
-
+systemProp.https.proxyHost=127.0.0.1
 org.gradle.configureondemand=true
-
+systemProp.http.proxyHost=127.0.0.1
+systemProp.https.proxyPort=1080
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sun Oct 09 21:09:35 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/redpacketlibrary/res/values-zh/em_strings.xml b/redpacketlibrary/res/values-zh/em_strings.xml
@@ -2,7 +2,7 @@
     <string name="msg_take_red_packet">你领取了自己的红包</string>
     <string name="msg_take_someone_red_packet">你领取了%1$s的红包</string>
     <string name="msg_someone_take_red_packet">%1$s领取了你的红包</string>
-    <string name="easemob_red_packet">环信红包</string>
+    <string name="easemob_red_packet">凡信红包</string>
     <string name="attach_red_packet">红包</string>
     <string name="change">零钱</string>
     <string name="exclusive_red_packet">专属红包</string>

diff --git a/redpacketlibrary/src/com/easemob/redpacketui/utils/RedPacketUtil.java b/redpacketlibrary/src/com/easemob/redpacketui/utils/RedPacketUtil.java
@@ -51,7 +51,7 @@ public class RedPacketUtil {
      * @param toChatUsername
      * @param requestCode
      */
-    public static void startRedPacketActivityForResult(FragmentActivity fragment, int chatType, final String toChatUsername, int requestCode, final JSONArray membersJA) {
+    public static void startRedPacketActivityForResult(Fragment  fragment, int chatType, final String toChatUsername, int requestCode, final JSONArray membersJA) {
         //发送者头像url
         String fromAvatarUrl = "none";
         //发送者昵称 设置了昵称就传昵称 否则传id
@@ -136,7 +136,7 @@ public void getGroupMember(final String groupID, final GroupMemberCallback mCall
             redPacketInfo.groupMemberCount = group.getAffiliationsCount();
             redPacketInfo.chatType = RPConstant.CHATTYPE_GROUP;
         }
-        Intent intent = new Intent(fragment, RPRedPacketActivity.class);
+        Intent intent = new Intent(fragment.getContext(), RPRedPacketActivity.class);
         intent.putExtra(RPConstant.EXTRA_RED_PACKET_INFO, redPacketInfo);
         intent.putExtra(RPConstant.EXTRA_TOKEN_DATA, getTokenData());
         fragment.startActivityForResult(intent, requestCode);

diff --git a/res/layout/activity_psw_reset.xml b/res/layout/activity_psw_reset.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/height_top_bar"
+        android:layout_marginBottom="33dp"
+        android:background="@color/fx_common_top_bar_blue">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:onClick="back"
+            android:paddingBottom="5dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="5dp"
+            android:scaleType="centerInside"
+            android:src="@drawable/fx_topbar_back" />
+
+        <View
+            android:id="@+id/view_temp"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_toRightOf="@id/iv_back"
+            android:background="#14191A" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/view_temp"
+            android:text="@string/psw_reset"
+            android:textColor="#ffffff"
+            android:textSize="18sp" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginTop="40dp">
+
+        <EditText
+            android:id="@+id/et_usertel"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/fx_bg_et"
+            android:hint="你的手机号码"
+            android:inputType="phone"
+            android:paddingLeft="90dp"
+            android:singleLine="true"
+            android:textColorHint="#DDDDDD"
+            android:textSize="16sp" />
+
+        <TextView
+            android:layout_width="90dp"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/et_usertel"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="24dp"
+            android:gravity="center_vertical"
+            android:text="+86"
+            android:textColor="#353535"
+            android:textSize="16sp" />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+
+        android:layout_height="48dp"
+        android:layout_margin="13dp"
+        android:layout_marginTop="20dp">
+
+
+        <EditText
+            android:id="@+id/et_password"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignBottom="@+id/tv_password"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:background="@drawable/fx_bg_et"
+            android:hint="填写密码"
+            android:inputType="textPassword"
+            android:paddingLeft="90dp"
+            android:singleLine="true"
+            android:textColorHint="#DDDDDD"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_password"
+            android:layout_width="90dp"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/et_password"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:gravity="center_vertical"
+            android:text="新密码"
+            android:textColor="#353535"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_margin="13dp"
+        android:layout_marginTop="20dp">
+
+        <EditText
+            android:id="@+id/et_password_confire"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/fx_bg_et"
+            android:hint="填写密码"
+
+            android:inputType="textPassword"
+            android:paddingLeft="90dp"
+            android:singleLine="true"
+            android:textColorHint="#DDDDDD"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_password_confire"
+            android:layout_width="90dp"
+            android:layout_height="match_parent"
+            android:layout_alignLeft="@id/et_password_confire"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:gravity="center_vertical"
+            android:text="确认密码"
+            android:textColor="#353535"
+            android:textSize="16sp" />
+
+
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/btn_ok"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="13dp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/fx_bg_btn_green"
+        android:text="重置密码"
+
+        android:textColor="@android:color/white"
+        android:textSize="18sp" />
+</LinearLayout>