李明 / ClasManage · 提交

转到一个项目

作者 daidong
提交 17881ff8199bc1b54f5457ce07629a2651f41ef1 1 个父辈 10e3e68d

通知3.26

内嵌 并排对比
正在显示 12 个修改的文件 包含 289 行增加 和 479 行删除
@@ -43,7 +43,6 @@ @@ -43,7 +43,6 @@
43 android:windowSoftInputMode="stateAlwaysHidden|adjustResize" /> 43 android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
44 <activity android:name=".ui.jxt.fragment.Tz.Tjtzmb_Activity" /> 44 <activity android:name=".ui.jxt.fragment.Tz.Tjtzmb_Activity" />
45 <activity android:name=".ui.jxt.fragment.Tz.Tzmb_Activity" /> 45 <activity android:name=".ui.jxt.fragment.Tz.Tzmb_Activity" />
46 - <activity android:name=".ui.jxt.fragment.Tz.FbtzA_ctivity" />  
47 <activity android:name=".ui.jxt.fragment.Tz.TzxqActivity" /> 46 <activity android:name=".ui.jxt.fragment.Tz.TzxqActivity" />
48 <activity android:name=".ui.jxt.activity.HD.HdMbActivity" /> 47 <activity android:name=".ui.jxt.activity.HD.HdMbActivity" />
49 <activity android:name=".zxing.Jifen_Activity" /> 48 <activity android:name=".zxing.Jifen_Activity" />
@@ -115,7 +114,7 @@ @@ -115,7 +114,7 @@
115 android:name=".ui.jxt.activity.Tzmb_Activity" 114 android:name=".ui.jxt.activity.Tzmb_Activity"
116 android:windowSoftInputMode="adjustResize|stateHidden" /> 115 android:windowSoftInputMode="adjustResize|stateHidden" />
117 <activity 116 <activity
118 - android:name=".ui.jxt.activity.Fbtz_Activity" 117 + android:name=".ui.jxt.fragment.Tz.FbtzA_ctivity"
119 android:windowSoftInputMode="adjustResize|stateHidden" /> 118 android:windowSoftInputMode="adjustResize|stateHidden" />
120 <activity 119 <activity
121 android:name=".ui.jxt.activity.Zyxqck_Activity" 120 android:name=".ui.jxt.activity.Zyxqck_Activity"
@@ -370,6 +370,7 @@ public interface ApiService { @@ -370,6 +370,7 @@ public interface ApiService {
370 @POST("/api/home_school/getListParent") 370 @POST("/api/home_school/getListParent")
371 Observable<HdLBBean> getParentHdList(@Header("token") String token, @Query("type") int type); 371 Observable<HdLBBean> getParentHdList(@Header("token") String token, @Query("type") int type);
372 @POST("/api/active/getTemplate") 372 @POST("/api/active/getTemplate")
  373 +
373 Observable<HDMBBean>getTemplate(@Header("token") String token); 374 Observable<HDMBBean>getTemplate(@Header("token") String token);
374 @POST("/api/active/setTemplate") 375 @POST("/api/active/setTemplate")
375 Observable<AddMbBean>setTemplate(@Header("token") String token, String title, String content,String imgpath); 376 Observable<AddMbBean>setTemplate(@Header("token") String token, String title, String content,String imgpath);
1 -package com.yinhebairong.clasmanage.ui.jxt.activity;  
2 -  
3 -import android.graphics.Color;  
4 -  
5 -import com.yinhebairong.clasmanage.R;  
6 -import com.yinhebairong.clasmanage.base.BaseActivity;  
7 -import com.yinhebairong.clasmanage.base.instant.Layout;  
8 -import com.yinhebairong.clasmanage.base.instant.TopNavigationBar;  
9 -import com.yinhebairong.clasmanage.base.instant.slideslip.SlideLip;  
10 -  
11 -@SlideLip(slidelip = false) // 侧滑返回上一页 , 默认不开启 \  
12 -@TopNavigationBar(color = Color.TRANSPARENT, setBarBiack = 2) // 状态栏颜色 , 状态栏样式  
13 -@Layout(R.layout.activity_fbtz)  
14 -public class Fbtz_Activity extends BaseActivity {  
15 - @Override  
16 - protected void initData() {  
17 -  
18 - }  
19 -  
20 - @Override  
21 - protected void setEvent() {  
22 -  
23 - }  
24 -}  
@@ -41,7 +41,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; @@ -41,7 +41,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
41 import androidx.recyclerview.widget.RecyclerView; 41 import androidx.recyclerview.widget.RecyclerView;
42 42
43 import com.bumptech.glide.Glide; 43 import com.bumptech.glide.Glide;
44 -import com.bumptech.glide.request.RequestOptions;  
45 import com.chad.library.adapter.base.BaseQuickAdapter; 44 import com.chad.library.adapter.base.BaseQuickAdapter;
46 import com.chad.library.adapter.base.BaseViewHolder; 45 import com.chad.library.adapter.base.BaseViewHolder;
47 import com.donkingliang.imageselector.utils.ImageSelector; 46 import com.donkingliang.imageselector.utils.ImageSelector;
@@ -53,7 +52,6 @@ import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer; @@ -53,7 +52,6 @@ import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
53 import com.yinhebairong.clasmanage.Config; 52 import com.yinhebairong.clasmanage.Config;
54 import com.yinhebairong.clasmanage.R; 53 import com.yinhebairong.clasmanage.R;
55 import com.yinhebairong.clasmanage.adapter.imageselect.SquareImageView; 54 import com.yinhebairong.clasmanage.adapter.imageselect.SquareImageView;
56 -import com.yinhebairong.clasmanage.adapter.jxtadapter.TzMbAdatper;  
57 import com.yinhebairong.clasmanage.adapter.jxtadapter.TztjmbAdapter; 55 import com.yinhebairong.clasmanage.adapter.jxtadapter.TztjmbAdapter;
58 import com.yinhebairong.clasmanage.base.BaseActivity; 56 import com.yinhebairong.clasmanage.base.BaseActivity;
59 import com.yinhebairong.clasmanage.base.instant.Layout; 57 import com.yinhebairong.clasmanage.base.instant.Layout;
@@ -65,9 +63,6 @@ import com.yinhebairong.clasmanage.entity.PostFiel; @@ -65,9 +63,6 @@ import com.yinhebairong.clasmanage.entity.PostFiel;
65 import com.yinhebairong.clasmanage.entity.VideoEntity; 63 import com.yinhebairong.clasmanage.entity.VideoEntity;
66 import com.yinhebairong.clasmanage.m.M; 64 import com.yinhebairong.clasmanage.m.M;
67 import com.yinhebairong.clasmanage.network.ApiService; 65 import com.yinhebairong.clasmanage.network.ApiService;
68 -import com.yinhebairong.clasmanage.ui.jxt.activity.Fbzy_Activity;  
69 -import com.yinhebairong.clasmanage.ui.jxt.activity.Jsbj_Activity;  
70 -import com.yinhebairong.clasmanage.ui.jxt.activity.Jsbj_Activity_ViewBinding;  
71 import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity; 66 import com.yinhebairong.clasmanage.ui.jxt.fragment.Jl.JsjlActivity;
72 import com.yinhebairong.clasmanage.utils.AudioUtils; 67 import com.yinhebairong.clasmanage.utils.AudioUtils;
73 import com.yinhebairong.clasmanage.widget.CircularProgressBar; 68 import com.yinhebairong.clasmanage.widget.CircularProgressBar;
@@ -130,10 +125,11 @@ public class FbtzA_ctivity extends BaseActivity { @@ -130,10 +125,11 @@ public class FbtzA_ctivity extends BaseActivity {
130 String teacherIds = ""; 125 String teacherIds = "";
131 String content = ""; 126 String content = "";
132 private final static int STRAT_ID = 1998; 127 private final static int STRAT_ID = 1998;
133 - private final static int HDXZ_ID = 1999; 128 + private final static int TZXZ_ID = 1999;
134 @BindView(R.id.et_tzzt) 129 @BindView(R.id.et_tzzt)
135 EditText etTzzt; 130 EditText etTzzt;
136 TzMbBean.DataBean.ItemBean tzmb_item = new TzMbBean.DataBean.ItemBean(); 131 TzMbBean.DataBean.ItemBean tzmb_item = new TzMbBean.DataBean.ItemBean();
  132 + TzMbBean.DataBean.ItemBean itemBean;
137 List<String> links_list = new ArrayList<>(); 133 List<String> links_list = new ArrayList<>();
138 String audio = ""; 134 String audio = "";
139 String img = ""; 135 String img = "";
@@ -160,6 +156,11 @@ public class FbtzA_ctivity extends BaseActivity { @@ -160,6 +156,11 @@ public class FbtzA_ctivity extends BaseActivity {
160 TztjmbAdapter tzMbAdatper; 156 TztjmbAdapter tzMbAdatper;
161 String title; 157 String title;
162 String contextText; 158 String contextText;
  159 + @BindView(R.id.select_text)
  160 + TextView selectText;
  161 + @BindView(R.id.tv_xbjf)
  162 + TextView tvXbjf;
  163 +
163 @Override 164 @Override
164 protected void initData() { 165 protected void initData() {
165 title = getIntent().getStringExtra("title"); 166 title = getIntent().getStringExtra("title");
@@ -176,177 +177,19 @@ public class FbtzA_ctivity extends BaseActivity { @@ -176,177 +177,19 @@ public class FbtzA_ctivity extends BaseActivity {
176 // mediaPlayer.setVolume(0.5f, 0.5f); 177 // mediaPlayer.setVolume(0.5f, 0.5f);
177 getMbDAta(); 178 getMbDAta();
178 includeName.setText("发布通知"); 179 includeName.setText("发布通知");
179 - includeBack.setOnClickListener(new View.OnClickListener() {  
180 - @Override  
181 - public void onClick(View v) {  
182 - finish();  
183 - }  
184 - });  
185 - classSelect.setOnClickListener(new View.OnClickListener() {  
186 - @Override  
187 - public void onClick(View view) {  
188 - Intent intent = new Intent();  
189 - intent.setClass(FbtzA_ctivity.this, JsjlActivity.class);  
190 - startActivityForResult(intent, STRAT_ID);  
191 - }  
192 - });  
193 -  
194 - addTzmb.setOnClickListener(new View.OnClickListener() {  
195 - @Override  
196 - public void onClick(View v) {  
197 - Intent intent = new Intent(FbtzA_ctivity.this, Tzmb_Activity.class);  
198 - startActivity(intent);  
199 - startActivityForResult(intent, HDXZ_ID);  
200 - }  
201 - });  
202 - fabutzBut.setOnClickListener(new View.OnClickListener() {  
203 - @Override  
204 - public void onClick(View view) {  
205 - if (!classId.equals("")) {  
206 - if (!parentIds.equals("")) {  
207 - name = etTzzt.getText().toString();  
208 - if (!name.equals("")) {  
209 - content = contentEd.getText().toString();  
210 - if (!content.equals("")) {  
211 - WaitDialog.show(FbtzA_ctivity.this, "请稍候...");  
212 - ArrayList<String> videos = new ArrayList<>();  
213 - for (int i = 0; i < frequencyUrl.size(); i++) {  
214 - videos.add(frequencyUrl.get(i).getVideoPath());  
215 - }  
216 - audio = TextUtils.join(",", videos);  
217 - img = TextUtils.join(",",ImagesUrl);  
218 - video = TextUtils.join(",",videoUrl);  
219 - links = TextUtils.join(",",links_list);  
220 - Log.i("录音", "onClick: " + audio);  
221 - Api().fbtz(Config.Token, classId, teacherIds, parentIds, name, content, tzmb_item.getCall(), tzmb_item.getInscription(), img, audio, video,links).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {  
222 - @Override  
223 - public void onSubscribe(Disposable d) {  
224 -  
225 - }  
226 -  
227 - @Override  
228 - public void onNext(FbtzEntity fbtzEntity) {  
229 - if (fbtzEntity.getCode() == M.success) {  
230 - finish();  
231 - } else {  
232 - Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();  
233 - WaitDialog.dismiss();  
234 - }  
235 - }  
236 -  
237 - @Override  
238 - public void onError(Throwable e) {  
239 -  
240 - }  
241 -  
242 - @Override  
243 - public void onComplete() {  
244 -  
245 - }  
246 - });  
247 - } else {  
248 - Toast.makeText(ctx, "请输入通知内容", Toast.LENGTH_SHORT).show();  
249 - }  
250 - } else {  
251 - Toast.makeText(ctx, "请输入通知的标题", Toast.LENGTH_SHORT).show();  
252 - }  
253 - } else {  
254 - Toast.makeText(ctx, "请选择接收通知的家长", Toast.LENGTH_SHORT).show();  
255 - }  
256 - } else {  
257 - Toast.makeText(ctx, "请选择接受的班级", Toast.LENGTH_SHORT).show();  
258 - }  
259 - }  
260 - });  
261 -  
262 - addTzmb.setOnClickListener(new View.OnClickListener() {  
263 - @Override  
264 - public void onClick(View view) {  
265 - Intent intent = new Intent();  
266 - intent.setClass(FbtzA_ctivity.this, Tzmb_Activity.class);  
267 - startActivityForResult(intent, HDXZ_ID);  
268 - }  
269 - });  
270 - imageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {  
271 - @Override  
272 - public void onItemClick(BaseQuickAdapter adapter, View view, int position) {  
273 - imgPop(picAndVideo, position);  
274 - }  
275 - });  
276 - audioAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {  
277 - @Override  
278 - public void onItemClick(BaseQuickAdapter adapter, View view, int position) {  
279 - text_time = view.findViewById(R.id.text_time);  
280 - List<VideoEntity> data = audioAdapter.getData();  
281 - for (int i = 0; i < data.size(); i++) {  
282 - data.get(i).setChecked(false);  
283 - }  
284 -  
285 - try {  
286 - if (mediaPlayer.isPlaying()) {  
287 - mediaPlayer.reset();  
288 - data.get(position).setChecked(true);  
289 - mediaPlayer.setDataSource(data.get(position).getVideoPath());  
290 - mediaPlayer.prepare();  
291 - mediaPlayer.start();  
292 - updateDescTv();  
293 - } else {  
294 - mediaPlayer.reset();  
295 - mediaPlayer.setDataSource(data.get(position).getVideoPath());  
296 - mediaPlayer.prepare();  
297 - mediaPlayer.start();  
298 - updateDescTv();  
299 - }  
300 - mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {  
301 - @Override  
302 - public void onCompletion(MediaPlayer mediaPlayer) {  
303 - int duration = mediaPlayer.getDuration();  
304 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss");  
305 - Date date = new Date(duration);  
306 - String format = simpleDateFormat.format(date);  
307 - text_time.setText(format);  
308 - }  
309 - });  
310 - } catch (IOException e) {  
311 - e.printStackTrace();  
312 - }  
313 - adapter.notifyDataSetChanged();  
314 - }  
315 - });  
316 - audioAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {  
317 - @Override  
318 - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {  
319 - List<VideoEntity> data = audioAdapter.getData();  
320 - data.remove(position);  
321 - mediaPlayer.stop();  
322 - audioAdapter.notifyDataSetChanged();  
323 - }  
324 - });  
325 - imgRecycle.setLayoutManager(new GridLayoutManager(this, 3));  
326 - imgRecycle.setAdapter(imageAdapter);  
327 - imageAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {  
328 - @Override  
329 - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {  
330 - switch (view.getId()) {  
331 - case R.id.v_delete:  
332 - if (picAndVideo.get(position).getType() == 1) {  
333 - ImagesUrl.remove(picAndVideo.get(position).getPath());  
334 - } else if (picAndVideo.get(position).getType() == 2) {  
335 - videoUrl.remove(picAndVideo.get(position).getPath());  
336 - } else if (picAndVideo.get(position).getType() == 3) {  
337 - frequencyUrl.remove(picAndVideo.get(position).getPath());  
338 - }  
339 - picAndVideo.remove(position);  
340 - adapter.notifyDataSetChanged();  
341 - break;  
342 - case R.id.item_select_pic_video:  
343 -  
344 - break;  
345 - }  
346 - }  
347 - });  
348 } 180 }
349 181
  182 +// @Override
  183 +// protected void onResume() {
  184 +// super.onResume();
  185 +// if (getIntent().getExtras() != null) {
  186 +// Intent intent = getIntent();
  187 +// Bundle tzmb_item = intent.getExtras();
  188 +// itemBean = (TzMbBean.DataBean.ItemBean) tzmb_item.getSerializable("tzmb_item");
  189 +// classType.setText(itemBean.getTitle());
  190 +// }
  191 +// }
  192 +
350 private void getMbDAta() { 193 private void getMbDAta() {
351 Api().tjmb(Config.Token) 194 Api().tjmb(Config.Token)
352 .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) 195 .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
@@ -358,27 +201,27 @@ public class FbtzA_ctivity extends BaseActivity { @@ -358,27 +201,27 @@ public class FbtzA_ctivity extends BaseActivity {
358 201
359 @Override 202 @Override
360 public void onNext(TztjmbBean tztjmbBean) { 203 public void onNext(TztjmbBean tztjmbBean) {
361 - if (tztjmbBean.getCode() == M.success){  
362 - if (tzMbAdatper==null){  
363 - tzMbAdatper = new TztjmbAdapter(R.layout.item_fbhdxqtem,tztjmbBean.getData()); 204 + if (tztjmbBean.getCode() == M.success) {
  205 + if (tzMbAdatper == null) {
  206 + tzMbAdatper = new TztjmbAdapter(R.layout.item_fbhdxqtem, tztjmbBean.getData());
364 moBanRv.setAdapter(tzMbAdatper); 207 moBanRv.setAdapter(tzMbAdatper);
365 tzMbAdatper.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { 208 tzMbAdatper.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
366 @Override 209 @Override
367 public void onItemClick(BaseQuickAdapter adapter, View view, int position) { 210 public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
368 TextView hdtext = view.findViewById(R.id.hdtext); 211 TextView hdtext = view.findViewById(R.id.hdtext);
369 - if (tzMbAdatper.getData().get(position).isChecked()){ 212 + if (tzMbAdatper.getData().get(position).isChecked()) {
370 hdtext.setEnabled(false); 213 hdtext.setEnabled(false);
371 tzMbAdatper.getData().get(position).setChecked(false); 214 tzMbAdatper.getData().get(position).setChecked(false);
372 tzMbAdatper.getData().get(position).getContent(); 215 tzMbAdatper.getData().get(position).getContent();
373 etTzzt.setText(tzMbAdatper.getData().get(position).getTitle()); 216 etTzzt.setText(tzMbAdatper.getData().get(position).getTitle());
374 contentEd.setText(tzMbAdatper.getData().get(position).getContent()); 217 contentEd.setText(tzMbAdatper.getData().get(position).getContent());
375 - }else { 218 + } else {
376 tzMbAdatper.getData().get(position).setChecked(true); 219 tzMbAdatper.getData().get(position).setChecked(true);
377 hdtext.setEnabled(true); 220 hdtext.setEnabled(true);
378 } 221 }
379 } 222 }
380 }); 223 });
381 - }else { 224 + } else {
382 tzMbAdatper.setNewData(tztjmbBean.getData()); 225 tzMbAdatper.setNewData(tztjmbBean.getData());
383 tzMbAdatper.notifyDataSetChanged(); 226 tzMbAdatper.notifyDataSetChanged();
384 } 227 }
@@ -498,11 +341,11 @@ public class FbtzA_ctivity extends BaseActivity { @@ -498,11 +341,11 @@ public class FbtzA_ctivity extends BaseActivity {
498 341
499 342
500 private void AudioPop() { 343 private void AudioPop() {
501 - View view = LayoutInflater.from(FbtzA_ctivity.this).inflate(R.layout.pop_ly_window,null); 344 + View view = LayoutInflater.from(FbtzA_ctivity.this).inflate(R.layout.pop_ly_window, null);
502 // 弹窗 345 // 弹窗
503 final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT); 346 final PopupWindow popupWindow = new PopupWindow(view, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
504 ImageView ly_but = view.findViewById(R.id.ly_but); 347 ImageView ly_but = view.findViewById(R.id.ly_but);
505 - time_text= view.findViewById(R.id.time_text); 348 + time_text = view.findViewById(R.id.time_text);
506 TextView ly_style = view.findViewById(R.id.ly_style); 349 TextView ly_style = view.findViewById(R.id.ly_style);
507 Circular_bar = view.findViewById(R.id.Circular_bar); 350 Circular_bar = view.findViewById(R.id.Circular_bar);
508 Circular_bar.setMax(600); 351 Circular_bar.setMax(600);
@@ -510,13 +353,13 @@ public class FbtzA_ctivity extends BaseActivity { @@ -510,13 +353,13 @@ public class FbtzA_ctivity extends BaseActivity {
510 RelativeLayout luyi_rl = view.findViewById(R.id.luyi_rl); 353 RelativeLayout luyi_rl = view.findViewById(R.id.luyi_rl);
511 LinearLayout ly_li = view.findViewById(R.id.ly_li); 354 LinearLayout ly_li = view.findViewById(R.id.ly_li);
512 ViewGroup.LayoutParams layoutParams = ly_li.getLayoutParams(); 355 ViewGroup.LayoutParams layoutParams = ly_li.getLayoutParams();
513 - layoutParams.height = layoutParams.height+M.getNavigationBarHeight(this); 356 + layoutParams.height = layoutParams.height + M.getNavigationBarHeight(this);
514 ly_li.setLayoutParams(layoutParams); 357 ly_li.setLayoutParams(layoutParams);
515 popupWindow.setOutsideTouchable(true); 358 popupWindow.setOutsideTouchable(true);
516 popupWindow.setTouchable(true); 359 popupWindow.setTouchable(true);
517 popupWindow.setFocusable(true); 360 popupWindow.setFocusable(true);
518 setBackgroundAlpha(0.5f);//设置屏幕透明度 361 setBackgroundAlpha(0.5f);//设置屏幕透明度
519 - popupWindow.showAtLocation(view,Gravity.BOTTOM,0,M.getNavigationBarHeight(this)); 362 + popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, M.getNavigationBarHeight(this));
520 Circular_bar.setVisibility(View.GONE); 363 Circular_bar.setVisibility(View.GONE);
521 AudioUtils audioUtils = new AudioUtils(FbtzA_ctivity.this); 364 AudioUtils audioUtils = new AudioUtils(FbtzA_ctivity.this);
522 luyi_rl.setOnClickListener(new View.OnClickListener() { 365 luyi_rl.setOnClickListener(new View.OnClickListener() {
@@ -527,8 +370,8 @@ public class FbtzA_ctivity extends BaseActivity { @@ -527,8 +370,8 @@ public class FbtzA_ctivity extends BaseActivity {
527 int checkSelfPermission = ContextCompat.checkSelfPermission(FbtzA_ctivity.this, 370 int checkSelfPermission = ContextCompat.checkSelfPermission(FbtzA_ctivity.this,
528 Manifest.permission.RECORD_AUDIO); 371 Manifest.permission.RECORD_AUDIO);
529 if (permission == PackageManager.PERMISSION_GRANTED) { 372 if (permission == PackageManager.PERMISSION_GRANTED) {
530 - if (checkSelfPermission==PackageManager.PERMISSION_GRANTED){  
531 - if (ly_but.isEnabled()){ 373 + if (checkSelfPermission == PackageManager.PERMISSION_GRANTED) {
  374 + if (ly_but.isEnabled()) {
532 ly_but.setEnabled(false); 375 ly_but.setEnabled(false);
533 Circular_bar.setVisibility(View.VISIBLE); 376 Circular_bar.setVisibility(View.VISIBLE);
534 ly_style.setText("点击结束录音"); 377 ly_style.setText("点击结束录音");
@@ -536,18 +379,18 @@ public class FbtzA_ctivity extends BaseActivity { @@ -536,18 +379,18 @@ public class FbtzA_ctivity extends BaseActivity {
536 audioUtils.StratAudio(); 379 audioUtils.StratAudio();
537 popupWindow.dismiss(); 380 popupWindow.dismiss();
538 381
539 - }else { 382 + } else {
540 ly_but.setEnabled(true); 383 ly_but.setEnabled(true);
541 Circular_bar.setVisibility(View.GONE); 384 Circular_bar.setVisibility(View.GONE);
542 audioUtils.EndAudio(); 385 audioUtils.EndAudio();
543 String filePath = audioUtils.getFilePath(); 386 String filePath = audioUtils.getFilePath();
544 - postFile(filePath,3,""); 387 + postFile(filePath, 3, "");
545 ly_style.setText("点击录音"); 388 ly_style.setText("点击录音");
546 // Log.i(TAG, "onClick: "+filePath); 389 // Log.i(TAG, "onClick: "+filePath);
547 handler.removeCallbacks(runnable); 390 handler.removeCallbacks(runnable);
548 endTime(); 391 endTime();
549 } 392 }
550 - }else { 393 + } else {
551 //没有权限，申请权限。 394 //没有权限，申请权限。
552 ActivityCompat.requestPermissions(FbtzA_ctivity.this, 395 ActivityCompat.requestPermissions(FbtzA_ctivity.this,
553 new String[]{Manifest.permission.RECORD_AUDIO}, 1); 396 new String[]{Manifest.permission.RECORD_AUDIO}, 1);
@@ -576,7 +419,6 @@ public class FbtzA_ctivity extends BaseActivity { @@ -576,7 +419,6 @@ public class FbtzA_ctivity extends BaseActivity {
576 } 419 }
577 420
578 421
579 -  
580 /*--------------------------------------------查看大图详情----------------------------------------------------------*/ 422 /*--------------------------------------------查看大图详情----------------------------------------------------------*/
581 float x1 = 0, x2 = 0; // 滑动坐标轴 423 float x1 = 0, x2 = 0; // 滑动坐标轴
582 int pageSze; // 页数 424 int pageSze; // 页数
@@ -741,8 +583,175 @@ public class FbtzA_ctivity extends BaseActivity { @@ -741,8 +583,175 @@ public class FbtzA_ctivity extends BaseActivity {
741 583
742 @Override 584 @Override
743 protected void setEvent() { 585 protected void setEvent() {
  586 + includeBack.setOnClickListener(new View.OnClickListener() {
  587 + @Override
  588 + public void onClick(View v) {
  589 + finish();
  590 + }
  591 + });
  592 + classSelect.setOnClickListener(new View.OnClickListener() {
  593 + @Override
  594 + public void onClick(View view) {
  595 + Intent intent = new Intent();
  596 + intent.setClass(FbtzA_ctivity.this, JsjlActivity.class);
  597 + startActivityForResult(intent, STRAT_ID);
  598 + }
  599 + });
  600 +
  601 + addTzmb.setOnClickListener(new View.OnClickListener() {
  602 + @Override
  603 + public void onClick(View v) {
  604 + Intent intent = new Intent(FbtzA_ctivity.this, Tzmb_Activity.class);
  605 + startActivity(intent);
  606 + startActivityForResult(intent, TZXZ_ID);
  607 + }
  608 + });
  609 + fabutzBut.setOnClickListener(new View.OnClickListener() {
  610 + @Override
  611 + public void onClick(View view) {
  612 + if (!classId.equals("")) {
  613 + if (!parentIds.equals("")) {
  614 + name = etTzzt.getText().toString();
  615 + if (!name.equals("")) {
  616 + content = contentEd.getText().toString();
  617 + if (!content.equals("")) {
  618 + WaitDialog.show(FbtzA_ctivity.this, "请稍候...");
  619 + ArrayList<String> videos = new ArrayList<>();
  620 + for (int i = 0; i < frequencyUrl.size(); i++) {
  621 + videos.add(frequencyUrl.get(i).getVideoPath());
  622 + }
  623 + audio = TextUtils.join(",", videos);
  624 + img = TextUtils.join(",", ImagesUrl);
  625 + video = TextUtils.join(",", videoUrl);
  626 + links = TextUtils.join(",", links_list);
  627 + Log.i("录音", "onClick: " + audio);
  628 + Api().fbtz(Config.Token, classId, teacherIds, parentIds, name, content, tzmb_item.getCall(), tzmb_item.getInscription(), img, audio, video, links).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<FbtzEntity>() {
  629 + @Override
  630 + public void onSubscribe(Disposable d) {
  631 +
  632 + }
  633 +
  634 + @Override
  635 + public void onNext(FbtzEntity fbtzEntity) {
  636 + if (fbtzEntity.getCode() == M.success) {
  637 + finish();
  638 + } else {
  639 + Toast.makeText(ctx, "" + fbtzEntity.getMsg(), Toast.LENGTH_SHORT).show();
  640 + WaitDialog.dismiss();
  641 + }
  642 + }
  643 +
  644 + @Override
  645 + public void onError(Throwable e) {
  646 +
  647 + }
  648 +
  649 + @Override
  650 + public void onComplete() {
  651 +
  652 + }
  653 + });
  654 + } else {
  655 + Toast.makeText(ctx, "请输入通知内容", Toast.LENGTH_SHORT).show();
  656 + }
  657 + } else {
  658 + Toast.makeText(ctx, "请输入通知的标题", Toast.LENGTH_SHORT).show();
  659 + }
  660 + } else {
  661 + Toast.makeText(ctx, "请选择接收通知的家长", Toast.LENGTH_SHORT).show();
  662 + }
  663 + } else {
  664 + Toast.makeText(ctx, "请选择接受的班级", Toast.LENGTH_SHORT).show();
  665 + }
  666 + }
  667 + });
  668 +
  669 + addTzmb.setOnClickListener(new View.OnClickListener() {
  670 + @Override
  671 + public void onClick(View view) {
  672 + Intent intent = new Intent();
  673 + intent.setClass(FbtzA_ctivity.this, Tzmb_Activity.class);
  674 + startActivityForResult(intent, TZXZ_ID);
  675 + }
  676 + });
  677 + imageAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
  678 + @Override
  679 + public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
  680 + imgPop(picAndVideo, position);
  681 + }
  682 + });
  683 + audioAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
  684 + @Override
  685 + public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
  686 + text_time = view.findViewById(R.id.text_time);
  687 + List<VideoEntity> data = audioAdapter.getData();
  688 + for (int i = 0; i < data.size(); i++) {
  689 + data.get(i).setChecked(false);
  690 + }
744 691
  692 + try {
  693 + if (mediaPlayer.isPlaying()) {
  694 + mediaPlayer.reset();
  695 + data.get(position).setChecked(true);
  696 + mediaPlayer.setDataSource(data.get(position).getVideoPath());
  697 + mediaPlayer.prepare();
  698 + mediaPlayer.start();
  699 + updateDescTv();
  700 + } else {
  701 + mediaPlayer.reset();
  702 + mediaPlayer.setDataSource(data.get(position).getVideoPath());
  703 + mediaPlayer.prepare();
  704 + mediaPlayer.start();
  705 + updateDescTv();
  706 + }
  707 + mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
  708 + @Override
  709 + public void onCompletion(MediaPlayer mediaPlayer) {
  710 + int duration = mediaPlayer.getDuration();
  711 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss");
  712 + Date date = new Date(duration);
  713 + String format = simpleDateFormat.format(date);
  714 + text_time.setText(format);
  715 + }
  716 + });
  717 + } catch (IOException e) {
  718 + e.printStackTrace();
  719 + }
  720 + adapter.notifyDataSetChanged();
  721 + }
  722 + });
  723 + audioAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
  724 + @Override
  725 + public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
  726 + List<VideoEntity> data = audioAdapter.getData();
  727 + data.remove(position);
  728 + mediaPlayer.stop();
  729 + audioAdapter.notifyDataSetChanged();
  730 + }
  731 + });
  732 + imgRecycle.setLayoutManager(new GridLayoutManager(this, 3));
  733 + imgRecycle.setAdapter(imageAdapter);
  734 + imageAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
  735 + @Override
  736 + public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
  737 + switch (view.getId()) {
  738 + case R.id.v_delete:
  739 + if (picAndVideo.get(position).getType() == 1) {
  740 + ImagesUrl.remove(picAndVideo.get(position).getPath());
  741 + } else if (picAndVideo.get(position).getType() == 2) {
  742 + videoUrl.remove(picAndVideo.get(position).getPath());
  743 + } else if (picAndVideo.get(position).getType() == 3) {
  744 + frequencyUrl.remove(picAndVideo.get(position).getPath());
  745 + }
  746 + picAndVideo.remove(position);
  747 + adapter.notifyDataSetChanged();
  748 + break;
  749 + case R.id.item_select_pic_video:
745 750
  751 + break;
  752 + }
  753 + }
  754 + });
746 } 755 }
747 756
748 @RequiresApi(api = Build.VERSION_CODES.O) 757 @RequiresApi(api = Build.VERSION_CODES.O)
@@ -827,9 +836,6 @@ public class FbtzA_ctivity extends BaseActivity { @@ -827,9 +836,6 @@ public class FbtzA_ctivity extends BaseActivity {
827 836
828 } 837 }
829 838
830 -  
831 -  
832 -  
833 /*--------------------------------------------------------------------------图片适配器----------------------------------------------------------------*/ 839 /*--------------------------------------------------------------------------图片适配器----------------------------------------------------------------*/
834 class ImageAdapter extends BaseQuickAdapter<JxtImageEntity, BaseViewHolder> { 840 class ImageAdapter extends BaseQuickAdapter<JxtImageEntity, BaseViewHolder> {
835 public ImageAdapter(int layoutResId, @Nullable List<JxtImageEntity> data) { 841 public ImageAdapter(int layoutResId, @Nullable List<JxtImageEntity> data) {
@@ -897,6 +903,7 @@ public class FbtzA_ctivity extends BaseActivity { @@ -897,6 +903,7 @@ public class FbtzA_ctivity extends BaseActivity {
897 String format = simpleDateFormat.format(date); 903 String format = simpleDateFormat.format(date);
898 time_text.setText(format); 904 time_text.setText(format);
899 } 905 }
  906 +
900 private void endTime() { 907 private void endTime() {
901 time = 0; 908 time = 0;
902 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss"); 909 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("mm:ss");
@@ -46,8 +46,14 @@ public class Tzmb_Activity extends BaseActivity { @@ -46,8 +46,14 @@ public class Tzmb_Activity extends BaseActivity {
46 46
47 @Override 47 @Override
48 protected void initData() { 48 protected void initData() {
  49 + includeBack.setOnClickListener(new View.OnClickListener() {
  50 + @Override
  51 + public void onClick(View v) {
  52 + finish();
  53 + }
  54 + });
49 includeName.setText("通知模板"); 55 includeName.setText("通知模板");
50 - Api().tzmb(Config.Token) 56 + Api().tzmb(Config.Token)
51 .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) 57 .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
52 .subscribe(new Observer<TzMbBean>() { 58 .subscribe(new Observer<TzMbBean>() {
53 @Override 59 @Override
@@ -78,13 +84,6 @@ public class Tzmb_Activity extends BaseActivity { @@ -78,13 +84,6 @@ public class Tzmb_Activity extends BaseActivity {
78 84
79 @Override 85 @Override
80 protected void setEvent() { 86 protected void setEvent() {
81 - includeBack.setOnClickListener(new View.OnClickListener() {  
82 - @Override  
83 - public void onClick(View v) {  
84 - finish();  
85 - }  
86 - });  
87 -  
88 addMoban.setOnClickListener(new View.OnClickListener() { 87 addMoban.setOnClickListener(new View.OnClickListener() {
89 @Override 88 @Override
90 public void onClick(View view) { 89 public void onClick(View view) {
@@ -95,6 +94,40 @@ public class Tzmb_Activity extends BaseActivity { @@ -95,6 +94,40 @@ public class Tzmb_Activity extends BaseActivity {
95 }); 94 });
96 } 95 }
97 96
  97 + @Override
  98 + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
  99 + super.onActivityResult(requestCode, resultCode, data);
  100 + if (requestCode==000&&resultCode==RESULT_OK){
  101 + Api().tzmb(Config.Token)
  102 + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
  103 + .subscribe(new Observer<TzMbBean>() {
  104 + @Override
  105 + public void onSubscribe(Disposable d) {
  106 +
  107 + }
  108 +
  109 + @Override
  110 + public void onNext(TzMbBean tzMbBean) {
  111 + if (tzMbBean.getCode() == M.success){
  112 + tzmbAdapter.setNewData(tzMbBean.getData());
  113 + tzmbAdapter.notifyDataSetChanged();
  114 + }
  115 + }
  116 +
  117 + @Override
  118 + public void onError(Throwable e) {
  119 +
  120 + }
  121 +
  122 + @Override
  123 + public void onComplete() {
  124 +
  125 + }
  126 + });
  127 +
  128 + }
  129 + }
  130 +
98 class TzmbAdapter extends BaseQuickAdapter< TzMbBean.DataBean, BaseViewHolder> { 131 class TzmbAdapter extends BaseQuickAdapter< TzMbBean.DataBean, BaseViewHolder> {
99 132
100 133
@@ -69,17 +69,19 @@ public class TzmbxqActivity extends BaseActivity { @@ -69,17 +69,19 @@ public class TzmbxqActivity extends BaseActivity {
69 public void onClick(View v) { 69 public void onClick(View v) {
70 Intent intent = new Intent(); 70 Intent intent = new Intent();
71 intent.setClass(TzmbxqActivity.this, FbtzA_ctivity.class); 71 intent.setClass(TzmbxqActivity.this, FbtzA_ctivity.class);
72 - intent.putExtra("title",itemBean.getTitle());  
73 - intent.putExtra("contextText",itemBean.getContent());  
74 Bundle bundle = new Bundle(); 72 Bundle bundle = new Bundle();
75 bundle.putSerializable("tzmb_item", itemBean); 73 bundle.putSerializable("tzmb_item", itemBean);
  74 + intent.putExtra("title",itemBean.getTitle());
  75 + intent.putExtra("contextText",itemBean.getContent());
76 intent.putExtras(bundle); 76 intent.putExtras(bundle);
77 startActivity(intent); 77 startActivity(intent);
78 } 78 }
79 }); 79 });
  80 +
80 } 81 }
81 @OnClick(R.id.hd_button_tj) 82 @OnClick(R.id.hd_button_tj)
82 public void onViewClicked() { 83 public void onViewClicked() {
  84 + finish();
83 } 85 }
84 86
85 } 87 }
@@ -47,7 +47,6 @@ import okhttp3.RequestBody; @@ -47,7 +47,6 @@ import okhttp3.RequestBody;
47 @Layout(R.layout.fragment_tz_rv) 47 @Layout(R.layout.fragment_tz_rv)
48 public class Tz_Rv_Fragment extends BaseFragment { 48 public class Tz_Rv_Fragment extends BaseFragment {
49 49
50 -  
51 Jxt_Tz_Adapter jxt_tz_adapter; 50 Jxt_Tz_Adapter jxt_tz_adapter;
52 Jxt_Tz_jzAdapter jxt_tz_jzAdapter; 51 Jxt_Tz_jzAdapter jxt_tz_jzAdapter;
53 @BindView(R.id.jxt_matter_li) 52 @BindView(R.id.jxt_matter_li)
@@ -338,10 +337,10 @@ public class Tz_Rv_Fragment extends BaseFragment { @@ -338,10 +337,10 @@ public class Tz_Rv_Fragment extends BaseFragment {
338 }else { 337 }else {
339 massage_num.setText(item.getUncomment_num()+""); 338 massage_num.setText(item.getUncomment_num()+"");
340 } 339 }
341 - if (item.getIs_online() ==0){  
342 - state_tv.setText("已查看");  
343 - }else { 340 + if (item.getIs_online() == 0){
344 state_tv.setText("未查看"); 341 state_tv.setText("未查看");
  342 + }else {
  343 + state_tv.setText("已查看");
345 } 344 }
346 345
347 } 346 }
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 android:id="@+id/select_text" 90 android:id="@+id/select_text"
91 android:layout_width="wrap_content" 91 android:layout_width="wrap_content"
92 android:layout_height="wrap_content" 92 android:layout_height="wrap_content"
93 - android:text="请选择" 93 + android:text=""
94 android:textColor="#8C9198" 94 android:textColor="#8C9198"
95 android:textSize="@dimen/sp_16" /> 95 android:textSize="@dimen/sp_16" />
96 96
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:app="http://schemas.android.com/apk/res-auto"  
4 - xmlns:tools="http://schemas.android.com/tools"  
5 - android:layout_width="match_parent"  
6 - android:layout_height="match_parent"  
7 - android:background="#F7F7F7"  
8 - tools:context=".ui.jxt.activity.Fbtz_Activity">  
9 - <include layout="@layout/include_title" android:id="@+id/title"/>  
10 - <androidx.core.widget.NestedScrollView  
11 - android:layout_width="match_parent"  
12 - android:layout_height="wrap_content"  
13 - android:layout_below="@+id/title"  
14 - android:layout_marginBottom="@dimen/dp_60">  
15 - <LinearLayout  
16 - android:layout_width="match_parent"  
17 - android:layout_height="wrap_content"  
18 - android:orientation="vertical"  
19 - >  
20 - <LinearLayout  
21 - android:layout_width="match_parent"  
22 - android:layout_height="@dimen/dp_54"  
23 - android:gravity="center_vertical"  
24 - android:background="#FFFFFF"  
25 - android:orientation="horizontal">  
26 - <TextView  
27 - android:layout_width="wrap_content"  
28 - android:layout_height="wrap_content"  
29 - android:textColor="#F57F17"  
30 - android:layout_marginLeft="@dimen/dp_16"  
31 - android:textSize="@dimen/sp_16"  
32 - android:text="接收班级"/>  
33 - <androidx.recyclerview.widget.RecyclerView  
34 - android:layout_width="0dp"  
35 - android:layout_height="wrap_content"  
36 - android:layout_weight="1"  
37 - android:layout_marginLeft="@dimen/dp_23"  
38 - android:layout_marginRight="@dimen/dp_16"  
39 - android:visibility="invisible"></androidx.recyclerview.widget.RecyclerView>  
40 - <TextView  
41 - android:layout_width="wrap_content"  
42 - android:layout_height="wrap_content"  
43 - android:text="请选择"  
44 - android:textSize="@dimen/sp_16"  
45 - android:visibility="gone"  
46 - android:textColor="#8C9198"/>  
47 - <ImageView  
48 - android:layout_marginLeft="@dimen/dp_6"  
49 - android:layout_width="wrap_content"  
50 - android:layout_height="wrap_content"  
51 - android:src="@mipmap/icon_right"  
52 - android:layout_marginRight="@dimen/dp_16"/>  
53 - </LinearLayout>  
54 - <View  
55 - android:layout_width="match_parent"  
56 - android:layout_height="0.5dp"  
57 - android:background="#EBEBEB"  
58 - android:layout_marginLeft="@dimen/dp_16"  
59 - android:layout_marginRight="@dimen/dp_16"/>  
60 - <LinearLayout  
61 - android:layout_width="match_parent"  
62 - android:layout_height="wrap_content"  
63 - android:background="#FFFFFF"  
64 - android:orientation="vertical">  
65 - <LinearLayout  
66 - android:layout_width="match_parent"  
67 - android:layout_height="wrap_content"  
68 - android:orientation="horizontal">  
69 - <TextView  
70 - android:layout_marginTop="@dimen/dp_16"  
71 - android:layout_width="wrap_content"  
72 - android:layout_height="wrap_content"  
73 - android:textColor="#F57F17"  
74 - android:layout_marginLeft="@dimen/dp_16"  
75 - android:textSize="@dimen/sp_16"  
76 - android:text="通知模板"/>  
77 - <View  
78 - android:layout_width="0dp"  
79 - android:layout_height="match_parent"  
80 - android:layout_weight="1"  
81 - />  
82 - <ImageView  
83 - android:layout_marginLeft="@dimen/dp_6"  
84 - android:layout_width="wrap_content"  
85 - android:layout_height="wrap_content"  
86 - android:src="@mipmap/icon_right"  
87 - android:layout_marginTop="@dimen/dp_16"  
88 - android:layout_marginRight="@dimen/dp_16"/>  
89 - </LinearLayout>  
90 - <androidx.recyclerview.widget.RecyclerView  
91 - android:layout_marginTop="@dimen/dp_8"  
92 - android:layout_width="match_parent"  
93 - android:layout_height="wrap_content"  
94 - android:layout_marginLeft="@dimen/dp_16"  
95 - android:layout_marginRight="@dimen/dp_16"  
96 - android:layout_marginBottom="@dimen/dp_16"></androidx.recyclerview.widget.RecyclerView>  
97 - </LinearLayout>  
98 - <LinearLayout  
99 - android:layout_marginTop="@dimen/dp_8"  
100 - android:layout_width="match_parent"  
101 - android:orientation="vertical"  
102 - android:background="#FFFFFF"  
103 - android:layout_height="wrap_content">  
104 - <LinearLayout  
105 - android:layout_width="match_parent"  
106 - android:layout_height="@dimen/dp_54"  
107 - android:gravity="center_vertical"  
108 - android:orientation="horizontal">  
109 - <TextView  
110 - android:layout_width="wrap_content"  
111 - android:layout_height="wrap_content"  
112 - android:textColor="#F57F17"  
113 - android:layout_marginLeft="@dimen/dp_16"  
114 - android:textSize="@dimen/sp_16"  
115 - android:text="通知主题"/>  
116 - <EditText  
117 - android:layout_width="0dp"  
118 - android:layout_height="wrap_content"  
119 - android:layout_weight="1"  
120 - android:gravity="right"  
121 - android:layout_marginRight="@dimen/dp_16"  
122 - android:hint="请输入"  
123 - android:background="@null"  
124 - android:textSize="@dimen/sp_16"  
125 - android:textColor="#8C9198"/>  
126 - </LinearLayout>  
127 - <EditText  
128 - android:background="@null"  
129 - android:layout_width="match_parent"  
130 - android:layout_height="wrap_content"  
131 - android:minHeight="@dimen/dp_120"  
132 - android:gravity="top"  
133 - android:hint="请输入内容..."  
134 - android:paddingLeft="@dimen/dp_16"  
135 - android:paddingRight="@dimen/dp_16"  
136 - android:paddingTop="@dimen/dp_16"/>  
137 - <androidx.recyclerview.widget.RecyclerView  
138 - android:layout_marginTop="@dimen/dp_12"  
139 - android:layout_width="match_parent"  
140 - android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>  
141 - <androidx.recyclerview.widget.RecyclerView  
142 - android:layout_marginTop="@dimen/dp_12"  
143 - android:layout_width="match_parent"  
144 - android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>  
145 - <LinearLayout  
146 - android:layout_width="match_parent"  
147 - android:layout_height="@dimen/dp_60"  
148 - android:orientation="horizontal">  
149 - <ImageView  
150 - android:layout_width="wrap_content"  
151 - android:layout_height="wrap_content"  
152 - android:layout_gravity="center_vertical"  
153 - android:layout_marginLeft="@dimen/dp_16"  
154 - android:src="@mipmap/ic_voice"/>  
155 - <ImageView  
156 - android:layout_width="wrap_content"  
157 - android:layout_height="wrap_content"  
158 - android:layout_gravity="center_vertical"  
159 - android:layout_marginLeft="@dimen/dp_20"  
160 - android:src="@mipmap/ic_image"/>  
161 - <ImageView  
162 - android:layout_width="wrap_content"  
163 - android:layout_height="wrap_content"  
164 - android:layout_gravity="center_vertical"  
165 - android:layout_marginLeft="@dimen/dp_20"  
166 - android:src="@mipmap/icon_play"/>  
167 - <ImageView  
168 - android:layout_width="wrap_content"  
169 - android:layout_height="wrap_content"  
170 - android:layout_gravity="center_vertical"  
171 - android:layout_marginLeft="@dimen/dp_20"  
172 - android:src="@mipmap/ic_link"/>  
173 - <View  
174 - android:layout_width="0dp"  
175 - android:layout_height="match_parent"  
176 - android:layout_weight="1"  
177 - />  
178 - <TextView  
179 - android:layout_width="wrap_content"  
180 - android:layout_height="wrap_content"  
181 - android:text="0/1000"  
182 - android:layout_gravity="center_vertical"  
183 - android:layout_marginRight="@dimen/dp_16"  
184 - android:textSize="@dimen/sp_12"  
185 - android:textColor="#8C9198"/>  
186 - </LinearLayout>  
187 - </LinearLayout>  
188 - <View  
189 - android:layout_width="match_parent"  
190 - android:layout_height="0.5dp"  
191 - android:background="#EBEBEB"  
192 - android:layout_marginLeft="@dimen/dp_16"  
193 - android:layout_marginRight="@dimen/dp_16"/>  
194 - <LinearLayout  
195 - android:background="#FFFFFF"  
196 - android:layout_width="match_parent"  
197 - android:layout_height="@dimen/dp_60"  
198 - android:orientation="horizontal">  
199 - <TextView  
200 - android:layout_width="wrap_content"  
201 - android:layout_height="wrap_content"  
202 - android:textColor="#F57F17"  
203 - android:layout_marginRight="@dimen/dp_16"  
204 - android:layout_gravity="center_vertical"  
205 - android:textSize="@dimen/sp_16"  
206 - android:layout_marginLeft="@dimen/dp_16"  
207 - android:text="喜报加分"  
208 - />  
209 - <View  
210 - android:layout_width="0dp"  
211 - android:layout_height="match_parent"  
212 - android:layout_weight="1"  
213 - />  
214 - <TextView  
215 - android:layout_width="wrap_content"  
216 - android:layout_height="wrap_content"  
217 - android:text="+0分"  
218 - android:textStyle="bold"  
219 - android:layout_gravity="center_vertical"  
220 - android:layout_marginRight="@dimen/dp_16"  
221 - android:textSize="@dimen/sp_12"  
222 - android:textColor="#3D444D"/>  
223 - </LinearLayout>  
224 - </LinearLayout>  
225 - </androidx.core.widget.NestedScrollView>  
226 - <LinearLayout  
227 - android:layout_width="match_parent"  
228 - android:layout_height="@dimen/dp_60"  
229 - android:orientation="vertical"  
230 - android:gravity="center"  
231 - android:background="#FFFFFF"  
232 - android:layout_alignParentBottom="true">  
233 - <Button  
234 - android:layout_width="@dimen/dp_343"  
235 - android:layout_height="@dimen/dp_44"  
236 - android:gravity="center"  
237 - android:textColor="#FFFFFF"  
238 - android:textSize="@dimen/sp_14"  
239 - android:text="发布通知"  
240 - android:background="@drawable/dot_yellow"/>  
241 - </LinearLayout>  
242 -</RelativeLayout>  
@@ -97,6 +97,8 @@ @@ -97,6 +97,8 @@
97 android:layout_weight="1" /> 97 android:layout_weight="1" />
98 98
99 <TextView 99 <TextView
  100 + android:text=""
  101 + android:id="@+id/select_text"
100 android:layout_width="wrap_content" 102 android:layout_width="wrap_content"
101 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
102 android:textColor="#8C9198" 104 android:textColor="#8C9198"
@@ -225,7 +227,40 @@ @@ -225,7 +227,40 @@
225 android:layout_weight="1" 227 android:layout_weight="1"
226 /> 228 />
227 </LinearLayout> 229 </LinearLayout>
  230 + <LinearLayout
  231 + android:background="#FFFFFF"
  232 + android:layout_width="match_parent"
  233 + android:layout_height="@dimen/dp_60"
  234 + android:orientation="horizontal">
  235 + <TextView
  236 + android:layout_width="wrap_content"
  237 + android:layout_height="wrap_content"
  238 + android:textColor="#F57F17"
  239 + android:layout_marginRight="@dimen/dp_16"
  240 + android:layout_gravity="center_vertical"
  241 + android:textSize="@dimen/sp_16"
  242 + android:layout_marginLeft="@dimen/dp_16"
  243 + android:text="喜报加分"
  244 + />
  245 + <View
  246 + android:layout_width="0dp"
  247 + android:layout_height="match_parent"
  248 + android:layout_weight="1"
  249 + />
  250 + <TextView
  251 + android:id="@+id/tv_xbjf"
  252 + android:layout_width="wrap_content"
  253 + android:layout_height="wrap_content"
  254 + android:text="+0分"
  255 + android:textStyle="bold"
  256 + android:layout_gravity="center_vertical"
  257 + android:layout_marginRight="@dimen/dp_16"
  258 + android:textSize="@dimen/sp_12"
  259 + android:textColor="#3D444D"/>
  260 + </LinearLayout>
  261 +
228 </LinearLayout> 262 </LinearLayout>
  263 +
229 </androidx.core.widget.NestedScrollView> 264 </androidx.core.widget.NestedScrollView>
230 <LinearLayout 265 <LinearLayout
231 android:layout_width="match_parent" 266 android:layout_width="match_parent"
@@ -135,6 +135,6 @@ @@ -135,6 +135,6 @@
135 android:textColor="#FFFFFF" 135 android:textColor="#FFFFFF"
136 android:textSize="@dimen/sp_14" 136 android:textSize="@dimen/sp_14"
137 android:text="添加" 137 android:text="添加"
138 - android:background="@drawable/dot_yellow1"/> 138 + android:background="@drawable/dot_yellow"/>
139 </LinearLayout> 139 </LinearLayout>
140 </RelativeLayout> 140 </RelativeLayout>
@@ -139,10 +139,10 @@ @@ -139,10 +139,10 @@
139 android:text="已查看" 139 android:text="已查看"
140 /> 140 />
141 <LinearLayout 141 <LinearLayout
  142 + android:visibility="gone"
142 android:layout_width="match_parent" 143 android:layout_width="match_parent"
143 android:layout_height="match_parent"> 144 android:layout_height="match_parent">
144 <TextView 145 <TextView
145 -  
146 android:layout_width="wrap_content" 146 android:layout_width="wrap_content"
147 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
148 android:layout_marginTop="@dimen/dp_12" 148 android:layout_marginTop="@dimen/dp_12"