Skip to content

Commit 349835b

Browse files
DLTech21DLTech21
committed
群名
1 parent 441d7e5 commit 349835b

File tree

10 files changed

+104
-81
lines changed

10 files changed

+104
-81
lines changed

‎app/app.iml‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@
4343
<sourceFolder url="file://$MODULE_DIR$/src/ddDebug/jni" isTestSource="false" />
4444
<sourceFolder url="file://$MODULE_DIR$/src/ddDebug/rs" isTestSource="false" />
4545
<sourceFolder url="file://$MODULE_DIR$/src/ddDebug/shaders" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/dd/debug" isTestSource="true" generated="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/dd/debug" isTestSource="true" generated="true" />
48+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/dd/debug" isTestSource="true" generated="true" />
49+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/dd/debug" isTestSource="true" generated="true" />
50+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/dd/debug" isTestSource="true" generated="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/dd/debug" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/dd/debug" type="java-test-resource" />
4653
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/res" type="java-test-resource" />
4754
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/resources" type="java-test-resource" />
4855
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/assets" type="java-test-resource" />
@@ -51,13 +58,6 @@
5158
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/jni" isTestSource="true" />
5259
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/rs" isTestSource="true" />
5360
<sourceFolder url="file://$MODULE_DIR$/src/testDdDebug/shaders" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/dd/debug" isTestSource="true" generated="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/dd/debug" isTestSource="true" generated="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/dd/debug" isTestSource="true" generated="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/dd/debug" isTestSource="true" generated="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/dd/debug" isTestSource="true" generated="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/dd/debug" type="java-test-resource" />
60-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/dd/debug" type="java-test-resource" />
6161
<sourceFolder url="file://$MODULE_DIR$/src/dd/res" type="java-resource" />
6262
<sourceFolder url="file://$MODULE_DIR$/src/dd/resources" type="java-resource" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/dd/assets" type="java-resource" />
@@ -105,14 +105,6 @@
105105
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
106106
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
107107
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
108-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
109-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
110-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
111-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
112-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
113-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
114-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
115-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
116108
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
117109
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
118110
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -121,10 +113,17 @@
121113
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
122114
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
123115
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
124-
<excludeFolder url="file://$MODULE_DIR$/build/freeline" />
116+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
117+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
118+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
119+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
120+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
121+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
122+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
123+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
125125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
126126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
127-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
128127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
129128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
130129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/SMSSDK-2.1.1/jars" />
@@ -164,19 +163,12 @@
164163
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/pl.droidsonroids.gif/android-gif-drawable/1.2.3/jars" />
165164
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/top.zibin/Luban/1.0.9/jars" />
166165
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
167-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
168-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
169166
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
170-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
171-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
172-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
173167
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
174168
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
175169
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
176170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
177-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
178171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
179-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
180172
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
181173
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
182174
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

‎app/src/main/java/com/dtalk/dd/DB/sp/LoginSp.java‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* @author : yingmu on 15-1-6.
99
* @email : [email protected].
10-
*
10+
* <p>
1111
* todo need Encryption
1212
*/
1313
public class LoginSp {
@@ -22,25 +22,27 @@ public class LoginSp {
2222
SharedPreferences sharedPreferences;
2323

2424
private static LoginSp loginSp = null;
25-
public static LoginSp instance(){
26-
if(loginSp ==null){
27-
synchronized (LoginSp.class){
25+
26+
public static LoginSp instance() {
27+
if (loginSp == null) {
28+
synchronized (LoginSp.class) {
2829
loginSp = new LoginSp();
2930
}
3031
}
3132
return loginSp;
3233
}
33-
private LoginSp(){
34+
35+
private LoginSp() {
3436
}
3537

3638

37-
public void init(Context ctx){
39+
public void init(Context ctx) {
3840
this.ctx = ctx;
39-
sharedPreferences= ctx.getSharedPreferences
40-
(fileName,ctx.MODE_PRIVATE);
41+
sharedPreferences = ctx.getSharedPreferences
42+
(fileName, ctx.MODE_PRIVATE);
4143
}
4244

43-
public void setLoginInfo(String userName,String pwd,int loginId){
45+
public void setLoginInfo(String userName, String pwd, int loginId) {
4446
// 横写
4547
SharedPreferences.Editor editor = sharedPreferences.edit();
4648
editor.putString(KEY_LOGIN_NAME, userName);
@@ -50,23 +52,27 @@ public void setLoginInfo(String userName,String pwd,int loginId){
5052
editor.commit();
5153
}
5254

53-
public SpLoginIdentity getLoginIdentity(){
54-
String userName = sharedPreferences.getString(KEY_LOGIN_NAME,null);
55-
String pwd = sharedPreferences.getString(KEY_PWD,null);
56-
int loginId = sharedPreferences.getInt(KEY_LOGIN_ID,0);
57-
/**pwd不判空: loginOut的时候会将pwd清空*/
58-
if(TextUtils.isEmpty(userName) || loginId == 0){
55+
public SpLoginIdentity getLoginIdentity() {
56+
try {
57+
String userName = sharedPreferences.getString(KEY_LOGIN_NAME, null);
58+
String pwd = sharedPreferences.getString(KEY_PWD, null);
59+
int loginId = sharedPreferences.getInt(KEY_LOGIN_ID, 0);
60+
/**pwd不判空: loginOut的时候会将pwd清空*/
61+
if (TextUtils.isEmpty(userName) || loginId == 0) {
62+
return null;
63+
}
64+
return new SpLoginIdentity(userName, pwd, loginId);
65+
} catch (Exception e) {
5966
return null;
6067
}
61-
return new SpLoginIdentity(userName,pwd,loginId);
6268
}
6369

64-
public class SpLoginIdentity{
70+
public class SpLoginIdentity {
6571
private String loginName;
6672
private String pwd;
6773
private int loginId;
6874

69-
public SpLoginIdentity(String mUserName,String mPwd,int mLoginId){
75+
public SpLoginIdentity(String mUserName, String mPwd, int mLoginId) {
7076
loginName = mUserName;
7177
pwd = mPwd;
7278
loginId = mLoginId;

‎app/src/main/java/com/dtalk/dd/imservice/event/GroupEvent.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,22 @@ public class GroupEvent {
1414
private GroupEntity groupEntity;
1515
private Event event;
1616

17-
/**很多的场景只是关心改变的类型以及change的Ids*/
17+
/**
18+
* 很多的场景只是关心改变的类型以及change的Ids
19+
*/
1820
private int changeType;
1921
private List<Integer> changeList;
2022

21-
public GroupEvent(Event event){
23+
public GroupEvent(Event event) {
2224
this.event = event;
2325
}
2426

25-
public GroupEvent(Event event,GroupEntity groupEntity){
27+
public GroupEvent(Event event, GroupEntity groupEntity) {
2628
this.groupEntity = groupEntity;
2729
this.event = event;
2830
}
2931

30-
public enum Event{
32+
public enum Event {
3133
NONE,
3234

3335
GROUP_INFO_OK,
@@ -67,13 +69,15 @@ public void setChangeList(List<Integer> changeList) {
6769
public GroupEntity getGroupEntity() {
6870
return groupEntity;
6971
}
72+
7073
public void setGroupEntity(GroupEntity groupEntity) {
7174
this.groupEntity = groupEntity;
7275
}
7376

7477
public Event getEvent() {
7578
return event;
7679
}
80+
7781
public void setEvent(Event event) {
7882
this.event = event;
7983
}

‎app/src/main/java/com/dtalk/dd/ui/activity/MessageActivity.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.dtalk.dd.DB.entity.GifEmoEntity;
5555
import com.dtalk.dd.imservice.entity.ShortVideoMessage;
5656
import com.dtalk.dd.imservice.event.AddEmoEvent;
57+
import com.dtalk.dd.imservice.event.GroupEvent;
5758
import com.dtalk.dd.imservice.event.ShortVideoPubEvent;
5859
import com.dtalk.dd.ui.widget.CustomeEmoGridView;
5960
import com.dtalk.dd.utils.RegularUtils;
@@ -1568,4 +1569,12 @@ public void onReceive(Context context, Intent intent) {
15681569
}
15691570
}
15701571
}
1572+
1573+
public void onEventMainThread(GroupEvent event) {
1574+
switch (event.getEvent()) {
1575+
case GROUP_INFO_UPDATED:
1576+
setTitle(event.getGroupEntity().getMainName());
1577+
break;
1578+
}
1579+
}
15711580
}

‎app/src/main/java/com/dtalk/dd/ui/activity/UpdateGroupNameActivity.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,32 @@
1212
import android.view.View;
1313
import android.widget.EditText;
1414

15+
import com.dtalk.dd.DB.entity.GroupEntity;
1516
import com.dtalk.dd.R;
1617
import com.dtalk.dd.http.base.BaseClient;
1718
import com.dtalk.dd.http.user.UserClient;
19+
import com.dtalk.dd.imservice.event.GroupEvent;
1820
import com.dtalk.dd.ui.base.TTBaseActivity;
1921

22+
import de.greenrobot.event.EventBus;
2023

2124
public class UpdateGroupNameActivity extends TTBaseActivity implements View.OnClickListener {
2225
EditText et_nick;
2326
String nick;
2427
String id;
28+
GroupEntity groupEntity;
2529

26-
public static void open(Context context, String id, String name) {
27-
context.startActivity(new Intent(context, UpdateGroupNameActivity.class).putExtra("id", id).putExtra("name", name));
30+
public static void open(Context context, GroupEntity groupEntity) {
31+
context.startActivity(new Intent(context, UpdateGroupNameActivity.class).putExtra("groupEntity", groupEntity));
2832
}
2933

3034
@Override
3135
public void onCreate(Bundle savedInstanceState) {
3236
super.onCreate(savedInstanceState);
3337
LayoutInflater.from(this).inflate(R.layout.activity_update_nick, topContentView);
34-
nick = getIntent().getStringExtra("name");
35-
id = getIntent().getStringExtra("id");
38+
groupEntity = (GroupEntity) getIntent().getSerializableExtra("groupEntity");
39+
nick = groupEntity.getMainName();
40+
id = groupEntity.getId() + "";
3641
et_nick = (EditText) this.findViewById(R.id.et_nick);
3742
et_nick.setText(nick);
3843
setLeftButton(R.drawable.tt_top_back);
@@ -62,6 +67,8 @@ public void onCloseConnection() {
6267

6368
@Override
6469
public void onSuccess(Object data) {
70+
groupEntity.setMainName(newNick);
71+
EventBus.getDefault().post(new GroupEvent(GroupEvent.Event.GROUP_INFO_UPDATED, groupEntity));
6572
finish();
6673
}
6774

‎app/src/main/java/com/dtalk/dd/ui/fragment/GroupManagerFragment.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ private void initAdapter() {
196196
*/
197197
public void onEventMainThread(GroupEvent event) {
198198
switch (event.getEvent()) {
199-
200199
case CHANGE_GROUP_MEMBER_FAIL:
201200
case CHANGE_GROUP_MEMBER_TIMEOUT: {
202201
Toast.makeText(getActivity(), getString(R.string.change_temp_group_failed), Toast.LENGTH_SHORT).show();
@@ -206,6 +205,11 @@ public void onEventMainThread(GroupEvent event) {
206205
onMemberChangeSuccess(event);
207206
}
208207
break;
208+
case GROUP_INFO_UPDATED:
209+
TextView groupNameView = (TextView) curView.findViewById(R.id.group_manager_title);
210+
groupNameView.setText(event.getGroupEntity().getMainName());
211+
imService.getGroupManager().onLocalNetOk();
212+
break;
209213
}
210214
}
211215

@@ -249,8 +253,9 @@ public void onClick(View view) {
249253
switch (view.getId()) {
250254
case R.id.groupname_layout:
251255
GroupEntity groupEntity = (GroupEntity) peerEntity;
252-
UpdateGroupNameActivity.open(getActivity(), groupEntity.getId() + "", groupEntity.getMainName());
256+
UpdateGroupNameActivity.open(getActivity(), groupEntity);
253257
break;
254258
}
255259
}
260+
256261
}

‎app/src/main/java/com/dtalk/dd/ui/widget/message/BaseMsgRenderView.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ public void msgStatusError(final MessageEntity messageEntity) {
8585
*/
8686
public void render(final MessageEntity entity, UserEntity userEntity, final Context ctx) {
8787
this.messageEntity = entity;
88-
// if(userEntity == null){
89-
// userEntity=new UserEntity();
90-
// userEntity.setMainName("未知");
91-
// userEntity.setRealName("未知");
92-
// }
88+
if(userEntity == null){
89+
userEntity=new UserEntity();
90+
userEntity.setMainName("");
91+
userEntity.setRealName("");
92+
}
9393

9494
String avatar = userEntity.getAvatar();
9595
int msgStatus = messageEntity.getStatus();

‎emoj_library/emoj_library.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

0 commit comments

Comments
 (0)