-
Notifications
You must be signed in to change notification settings - Fork 0
/
修改修改N版.patch
629 lines (601 loc) · 19.6 KB
/
修改修改N版.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
Index: app/src/main/res/xml/network_security_config.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/xml/network_security_config.xml (date 1551849879368)
+++ app/src/main/res/xml/network_security_config.xml (date 1551849879368)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
Index: app/src/main/java/com/example/qjh/r/Fragment/Fragment2.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Fragment/Fragment2.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Fragment/Fragment2.java (date 1551853211443)
@@ -44,13 +44,13 @@
public void init()
{
fruitList=new ArrayList<>();
- for(int i=0;i<4;i++)
- {
- Message_Bomb fruit1=new Message_Bomb("家电","水","xxxx","xxx","xxx","","12");
- fruitList.add(fruit1);
- Message_Bomb fruit2=new Message_Bomb("12sad","电路","12ds","12","12","12","12");
- fruitList.add(fruit2);
- }
+// for(int i=0;i<4;i++)
+// {
+// Message_Bomb fruit1=new Message_Bomb("家电","水","xxxx","xxx","xxx","","12");
+// fruitList.add(fruit1);
+// Message_Bomb fruit2=new Message_Bomb("12sad","电路","12ds","12","12","12","12");
+// fruitList.add(fruit2);
+// }
recyclerView=(RecyclerView)view.findViewById(R.id.first_msg);
LinearLayoutManager linearLayoutManager=new LinearLayoutManager(getContext());
recyclerView.setLayoutManager(linearLayoutManager);
@@ -65,8 +65,6 @@
intent.putExtra("2",message_bomb.getName());
intent.putExtra("3",message_bomb.getTime());
intent.putExtra("4",message_bomb.getMsg());
-
-
startActivity(intent);
}
});
Index: app/src/main/java/com/example/qjh/r/Fragment/Fragment3.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Fragment/Fragment3.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Fragment/Fragment3.java (date 1551848684103)
@@ -24,9 +24,12 @@
import com.example.qjh.r.R;
import java.util.Calendar;
+import java.util.List;
+import cn.bmob.v3.BmobQuery;
import cn.bmob.v3.BmobUser;
import cn.bmob.v3.exception.BmobException;
+import cn.bmob.v3.listener.FindListener;
import cn.bmob.v3.listener.UpdateListener;
/*
@@ -53,6 +56,7 @@
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
view = inflater.inflate(R.layout.user_message, container, false);
init();
+ Init_Meg();
return view;
}
@@ -72,6 +76,31 @@
modify.setOnClickListener(this);
save.setOnClickListener(this);
+
+
+ }
+
+ public void Init_Meg() {
+ BmobQuery<User> query=new BmobQuery<>();
+ query.addWhereEqualTo("objectId",user.getObjectId());
+ query.findObjects(new FindListener<User>() {
+ @Override
+ public void done(List<User> list, BmobException e) {
+ if(e==null)
+ {
+ for(User users:list)
+ {
+ username2.setText(users.getName());
+ address.setText(users.getAddress());
+ riqi.setText(users.getRiqi());
+ mail_1.setText(users.getMail());
+ }
+ }
+ }
+ });
+
+
+
}
@Override
@@ -123,7 +152,7 @@
private void Save() {
- user.setUsername(username2.getText().toString());
+ user.setName(username2.getText().toString());
user.setAddress(address.getText().toString());
user.setRiqi(riqi.getText().toString());
user.setMail(mail_1.getText().toString());
Index: app/src/main/java/com/example/qjh/r/Login/Register.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Login/Register.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Login/Register.java (date 1551851606040)
@@ -31,34 +31,34 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.register);
user_numebr=(EditText)findViewById(R.id.account_input);
- user_numebr.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- if (hasFocus) {
- user_numebr.setText("");
- } else {
- if(user_numebr.getText().equals(""))
- {
- user_numebr.setText("请输入注册的账号");
- }
- }
- }
- });
+// user_numebr.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+// @Override
+// public void onFocusChange(View v, boolean hasFocus) {
+// if (hasFocus) {
+// user_numebr.setText("");
+// } else {
+// if(user_numebr.getText().equals(""))
+// {
+// user_numebr.setText("请输入注册的账号");
+// }
+// }
+// }
+// });
user_password=(EditText)findViewById(R.id.password_input);
- user_password.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- if (hasFocus) {
- user_password.setText("");
-
- } else {
- if(user_password.getText().equals(""))
- {
- user_password.setText("请输入6-12位字符");
- }
- }
- }
- });
+// user_password.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+// @Override
+// public void onFocusChange(View v, boolean hasFocus) {
+// if (hasFocus) {
+// user_password.setText("");
+//
+// } else {
+// if(user_password.getText().equals(""))
+// {
+// user_password.setText("请输入6-12位字符");
+// }
+// }
+// }
+// });
user_password_again=(EditText)findViewById(R.id.password_again);
// user_password_again.setOnFocusChangeListener(new View.OnFocusChangeListener() {
// @Override
Index: app/src/main/java/com/example/qjh/r/Login/User.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Login/User.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Login/User.java (date 1551848652434)
@@ -8,17 +8,17 @@
import cn.bmob.v3.datatype.BmobGeoPoint;
public class User extends BmobUser {
- private String name;
+ private String Name;
private String mail;
private String sex;
private String riqi;
private String address;
public String getName() {
- return name;
+ return Name;
}
public void setName(String name) {
- this.name = name;
+ this.Name = name;
}
public String getMail() {
@@ -48,76 +48,79 @@
public void setAddress(String address) {
this.address = address;
}
- /**
- * 昵称
- */
- private String nickname;
-
- /**
- * 年龄
- */
- private Integer age;
-
- /**
- * 性别
- */
- private Integer gender;
-
- /**
- * 头像
- */
- private BmobFile avatar;
-
- /**
- * 别名
- */
- private List<String> alias;
-
-
- public String getNickname() {
- return nickname;
- }
-
- public User setNickname(String nickname) {
- this.nickname = nickname;
- return this;
+ public String getAddress() {
+ return address;
}
-
- public Integer getAge() {
- return age;
- }
-
- public User setAge(Integer age) {
- this.age = age;
- return this;
- }
-
- public Integer getGender() {
- return gender;
- }
-
- public User setGender(Integer gender) {
- this.gender = gender;
- return this;
- }
-
-
-
- public BmobFile getAvatar() {
- return avatar;
- }
-
- public User setAvatar(BmobFile avatar) {
- this.avatar = avatar;
- return this;
- }
-
- public List<String> getAlias() {
- return alias;
- }
-
- public User setAlias(List<String> alias) {
- this.alias = alias;
- return this;
- }
+// /**
+// * 昵称
+// */
+// private String nickname;
+//
+// /**
+// * 年龄
+// */
+// private Integer age;
+//
+// /**
+// * 性别
+// */
+// private Integer gender;
+//
+// /**
+// * 头像
+// */
+// private BmobFile avatar;
+//
+// /**
+// * 别名
+// */
+// private List<String> alias;
+//
+//
+// public String getNickname() {
+// return nickname;
+// }
+//
+// public User setNickname(String nickname) {
+// this.nickname = nickname;
+// return this;
+// }
+//
+// public Integer getAge() {
+// return age;
+// }
+//
+// public User setAge(Integer age) {
+// this.age = age;
+// return this;
+// }
+//
+// public Integer getGender() {
+// return gender;
+// }
+//
+// public User setGender(Integer gender) {
+// this.gender = gender;
+// return this;
+// }
+//
+//
+//
+// public BmobFile getAvatar() {
+// return avatar;
+// }
+//
+// public User setAvatar(BmobFile avatar) {
+// this.avatar = avatar;
+// return this;
+// }
+//
+// public List<String> getAlias() {
+// return alias;
+// }
+//
+// public User setAlias(List<String> alias) {
+// this.alias = alias;
+// return this;
+// }
}
Index: app/src/main/java/com/example/qjh/r/Main/Message_Bomb.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Main/Message_Bomb.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Main/Message_Bomb.java (date 1551852694307)
@@ -8,7 +8,16 @@
private String area2;//二级区域
private String obj_Name;//项目名字
private String Msg;//问题描述
- private String picture;//图片
+ private String picture;//图片
+ private String idd;
+ public void setIdd(String iddd)
+ {
+ this.idd=iddd;
+ }
+ public String getIdd()
+ {
+ return this.idd;
+ }
public String getPhone() {
return phone;
@@ -18,25 +27,26 @@
this.phone = phone;
}
- private String phone;
+ private String phone;
private String number;
private String name;
private String time;
private String Id; //身份id
- public Message_Bomb(String title,String obj_Name,String Msg,String number, String name, String phone,String time)
- {
- this.title=title;
- this.obj_Name=obj_Name;
- this.Msg=Msg;
- this.number=number;
- this.name=name;
- this.phone=phone;
- this.time=time;
+
+ public Message_Bomb(String title, String obj_Name, String Msg, String number, String name, String phone, String time) {
+ this.title = title;
+ this.obj_Name = obj_Name;
+ this.Msg = Msg;
+ this.number = number;
+ this.name = name;
+ this.phone = phone;
+ this.time = time;
}
- public Message_Bomb()
- {
+
+ public Message_Bomb() {
}
+
public String getNumber() {
return number;
}
@@ -62,13 +72,12 @@
}
-
public String getId() {
return Id;
}
public void setId(String id) {
- Id = id;
+ this.Id = id;
}
Index: app/src/main/java/com/example/qjh/r/Main/Repair.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/qjh/r/Main/Repair.java (date 1551795633000)
+++ app/src/main/java/com/example/qjh/r/Main/Repair.java (date 1551853045790)
@@ -79,12 +79,12 @@
private Uri destinationUri;
private Uri croppedUri;
private static Intent intent;//接受列表传值
- private User user;
+ public static User user= BmobUser.getCurrentUser(User.class);;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.hand_in);
- user= BmobUser.getCurrentUser(User.class);
+
SpeechUtility.createUtility(this, SpeechConstant.APPID + "=5c1e38ff");
intent=getIntent();
inti();
@@ -176,8 +176,6 @@
return false;
}
});
-
-
change(); //文字变化监听
//接受活动传回来的数据
Receive();
@@ -198,7 +196,8 @@
Voice voice = new Voice();
voice.initSpeech(this);
case R.id.put:
- final ArrayList<Message_Bomb> message_bombs=new ArrayList<>();
+ final
+ ArrayList<Message_Bomb> message_bombs=new ArrayList<>();
final Message_Bomb message_bomb=new Message_Bomb();
message_bomb.setTitle(Msg.getText().toString());
message_bomb.setMsg(write.getText().toString());
@@ -207,7 +206,7 @@
message_bomb.setNumber(usernumber.getText().toString());
message_bomb.setPhone(phone_number.getText().toString());
message_bomb.setTime(gettime.getText().toString());
- // message_bomb.setId(user.getObjectId());
+ message_bomb.setIdd(user.getObjectId());
message_bomb.save(new SaveListener<String>() {
@Override
public void done(String s, BmobException e) {
@@ -217,6 +216,7 @@
Fragment2.fruitList.add(message_bomb);
Fragment2.fruit_adapter.notifyDataSetChanged();
Toast.makeText(Repair.this,"提交成功",Toast.LENGTH_SHORT).show();
+ finish();
}
}
});
Index: app/src/main/res/anim/anmi.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/anim/anmi.xml (date 1551795633000)
+++ app/src/main/res/anim/anmi.xml (date 1551846968675)
@@ -3,6 +3,6 @@
<alpha
android:fromAlpha="0.1"
android:toAlpha="1.0"
- android:duration="8000"/>
+ android:duration="4000"/>
</set>
\ No newline at end of file
Index: app/src/main/res/layout/first_msg.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/first_msg.xml (date 1551795633000)
+++ app/src/main/res/layout/first_msg.xml (date 1551853366316)
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_margin="10dp"
android:layout_height="wrap_content">
-<LinearLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
Index: app/src/main/res/layout/hand_in.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/hand_in.xml (date 1551795633000)
+++ app/src/main/res/layout/hand_in.xml (date 1551851663551)
@@ -290,12 +290,12 @@
android:textColor="@color/black"
android:textSize="20dp" />
- <ImageView
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_gravity="center|top"
- android:layout_marginRight="120dp"
- android:src="@mipmap/xx" />
+ <!--<ImageView-->
+ <!--android:layout_width="15dp"-->
+ <!--android:layout_height="15dp"-->
+ <!--android:layout_gravity="center|top"-->
+ <!--android:layout_marginRight="120dp"-->
+ <!--android:src="@mipmap/xx" />-->
<EditText
android:id="@+id/username"
@@ -308,7 +308,7 @@
android:background="@null"
android:hint="输入姓名"
android:inputType="text"
- android:textColorHint="@color/light"
+ android:textColorHint="@color/Red"
android:textSize="17dp" />
</FrameLayout>
@@ -342,7 +342,7 @@
android:background="@null"
android:hint="输入电话"
android:inputType="number"
- android:textColorHint="@color/light"
+ android:textColorHint="@color/Red"
android:textSize="17dp" />
</FrameLayout>
Index: app/src/main/res/layout/viewpage.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/viewpage.xml (date 1551795633000)
+++ app/src/main/res/layout/viewpage.xml (date 1551851605943)
@@ -5,18 +5,19 @@
android:orientation="vertical">
- <android.support.v4.view.ViewPager
- android:id="@+id/vp"
- android:layout_width="match_parent"
- android:layout_height="510dp">
-
- </android.support.v4.view.ViewPager>
-
+ =
+ <android.support.v4.view.ViewPager
+ android:id="@+id/vp"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ />
<com.ashokvarma.bottomnavigation.BottomNavigationBar
android:id="@+id/bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom">
+ android:layout_gravity="bottom"
+ android:layout_alignParentBottom="true">
</com.ashokvarma.bottomnavigation.BottomNavigationBar>
Index: app/src/main/AndroidManifest.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/AndroidManifest.xml (date 1551795633000)
+++ app/src/main/AndroidManifest.xml (date 1551849890896)
@@ -41,6 +41,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:screenOrientation="portrait"
+ android:networkSecurityConfig="@xml/network_security_config"
android:theme="@style/AppTheme">
<provider
android:name="android.support.v4.content.FileProvider"