6.24.2

处理详情重写

app/src/main/java/com/silence/commonframe/activity/message/Interface/NewDetailShowListener.java

@@ -0,0 +1,17 @@
+package com.silence.commonframe.activity.message.Interface;
+
+import com.silence.commonframe.base.basemvp.BaseModel;
+import com.silence.commonframe.base.basemvp.BasePresenter;
+import com.silence.commonframe.model.RecheckMsgDetailModel;
+
+public interface NewDetailShowListener {
+    interface View{
+        String getId();
+
+        void onSuccess(RecheckMsgDetailModel.DataBean dataBean);
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View, BaseModel>{
+        public abstract void getRecheckMsgDetail();
+    }
+}

app/src/main/java/com/silence/commonframe/activity/message/activity/NewsdetailActivityShow.java

@@ -27,7 +27,10 @@ import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.message.Interface.NewDetailShowListener;
+import com.silence.commonframe.activity.message.presenter.NewDetailShowPresenter;
 import com.silence.commonframe.adapter.PictureDeviceAdapter;
+import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.model.RecheckMsgDetailModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
@@ -35,6 +38,7 @@ import com.ywl5320.wlmedia.WlMedia;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -48,7 +52,7 @@ import cn.jzvd.JzvdStd;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener, MediaPlayer.OnCompletionListener {
+public class NewsdetailActivityShow extends BaseActivity implements NewDetailShowListener.View,SeekBar.OnSeekBarChangeListener, MediaPlayer.OnCompletionListener {
     @BindView(R.id.tv_checkname)
     TextView tvCheckname;
    @BindView(R.id.tv_time)
@@ -76,22 +80,20 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
     private List<String> list = new ArrayList<>();
     private  String deviceId = null;
 
-
     private  String  username = null;
     private  String recheckName = null;
     private  String recheckMsg = null;
     private  String recheckTime = null;
 
-   private String recheckPic = null;
-   private String recheckAudio = null;
-   private String recheckVideo = null;
+    private String recheckPic = null;
+    private String recheckAudio = null;
+    private String recheckVideo = null;
 
     private WlMedia wlMedia;
     private int seek_per = 0;
     private double duration;
     private MediaPlayer mediaPlayer;
 
-
     //状态
     private final int IDLING = 0; // 空闲中
     private final int PLAYING = 1; // 播放中
@@ -105,22 +107,95 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
     // 是否正在拖动进度条中.
     private boolean isTrackingTouch = false;
 
-   private static   String videoUrl1 = null;
+    private static   String videoUrl1 = null;
+
+    private NewDetailShowPresenter presenter;
+
+    private PictureDeviceAdapter pictureDeviceAdapter;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_newsdetail_show;
+    }
 
+    @Override
+    public void initPresenter() {
+        presenter = new NewDetailShowPresenter(this,this);
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_newsdetail_show);
-        ButterKnife.bind(this);
-        initWindows();
+    public void initView() {
+        setTitle(this,getResources().getString(R.string.recheck_detail),"",true);
         Intent intent = getIntent();
         deviceId = intent.getStringExtra("id");
 
-        getDeviceType();
+        pictureRecyvlerview.setLayoutManager(new GridLayoutManager(NewsdetailActivityShow.this, 4));
+        pictureDeviceAdapter = new PictureDeviceAdapter(NewsdetailActivityShow.this,list);
+        pictureRecyvlerview.setAdapter(pictureDeviceAdapter);
+
+        presenter.getRecheckMsgDetail();
+    }
+
+    @Override
+    public String getId() {
+        return deviceId;
+    }
+
+    @Override
+    public void onSuccess(RecheckMsgDetailModel.DataBean dataBean) {
+        HashMap<String,String> hashMap = new HashMap<>();
+        recheckPic = dataBean.getRecheckPic();
+        recheckAudio = dataBean.getRecheckAudio();
+        recheckVideo = dataBean.getRecheckVideo();
+
+        username = dataBean.getUsername();
+        recheckName = dataBean.getRecheckName();
+        recheckMsg = dataBean.getRecheckMsg();
+        recheckTime = dataBean.getRecheckTime();
+
+        String[] pic = recheckPic.split(",");
+        list.addAll(Arrays.asList(pic));
+        hashMap.put("recheckPic",recheckPic);
+        hashMap.put("recheckAudio",recheckAudio);
+        hashMap.put("recheckVideo",recheckVideo);
+
+        listmap.add(hashMap);
+
+        tvCheckname.setText("复核人员："+username);
+        tvTime.setText("处理时间："+recheckTime);
+        if(TextUtils.isEmpty(recheckName)){
+            tvResult.setText("处理结果：");
+        }else {
+            tvResult.setText("处理结果："+recheckName);
+        }
+
+        tvDescribe.setText(recheckMsg);
+        if (TextUtils.isEmpty(recheckAudio)){
+            tvSound.setVisibility(View.VISIBLE);
+            ll_sound.setVisibility(View.GONE);
+            seekBar.setVisibility(View.GONE);
+        }
+        if (TextUtils.isEmpty(recheckVideo)){
+            tv_Video.setVisibility(View.VISIBLE);
+            videoView.setVisibility(View.GONE);
+        }
+
+        videoUrl1 = ApiService.httpUrl1 +recheckVideo;
 
+        String videoUrl = ApiService.httpUrl1 +recheckAudio;
+        Uri uri1 = Uri.parse(videoUrl);
+        videoView.setUp(videoUrl
+                , "", JzvdStd.SCREEN_WINDOW_NORMAL);
+
+        Jzvd.setJzUserAction(new MyUserActionStd());
+
+        pictureDeviceAdapter.notifyDataSetChanged();
     }
 
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 
     class MyPlayerOnCompletionListener implements MediaPlayer.OnCompletionListener {
 
@@ -130,7 +205,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
         }
     }
 
-
     class MyPlayerSoundOnCompletionListener implements MediaPlayer.OnCompletionListener {
 
         @Override
@@ -139,7 +213,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
         }
     }
 
-
     /**
      * 获取状态栏高度
      * @return
@@ -154,7 +227,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
         return result;
     }
 
-
     /**
      * 这只是给埋点统计用户数据用的，不能写和播放相关的逻辑，监听事件请参考MyJzvdStd，复写函数取得相应事件
      */
@@ -216,27 +288,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
         }
     }
 
-
-    public void click(View view) {
-        finish();
-    }
-
-    private void initWindows() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-
-  //  String id = "b45a42e59f50475f8b9ddb343a549c12";
-
     /**
      * 获取设备类型：图片和名字
      */
@@ -263,23 +314,18 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                         if ("success".equals(message)) {
 //                            List<DeviceType.ObjectBean> listData = deviceType.getData();
 //                            for (int i = 0; i < listData.size(); i++){
-                                HashMap<String,String> hashMap = new HashMap<>();
-                                 recheckPic = recheckMsgDetailModel.getData().getRecheckPic();
-                                recheckAudio = recheckMsgDetailModel.getData().getRecheckAudio();
-                                 recheckVideo = recheckMsgDetailModel.getData().getRecheckVideo();
-
-
-                                username = recheckMsgDetailModel.getData().getUsername();
-                                recheckName = recheckMsgDetailModel.getData().getRecheckName();
-                                recheckMsg = recheckMsgDetailModel.getData().getRecheckMsg();
-                                 recheckTime = recheckMsgDetailModel.getData().getRecheckTime();
+                            HashMap<String,String> hashMap = new HashMap<>();
+                            recheckPic = recheckMsgDetailModel.getData().getRecheckPic();
+                            recheckAudio = recheckMsgDetailModel.getData().getRecheckAudio();
+                            recheckVideo = recheckMsgDetailModel.getData().getRecheckVideo();
 
+                            username = recheckMsgDetailModel.getData().getUsername();
+                            recheckName = recheckMsgDetailModel.getData().getRecheckName();
+                            recheckMsg = recheckMsgDetailModel.getData().getRecheckMsg();
+                            recheckTime = recheckMsgDetailModel.getData().getRecheckTime();
 
                             String[] pic = recheckPic.split(",");
-                            for (int i = 0 ; i <pic.length ; i++ )
-                            {
-                                list.add(pic[i]);
-                            }
+                            list.addAll(Arrays.asList(pic));
                                 hashMap.put("recheckPic",recheckPic);
                                 hashMap.put("recheckAudio",recheckAudio);
                                 hashMap.put("recheckVideo",recheckVideo);
@@ -300,7 +346,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                                     tvDescribe.setText(recheckMsg);
                                     if (TextUtils.isEmpty(recheckAudio)){
                                         tvSound.setVisibility(View.VISIBLE);
-                              //          soundView.setVisibility(View.GONE);//ll_sound
                                         ll_sound.setVisibility(View.GONE);
                                         seekBar.setVisibility(View.GONE);
                                     }
@@ -309,40 +354,23 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                                         videoView.setVisibility(View.GONE);
                                     }
 
-                                //    String videoUrl2 = "https://www.hsh-iot.com/hsh_app/api/file/video/155902642914154651.mp4";
-                                   videoUrl1 = ApiService.httpUrl1 +recheckVideo;
-                                 //   Uri uri = Uri.parse(videoUrl2);
+                                    videoUrl1 = ApiService.httpUrl1 +recheckVideo;
 
-                               //     String videoUrl = "https://www.hsh-iot.com/hsh_app/api/file/audio/155902643651352754.wav";
                                     String videoUrl = ApiService.httpUrl1 +recheckAudio;
                                     Uri uri1 = Uri.parse(videoUrl);
                                     videoView.setUp(videoUrl
                                             , "", JzvdStd.SCREEN_WINDOW_NORMAL);
-                                    // Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView);
+
                                     Jzvd.setJzUserAction(new MyUserActionStd());
 
-//                                    soundView.setMediaController(new MediaController(NewsdetailActivityShow.this));
-//                                    //   soundView.setMediaController(mediaController);
-//
-//                                    //播放完成回调
-//                                    soundView.setOnCompletionListener(new MyPlayerSoundOnCompletionListener());
-//
-//                                    //设置视频路径
-//                                    soundView.setVideoURI(uri);
                                     pictureRecyvlerview.setLayoutManager(new GridLayoutManager(NewsdetailActivityShow.this, 4));
-                                    //    addDeviceAdapter = new AddDeviceAdapter(AdddeviceActivity.this, listmap);
                                     PictureDeviceAdapter pictureDeviceAdapter = new PictureDeviceAdapter(NewsdetailActivityShow.this,list);
                                     pictureRecyvlerview.setAdapter(pictureDeviceAdapter);
-                                    //  addDeviceAdapter.notifyDataSetChanged();
                                 }
                             });
                         }else {
                             LoginIn.tokenOut(code, message, NewsdetailActivityShow.this);
                         }
-                     //   HashMap<String, String> hashMap = new HashMap<>();
-//                            HashMap<String,String> hashMap_qt = new HashMap<>();    //最后加一个其他
-//                            hashMap_qt.put("groupName","其他");
-//                            listmap.add(hashMap_qt);
                     }
                 });
 
@@ -380,8 +408,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
             currentState=PAUSING;
             //是正在暂停;
             isStop = true;
-
-
     }
 
     //停止,
@@ -500,13 +526,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                     currentTime = currentTime/1000;
                     final int m = currentTime / 60;
                     final int s = currentTime % 60;
-                    //在主线程中更新
-//                    runOnUiThread(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            tv_current_time.setText(m + ":" + s);
-//                        }
-//                    });
                 }
                 //休眠1s
                 SystemClock.sleep(1000);
@@ -514,11 +533,4 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
         }
     }
 
-
-
-
-
-
-
-
 }

app/src/main/java/com/silence/commonframe/activity/message/presenter/NewDetailShowPresenter.java

@@ -0,0 +1,53 @@
+package com.silence.commonframe.activity.message.presenter;
+
+import android.app.Activity;
+
+import com.google.gson.Gson;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
+import com.silence.commonframe.ApiService;
+import com.silence.commonframe.activity.message.Interface.NewDetailShowListener;
+import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.model.RecheckMsgDetailModel;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class NewDetailShowPresenter extends NewDetailShowListener.Presenter {
+
+    public NewDetailShowPresenter(Activity mContext, NewDetailShowListener.View mView){
+        this.mContext = mContext;
+        this.mView = mView;
+    }
+
+    @Override
+    public void getRecheckMsgDetail() {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.GET_RECHECK_MSG_DETAIL)
+                .tag(this)
+                .params("id",mView.getId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        RecheckMsgDetailModel data = new Gson().fromJson(s,RecheckMsgDetailModel.class);
+                        if (data.getCode() == 0){
+                            mView.onSuccess(data.getData());
+                        }else {
+                            LoginIn.tokenOut(data.getCode(),mContext);
+                            mView.onFile(data.getMsg());
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+}

app/src/main/java/com/silence/commonframe/common/constant/UrlConstants.java

@@ -68,6 +68,8 @@ public interface UrlConstants {
     String GET_FIRE_ALARM = "/getFireAlarm";
     //点击知道火警信息
     String READ_FIRE_ALARM = "/readFireAlarm";
+    //获取处理详情
+    String GET_RECHECK_MSG_DETAIL = "/getRecheckMsgDetail";
 
     /*--------------------------------设置界面-----------------------------------------*/
     //获取微信绑定信息

app/src/main/res/layout/activity_newsdetail_show.xml

@@ -1,90 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.message.activity.NewsdetailActivityShow"
+    android:background="#fff"
+    android:orientation="vertical">
+
+    <com.silence.commonframe.base.basemvp.TitleBar
+        android:id="@+id/base_title_bar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".activity.message.activity.NewsdetailActivityShow"
-        android:background="#fff"
-        android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="63dp"
-        android:gravity="bottom"
-        android:background="#4e69ff">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp"
-            android:layout_alignParentBottom="true"
-            android:gravity="center_vertical"
-            android:onClick="click"
-            android:layout_marginLeft="10dp">
-
-            <ImageView
-                android:id="@+id/imageView4"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:background="@mipmap/whiteback"
-                />
-
-            <TextView
-                android:id="@+id/textView15"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textColor="#00000000"
-                android:textSize="19sp"
-                android:text="返回" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:gravity="center_horizontal"
-            android:layout_marginBottom="6dp">
-
-            <TextView
-                android:id="@+id/tv6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="处理详情"
-                android:textColor="#fff"
-                android:textSize="19sp"/>
-
-        </LinearLayout>
-
-
-
-        <!--<ImageView-->
-        <!--android:id="@+id/imageView_daohang"-->
-        <!--android:layout_width="35dp"-->
-        <!--android:layout_height="31dp"-->
-        <!--android:layout_marginBottom="9dp"-->
-        <!--app:srcCompat="@mipmap/daohang" />-->
-
-
-
-        <!--<TextView-->
-
-            <!--android:id="@+id/textView_comfirm"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_marginBottom="6dp"-->
-            <!--android:text="复核"-->
-            <!--android:layout_alignParentRight="true"-->
-            <!--android:layout_alignParentBottom="true"-->
-            <!--android:textColor="#fff"-->
-            <!--android:onClick="check"-->
-            <!--android:textSize="19sp"-->
-            <!--android:layout_marginRight="10dp"/>-->
-
-
-    </RelativeLayout>
+        android:layout_height="wrap_content"/>
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -153,6 +153,9 @@
     <!-- 消息 -->
     <string name="recheck_error">复核失败，请重新确认！</string>
     <string name="recheck_success">复核确认成功！</string>
+    <string name="message_detail">记录详情</string>
+    <string name="recheck">复核</string>
+    <string name="recheck_detail">处理详情</string>
 
     <!-- 我的 -->
     <string name="site_list">场所列表</string>
@@ -168,6 +171,7 @@
     <string name="user_agreement">用户协议</string>
     <string name="privacy_policy">隐私政策</string>
 
+
     <string name="EE_OK">OK</string>
     <string name="EE_OBJ_NOT_EXIST">EE_OBJ_NOT_EXIST</string>
     <string name="EE_ERROR">EE_ERROR</string>