Skip to content

Commit 602d455

Browse files
TommyLemonTommyLemon
committed
Client：解决EditTextInfoActivity最长24限制；调整UserActivity界面
1 parent c43b84a commit 602d455

5 files changed

Lines changed: 84 additions & 59 deletions

File tree

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/moment_view.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
android:paddingRight="@dimen/moment_view_head_padding_right" >
1818

1919
<ImageView
20+
android:background="@color/alpha_3"
2021
android:id="@+id/ivMomentViewHead"
2122
android:layout_width="match_parent"
2223
android:layout_height="match_parent"

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/user_activity.xml‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,6 @@
4040
android:layout_marginTop="@dimen/padding_huge" >
4141
</LinearLayout>
4242

43-
<View style="@style/divider_horizontal_1px" />
44-
45-
<LinearLayout style="@style/edit_item" >
46-
47-
<TextView
48-
style="@style/edit_item_left_tv"
49-
android:text="备注" />
50-
51-
<EditText
52-
android:id="@+id/etUserRemark"
53-
style="@style/edit_item_right_et"
54-
android:layout_weight="1"
55-
android:hint="点击这里来编辑"
56-
android:maxLength="90" />
57-
58-
<ImageView
59-
android:id="@+id/ivUserRemarkClear"
60-
style="@style/edit_item_right_clear" />
61-
</LinearLayout>
62-
63-
<View
64-
style="@style/divider_horizontal_1px"
65-
android:layout_marginBottom="@dimen/padding_huge" />
66-
6743
<LinearLayout
6844
android:id="@+id/llUserMoment"
6945
style="@style/content_item_white"
@@ -88,6 +64,25 @@
8864

8965
<View style="@style/divider_horizontal_1px" />
9066

67+
<LinearLayout
68+
android:id="@+id/llUserRemark"
69+
style="@style/content_item_white" >
70+
71+
<TextView
72+
style="@style/content_item_lf_tv_black"
73+
android:text="备注" />
74+
75+
<TextView
76+
android:id="@+id/tvUserRemark"
77+
android:singleLine="true"
78+
style="@style/content_item_rt_tv"
79+
android:layout_weight="1" />
80+
81+
<ImageView style="@style/content_item_rt_img" />
82+
</LinearLayout>
83+
84+
<View style="@style/divider_horizontal_1px" />
85+
9186
<LinearLayout
9287
android:id="@+id/llUserTag"
9388
style="@style/content_item_white" >

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/UserActivity.java‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import zuo.biao.library.ui.EditTextInfoWindow;
3535
import zuo.biao.library.ui.GridAdapter;
3636
import zuo.biao.library.ui.SelectPictureActivity;
37-
import zuo.biao.library.ui.TextClearSuit;
3837
import zuo.biao.library.ui.WebViewActivity;
3938
import zuo.biao.library.util.CommonUtil;
4039
import zuo.biao.library.util.DataKeeper;
@@ -51,7 +50,6 @@
5150
import android.view.View.OnClickListener;
5251
import android.view.View.OnTouchListener;
5352
import android.view.ViewGroup;
54-
import android.widget.EditText;
5553
import android.widget.GridView;
5654
import android.widget.TextView;
5755
import apijson.demo.client.R;
@@ -129,7 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
129127
private View llUserMoment;
130128
private GridView gvUserMoment;
131129

132-
private EditText etUserRemark;
130+
private TextView tvUserRemark;
133131
private TextView tvUserTag;
134132

135133
private ViewGroup llUserBottomMenuContainer;
@@ -157,10 +155,10 @@ public void initView() {//必须调用
157155
llUserMoment = findViewById(R.id.llUserMoment);
158156
gvUserMoment = (GridView) findViewById(R.id.gvUserMoment);
159157

160-
etUserRemark = (EditText) findViewById(R.id.etUserRemark);
158+
tvUserRemark = (TextView) findViewById(R.id.tvUserRemark);
161159
tvUserTag = (TextView) findViewById(R.id.tvUserTag);
162160

163-
161+
llUserMoment.setVisibility(isOnEditMode ? View.GONE : View.VISIBLE);
164162
if (isOnEditMode == false) {
165163
//添加底部菜单<<<<<<<<<<<<<<<<<<<<<<
166164
llUserBottomMenuContainer = (ViewGroup) findViewById(R.id.llUserBottomMenuContainer);
@@ -209,7 +207,7 @@ public void run() {
209207
// uvlUser.bindView(user);//方式二
210208
userView.bindView(user);//方式三
211209

212-
etUserRemark.setText(StringUtil.getTrimedString(user.getHead()));
210+
tvUserRemark.setText(StringUtil.getTrimedString(user.getHead()));
213211
tvUserTag.setText(StringUtil.getTrimedString(user.getTag()));
214212

215213
if (adapter == null) {
@@ -275,7 +273,9 @@ public void run() {
275273
public void run() {
276274
//先加载缓存数据，比网络请求快很多
277275
user = CacheManager.getInstance().get(User.class, "" + id);
278-
momentList = CacheManager.getInstance().getList(Moment.class, "userId=" + id, 0, 3);
276+
if (isOnEditMode == false) {
277+
momentList = CacheManager.getInstance().getList(Moment.class, "userId=" + id, 0, 3);
278+
}
279279
runUiThread(new Runnable() {
280280

281281
@Override
@@ -284,7 +284,7 @@ public void run() {
284284
}
285285
});
286286

287-
HttpRequest.getUser(id, true, HTTP_GET, UserActivity.this);
287+
HttpRequest.getUser(id, ! isOnEditMode, HTTP_GET, UserActivity.this);
288288
}
289289
});
290290

@@ -326,8 +326,6 @@ private void putUser() {
326326
@Override
327327
public void initEvent() {//必须调用
328328

329-
findViewById(R.id.llUserTag).setOnClickListener(this);
330-
331329
llUserMoment.setOnClickListener(this);
332330
gvUserMoment.setOnTouchListener(new OnTouchListener() {
333331

@@ -339,10 +337,11 @@ public boolean onTouch(View v, MotionEvent event) {
339337
}
340338
});
341339

342-
new TextClearSuit().addClearListener(etUserRemark, findViewById(R.id.ivUserRemarkClear));//清空备注按钮点击监听
343-
344340

345341
if (isOnEditMode) {
342+
findViewById(R.id.llUserRemark).setOnClickListener(this);
343+
findViewById(R.id.llUserTag).setOnClickListener(this);
344+
346345
userView.setOnDataChangedListener(new OnDataChangedListener() {
347346

348347
@Override
@@ -508,9 +507,13 @@ public void onClick(View v) {
508507
case R.id.llUserMoment:
509508
toActivity(MomentListActivity.createIntent(context, id));
510509
break;
510+
case R.id.llUserRemark:
511+
toActivity(EditTextInfoActivity.createIntent(context, EditTextInfoActivity.TYPE_WEBSITE, "备注"
512+
, StringUtil.getTrimedString(tvUserRemark)), REQUEST_TO_EDIT_TEXT_INFO_REMARK);
513+
break;
511514
case R.id.llUserTag:
512515
toActivity(EditTextInfoActivity.createIntent(context, "标签"
513-
, StringUtil.getTrimedString(tvUserTag)), REQUEST_TO_EDIT_TEXT_INFO);
516+
, StringUtil.getTrimedString(tvUserTag)), REQUEST_TO_EDIT_TEXT_INFO_TAG);
514517
break;
515518
default:
516519
break;
@@ -543,9 +546,10 @@ public void onDialogButtonClick(int requestCode, boolean isPositive) {
543546
private static final int REQUEST_TO_BOTTOM_MENU = 1;
544547
private static final int REQUEST_TO_SELECT_PICTURE = 2;
545548
private static final int REQUEST_TO_CUT_PICTURE = 3;
546-
private static final int REQUEST_TO_EDIT_TEXT_INFO = 4;
547549
private static final int REQUEST_TO_EDIT_TEXT_INFO_NAME = 5;
548550
private static final int REQUEST_TO_EDIT_TEXT_INFO_PHONE = 6;
551+
private static final int REQUEST_TO_EDIT_TEXT_INFO_REMARK = 7;
552+
private static final int REQUEST_TO_EDIT_TEXT_INFO_TAG = 8;
549553

550554
@Override
551555
public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -559,13 +563,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
559563
onBottomMenuItemClick(data.getIntExtra(BottomMenuWindow.RESULT_ITEM_ID, -1));
560564
}
561565
break;
562-
case REQUEST_TO_EDIT_TEXT_INFO:
563566
case REQUEST_TO_EDIT_TEXT_INFO_NAME:
564567
case REQUEST_TO_EDIT_TEXT_INFO_PHONE:
568+
case REQUEST_TO_EDIT_TEXT_INFO_REMARK:
569+
case REQUEST_TO_EDIT_TEXT_INFO_TAG:
565570
if (data == null) {
566571
break;
567572
}
568-
isDataChanged = true;
569573
user = getUser();
570574
String value = data.getStringExtra(EditTextInfoActivity.RESULT_VALUE);
571575
switch (requestCode) {
@@ -575,10 +579,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
575579
case REQUEST_TO_EDIT_TEXT_INFO_PHONE:
576580
user.setPhone(value);
577581
break;
578-
default:
582+
case REQUEST_TO_EDIT_TEXT_INFO_REMARK:
583+
user.setHead(value);
584+
break;
585+
case REQUEST_TO_EDIT_TEXT_INFO_TAG:
579586
user.setTag(value);
580587
break;
588+
default:
589+
return;
581590
}
591+
isDataChanged = true;
582592
setUser(user);
583593
break;
584594
case REQUEST_TO_SELECT_PICTURE:
@@ -603,7 +613,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
603613
@Override
604614
public void finish() {
605615
user = getUser();
606-
user.setHead(StringUtil.getTrimedString(etUserRemark));
616+
user.setHead(StringUtil.getTrimedString(tvUserRemark));
607617
if (isOnEditMode && isDataChanged) {
608618
new AlertDialog(context, "", "资料已改变，需要保存吗？", true, DIALOG_PUT_USER, this).show();
609619
return;

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/ZBLibrary/res/layout/edit_text_info_activity.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,16 @@
2525

2626
<EditText
2727
android:id="@+id/etEditTextInfo"
28-
style="@style/edit_item_right_et"
28+
android:layout_width="match_parent"
29+
android:layout_height="match_parent"
2930
android:layout_marginLeft="@dimen/common_item_left_tv_padding"
3031
android:layout_weight="1"
32+
android:background="@null"
3133
android:focusable="true"
32-
android:focusableInTouchMode="true" >
34+
android:focusableInTouchMode="true"
35+
android:hint="请在这里输入"
36+
android:textColor="@color/black"
37+
android:textSize="17sp" >
3338

3439
<requestFocus />
3540
</EditText>

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/ZBLibrary/src/zuo/biao/library/ui/EditTextInfoActivity.java‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import android.os.Handler.Callback;
3232
import android.os.Message;
3333
import android.text.Editable;
34+
import android.text.InputType;
3435
import android.text.TextWatcher;
3536
import android.util.Log;
3637
import android.view.MotionEvent;
@@ -190,34 +191,47 @@ private void setList(List<String> list) {
190191
private ArrayList<String> list;
191192
@Override
192193
public void initData() {//必须调用
193-
194194
intent = getIntent();
195+
195196
intentType = intent.getIntExtra(INTENT_TYPE, 0);
196197
if (StringUtil.isNotEmpty(intent.getStringExtra(INTENT_KEY), true)) {
197198
tvBaseTitle.setText(StringUtil.getCurrentString());
198199
}
200+
etEditTextInfo.setSingleLine(intentType != TYPE_NOTE);
199201

200-
if (intentType == TYPE_NICK) {
201-
tvEditTextInfoRemind.setText("限10个字（或20个字符）");
202+
switch (intentType) {
203+
case TYPE_NICK:
202204
maxEms = 20;
203-
//etEditTextInfo.setFilters(new InputFilter[]{new InputFilter.LengthFilter(10)});
204-
} else if (intentType == TYPE_PHONE) {
205-
tvEditTextInfoRemind.setText("只能填电话号码哦");
205+
break;
206+
case TYPE_PHONE:
207+
etEditTextInfo.setInputType(InputType.TYPE_CLASS_PHONE);
206208
maxEms = 11;
207-
//etEditTextInfo.setFilters(new InputFilter[]{new InputFilter.LengthFilter(30)});
208-
} else if (intentType == TYPE_PROFESSION) {
209-
hasList = true;
209+
break;
210+
case TYPE_EMAIL:
211+
etEditTextInfo.setInputType(InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
212+
maxEms = 60;
213+
break;
214+
case TYPE_WEBSITE:
215+
etEditTextInfo.setInputType(InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT);
216+
maxEms = 200;
217+
break;
218+
case TYPE_MAILADDRESS:
219+
maxEms = 60;
220+
break;
221+
case TYPE_PROFESSION:
210222
tvEditTextInfoRemind.setText("所属行业");
211-
// etEditTextInfo.setFocusable(false);
212-
// etEditTextInfo.setFocusableInTouchMode(false);
213-
// etEditTextInfo.setEnabled(false);
214-
} else {
215-
tvEditTextInfoRemind.setText("限" + maxEms/2 + "个字（或" + maxEms + "个字符）");
223+
maxEms = 15;
224+
case TYPE_NOTE:
225+
maxEms = 100;
226+
break;
227+
default:
228+
break;
216229
}
217230
etEditTextInfo.setMaxEms(maxEms);
231+
tvEditTextInfoRemind.setText("限" + maxEms/2 + "个字（或" + maxEms + "个字符）");
218232

219-
getList(intentType);
220233

234+
getList(intentType);
221235
}
222236

223237
private int requestSize = 20;

0 commit comments

Comments
 (0)