6.21.1

app/src/main/java/com/silence/commonframe/activity/CheckActivity.java

@@ -15,11 +15,17 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+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.R;
+import com.silence.commonframe.activity.Interface.CheckListener;
+import com.silence.commonframe.activity.presenter.CheckPresenter;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.bean.BaseBean;
+import com.silence.commonframe.model.TroubleDeviceModel;
 import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
@@ -35,7 +41,7 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class CheckActivity extends AppCompatActivity {
+public class CheckActivity extends BaseActivity implements CheckListener.View {
    @BindView(R.id.tv_place)
     TextView tvPlace;
    @BindView(R.id.tv_sitename)
@@ -68,78 +74,79 @@ public class CheckActivity extends AppCompatActivity {
     private HashMap<String, String> list1;
     int SUB_CODE=102;
 
-    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    TroubleDeviceModel.DataBean dataBean;
+    CheckPresenter presenter;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_check;
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_check);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
+    public void initPresenter() {
+        presenter = new CheckPresenter(this,this);
+    }
+
+    @Override
+    public void initView() {
+        //TODO title状态栏还没改，需要右侧文字的监听事件
         initWindows();
         list1 = new HashMap<>();
-        Intent intent = getIntent();
-
-        Bundle bundle = intent.getExtras();
+        String jsonData = getIntent().getStringExtra("listmap");
         //  list1 = (List<HashMap<String, String>>) bundle.getSerializable("listmap");
-        if (bundle != null) {
-            list1 = (HashMap<String, String>) bundle.getSerializable("listmap");
-            if (list1 != null) {
-                processId = list1.get("processId");
-                tvPlace.setText("场所名称：" + list1.get("deployment"));
-                tvSitename.setText("设备类型：" + list1.get("deviceName"));
-                tvSitepalce.setText("安装位置：" + list1.get("location"));
-                if ("1".equals(list1.get("troubleType"))) {
-                    tvType.setText("火警");
-                    tvType.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
-                }
+        dataBean = new Gson().fromJson(jsonData,TroubleDeviceModel.DataBean.class);
+        if (list1 != null) {
+            processId = dataBean.getId();
+            tvPlace.setText("场所名称：" + dataBean.getDeployment());
+            tvSitename.setText("设备类型：" + dataBean.getDeviceName());
+            tvSitepalce.setText("安装位置：" + dataBean.getLocation());
+            if ("1".equals(dataBean.getTroubleType())) {
+                tvType.setText("火警");
+                tvType.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
+            }
 
+            tvTime.setText("发生时间：" + dataBean.getGmtCreate());
 
-                tvTime.setText("发生时间：" + list1.get("gmtCreate"));
-
-                btTypetest.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        fireType = "03";   //火警为火警测试
-                        proType = "03";
-                        btTypetest.setBackgroundResource(R.drawable.bg_corner_blue);
-                        btTypetest.setTextColor(Color.rgb(255, 255, 255));
-                        btTypeerror.setBackgroundResource(R.drawable.bg_corner);
-                        btTypeerror.setTextColor(Color.rgb(78, 105, 255));
-                        btTypereal.setBackgroundResource(R.drawable.bg_corner);
-                        btTypereal.setTextColor(Color.rgb(78, 105, 255));
-                    }
-                });
-
-                btTypeerror.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        fireType = "02";   //火警为火警误报
-                        proType = "02";
-                        btTypetest.setBackgroundResource(R.drawable.bg_corner);
-                        btTypetest.setTextColor(Color.rgb(78, 105, 255));
-                        btTypeerror.setBackgroundResource(R.drawable.bg_corner_blue);
-                        btTypeerror.setTextColor(Color.rgb(255, 255, 255));
-                        btTypereal.setBackgroundResource(R.drawable.bg_corner);
-                        btTypereal.setTextColor(Color.rgb(78, 105, 255));
-                    }
-                });
-
-                btTypereal.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        fireType = "01";   //火警为真实火警
-                        proType = "01";
-                        btTypetest.setBackgroundResource(R.drawable.bg_corner);
-                        btTypetest.setTextColor(Color.rgb(78, 105, 255));
-                        btTypeerror.setBackgroundResource(R.drawable.bg_corner);
-                        btTypeerror.setTextColor(Color.rgb(78, 105, 255));
-                        btTypereal.setBackgroundResource(R.drawable.bg_corner_blue);
-                        btTypereal.setTextColor(Color.rgb(255, 255, 255));
-                    }
-                });
+            btTypetest.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fireType = "03";   //火警为火警测试
+                    proType = "03";
+                    changeType(btTypetest);
+                }
+            });
+
+            btTypeerror.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fireType = "02";   //火警为火警误报
+                    proType = "02";
+                    changeType(btTypeerror);
+                }
+            });
+
+            btTypereal.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fireType = "01";   //火警为真实火警
+                    proType = "01";
+                    changeType(btTypereal);
+                }
+            });
 
-            }
         }
+
+    }
+
+    private void changeType(TextView tvType) {
+        btTypetest.setBackgroundResource(R.drawable.bg_corner);
+        btTypetest.setTextColor(Color.rgb(78,105,255));
+        btTypeerror.setBackgroundResource(R.drawable.bg_corner);
+        btTypeerror.setTextColor(Color.rgb(78, 105, 255));
+        btTypereal.setBackgroundResource(R.drawable.bg_corner);
+        btTypereal.setTextColor(Color.rgb(78, 105, 255));
+        tvType.setBackgroundResource(R.drawable.bg_corner_blue);
+        tvType.setTextColor(Color.rgb(255, 255, 255));
     }
 
     public void myclick(View view) {
@@ -161,55 +168,13 @@ public class CheckActivity extends AppCompatActivity {
     }
 
     public void click(View view) {
-        geCheck();
+        presenter.reCheckTrouble();
     }
 
     public void click1(View view) {
         finish();
     }
 
-
-    private void geCheck() {
-//        OkGo.get("http://wthrcdn.etouch.cn/weather_mini?citykey=101180101")                            // 请求方式和请求url
-        String url = ApiService.httpUrl1 + Data.getConfigUrl() + "/reCheckTrouble?processId=" + processId + "&recheckType=" + fireType;
-        OkGo.get(url)
-                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
-                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
-                .cacheMode(CacheMode.DEFAULT)    // 缓存模式，详细请看缓存介绍
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            String recheckId=jsonObject.get("data").toString();
-                            if (message.equalsIgnoreCase("success")) {
-                                Toast.makeText(CheckActivity.this, "复核确认成功！", Toast.LENGTH_SHORT).show();
-                                Intent intent = new Intent(CheckActivity.this, NewSubmitActivity.class);
-                                Bundle bundle = new Bundle();
-                                bundle.putSerializable("listmap", list1);
-                                intent.putExtras(bundle);
-                                intent.putExtra("proType", proType);
-                                intent.putExtra("recheckId",recheckId);
-                                startActivityForResult(intent,SUB_CODE);
-                            } else {
-                                LoginIn.tokenOut(message, CheckActivity.this);
-                                Toast.makeText(CheckActivity.this, "复核确认没成功，请重新确认！" + message, Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-                    }
-                });
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -217,4 +182,29 @@ public class CheckActivity extends AppCompatActivity {
             finish();
         }
     }
+
+    @Override
+    public String getProcessId() {
+        return processId;
+    }
+
+    @Override
+    public String getRecheckType() {
+        return fireType;
+    }
+
+    //复核火警信息回调
+    @Override
+    public void onRecheckSuccess(BaseBean<String> data) {
+        startActivityForResult(new Intent()
+                .putExtra("proType",proType)
+                .putExtra("recheckId",data.getData())
+                .putExtra("listmap",new Gson().toJson(dataBean))
+                .setClass(this, NewSubmitActivity.class),SUB_CODE);
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

app/src/main/java/com/silence/commonframe/activity/Interface/CheckListener.java

@@ -0,0 +1,18 @@
+package com.silence.commonframe.activity.Interface;
+
+import com.silence.commonframe.base.basemvp.BaseModel;
+import com.silence.commonframe.base.basemvp.BasePresenter;
+import com.silence.commonframe.bean.BaseBean;
+
+public interface CheckListener {
+    interface View{
+        String getProcessId();
+        String getRecheckType();
+
+        void onRecheckSuccess(BaseBean<String> data);
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View,BaseModel>{
+        public abstract void reCheckTrouble();
+    }
+}

app/src/main/java/com/silence/commonframe/activity/NewSubmitActivity.java

@@ -40,6 +40,7 @@ import com.silence.commonframe.adapter.NewSubmitAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.PhotoNormalBean;
 import com.silence.commonframe.common.constant.BaseConstants;
+import com.silence.commonframe.model.TroubleDeviceModel;
 import com.silence.commonframe.model.UploadModel;
 import com.silence.commonframe.soundrecording.AudioRecoderUtils;
 import com.silence.commonframe.soundrecording.PopupWindowFactory;
@@ -119,7 +120,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
     private String localVideoPath="";
     private NewSubmitPresenter presenter;
 
-    private HashMap<String, String> listmap;
+    private TroubleDeviceModel.DataBean listmap;
     String proType="";
     String recheckId="";
     LoadingDialog loadingDialog;
@@ -166,8 +167,8 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
         if (mMediaPlayer == null) mMediaPlayer = new MediaPlayer();
         mAudioRecoderUtils = new AudioRecoderUtils();
         Intent intent = getIntent();
-        Bundle bundle = intent.getExtras();
-        listmap = (HashMap<String, String>) bundle.getSerializable("listmap");
+        String jsonData = intent.getStringExtra("listmap");
+        listmap = new Gson().fromJson(jsonData,TroubleDeviceModel.DataBean.class);
         proType = intent.getStringExtra("proType");
         recheckId=intent.getStringExtra("recheckId");
 
@@ -312,7 +313,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
 
     @Override
     public String getProcessId() {
-        return listmap.get("processId")==null?"":listmap.get("processId");
+        return listmap.getId()==null?"":listmap.getId();
     }
 
     @Override

app/src/main/java/com/silence/commonframe/activity/NewsdetailActivity.java

@@ -137,7 +137,7 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
                 tvFiretype.setText("其他");
             }
             recheckId = dataBean.getRecheckId();
-            processId = dataBean.getMessageId();
+            processId = dataBean.getId();
         }
         presenter.getRecheckMsg();
     }

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

@@ -285,19 +285,12 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                             {
                                 list.add(pic[i]);
                             }
-
-
-
-
                                 hashMap.put("recheckPic",recheckPic);
                                 hashMap.put("recheckAudio",recheckAudio);
                                 hashMap.put("recheckVideo",recheckVideo);
 
                                 listmap.add(hashMap);
 
-
-
-
                             runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
@@ -319,11 +312,8 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                                     if (TextUtils.isEmpty(recheckVideo)){
                                         tv_Video.setVisibility(View.VISIBLE);
                                         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);
@@ -344,19 +334,6 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
 //
 //                                    //设置视频路径
 //                                    soundView.setVideoURI(uri);
-
-
-
-
-
-
-
-
-
-
-
-
-
                                     pictureRecyvlerview.setLayoutManager(new GridLayoutManager(NewsdetailActivityShow.this, 4));
                                     //    addDeviceAdapter = new AddDeviceAdapter(AdddeviceActivity.this, listmap);
                                     PictureDeviceAdapter pictureDeviceAdapter = new PictureDeviceAdapter(NewsdetailActivityShow.this,list);
@@ -368,32 +345,13 @@ public class NewsdetailActivityShow extends AppCompatActivity implements SeekBar
                             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);
-
-
-
                     }
                 });
 
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    }
 
     //开始,注意开始有两种的起点:1>是从空闲状态下开始2>是从暂停的状态的情况下开始;
     //如果是从1,播放器就必须准备好才能开始,如果2可以直接开始;

app/src/main/java/com/silence/commonframe/activity/presenter/CheckPresenter.java

@@ -0,0 +1,58 @@
+package com.silence.commonframe.activity.presenter;
+
+import android.app.Activity;
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
+import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.CheckListener;
+import com.silence.commonframe.bean.BaseBean;
+import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class CheckPresenter extends CheckListener.Presenter {
+
+    public CheckPresenter(Activity mContext, CheckListener.View mView){
+        this.mContext=mContext;
+        this.mView=mView;
+    }
+
+    //复核火警信息
+    @Override
+    public void reCheckTrouble() {
+        OkGo.get(UrlConstants.RECHECK_TROUBLE)
+                .tag(this)
+                .params("processId",mView.getProcessId())
+                .params("recheckType",mView.getRecheckType())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean<String> data = new Gson().fromJson(s,new TypeToken<BaseBean<String>>(){}.getType());
+                        if (data.code == 0){
+                            mView.onFile(mContext.getResources().getString(R.string.recheck_success));
+                            mView.onRecheckSuccess(data);
+                        }else {
+                            LoginIn.tokenOut(data.code,data.msg,mContext);
+                            mView.onFile(mContext.getResources().getString(R.string.recheck_error));
+                        }
+                    }
+
+                    @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

@@ -58,4 +58,6 @@ public interface UrlConstants {
     String GET_TROUBLE_DEVICE = BASE_FIND_URL + "app/getTroubleDevice";
     //获取复核信息
     String GET_RECHECK_MSG = BASE_FIND_URL + "app/getRecheckMsg";
+    //复核火警信息
+    String RECHECK_TROUBLE = BASE_FIND_URL + "app/reCheckTrouble";
 }

app/src/main/java/com/silence/commonframe/fragment/FindFragment1.java

@@ -105,7 +105,6 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
 
     @Override
     protected void initView() {
-        presenter.getData();
         clickTitle(getActivity(),getResources().getString(R.string.text_tab_find),R.mipmap.search,false).setRightClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -116,11 +115,15 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                type = "";
+                type1 = "ok";
+                type2 = "ok";
+                type3 = "ok";
                 checktime = "1";
+
                 presenter.getData();
             }
         });
+        srlRefresh.autoRefresh();
         srlRefresh.setEnableAutoLoadMore(false);
     }
 
@@ -139,126 +142,10 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
             checktime = intent.getStringExtra("checktime");
             timestart = intent.getStringExtra("timestart");
             overtime = intent.getStringExtra("overtime");
-            dealType();
             presenter.getData();
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-    }
-
-    /*
-    private void getData() {
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("pagesize", 125);
-        params.put("page", 1);
-        params.put("type", type);
-        if (checktime.equals("0")) {
-            params.put("fromTime", timestart);
-            params.put("toTime", overtime);
-        }
-        //   params.put("type", "1");
-        final JSONObject jsonObject = new JSONObject(params);
-        OkGo.post(ApiService.httpUrl1 + Data.getConfigUrl() + "/getTroubleDevice")
-                .tag(this)
-                .cacheKey("cachePostRegister11")
-                .cacheMode(CacheMode.DEFAULT)
-                .upJson(jsonObject.toString())
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        //  Toast.makeText(getContext(), "ff" + s, Toast.LENGTH_SHORT).show();
-                        TroubleDeviceModel troubleDeviceModel;
-                        troubleDeviceModel = new Gson().fromJson(s, TroubleDeviceModel.class);
-                        List<TroubleDeviceModel.DataBean> list = troubleDeviceModel.getData();
-
-                        String message = troubleDeviceModel.getMsg();
-                        if (message.equalsIgnoreCase("success")) {
-                            if (list.size() == 0) {
-                                no_message.setVisibility(View.VISIBLE);
-
-                            } else {
-                                no_message.setVisibility(View.GONE);
-                            }
-                            for (int i = 0; i < list.size(); i++) {
-                                HashMap<String, String> hashMap = new HashMap<>();
-                                String id = list.get(i).getId();
-                                String deviceName = list.get(i).getDeviceName();
-                                String deviceId = list.get(i).getDeviceId();//设备id
-                                String deployment = list.get(i).getDeployment();//区域名称
-                                String location = list.get(i).getLocation();//详细地址
-                                String regionName = list.get(i).getRegionName();//位置
-                                String deviceLocation = list.get(i).getDeviceLocation();//设备位置
-                                String gmtCreate = list.get(i).getGmtCreate();//设备位置
-                                String recheckId = list.get(i).getRecheckId();//有无复核
-//                                System.out.println("kk1" + recheckId);
-                                String troubleType = list.get(i).getTroubleType();
-                                String recheckTime = list.get(i).getRecheckTime();
-                                String recheckType = list.get(i).getRecheckType();
-
-                                if (TextUtils.isEmpty(recheckType)) {
-                                    recheckType = "--";
-                                }
-                                if (recheckType.equals("(null)")) {
-                                    recheckType = "--";
-                                }
-                                String isValid = list.get(i).getIsValid();
-
-                                //   String  deviceName = list.get(i).
-                                hashMap.put("processId", id);
-                                hashMap.put("deviceId", deviceId);
-                                hashMap.put("deployment", deployment);
-                                hashMap.put("location", location);
-                                hashMap.put("regionName", regionName);
-                                hashMap.put("deviceLocation", deviceLocation);
-                                hashMap.put("gmtCreate", gmtCreate);
-                                hashMap.put("troubleType", troubleType);
-                                hashMap.put("deviceName", deviceName);
-                                hashMap.put("recheckTime", recheckTime);
-                                hashMap.put("recheckType", recheckType);
-                                hashMap.put("isValid", isValid);
-
-                                if (TextUtils.isEmpty(recheckId)) {
-                                    recheckId = "11";
-                                }
-                                hashMap.put("recheckId", recheckId);
-                                listmap.add(hashMap);
-                            }
-                        } else {
-                            LoginIn.tokenOut(getContext());
-                        }
-
-                        mActivity.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-//                                mAdapter.setOnItemClickListener(new FindAdapter.MyItemClickListener() {
-//                                    @Override
-//                                    public void onItemClick(View view, int postion) {
-//                                        Intent intent = new Intent(getContext(), NewsdetailActivity.class);
-//                                        Bundle bundle = new Bundle();
-//                                        bundle.putSerializable("listmap", (Serializable) listmap.get(postion));
-//                                        intent.putExtras(bundle);
-//                                        startActivity(intent);
-//                                    }
-//                                });
-//                                mAdapter.notifyDataSetChanged();
-                            }
-                        });
-                    }
-
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-                        Toast.makeText(getContext(), "NOsuccess " + e, Toast.LENGTH_SHORT).show();
-                    }
-                });
-    }
-    */
-
     private String dealType() {
         if ((type1.equals("ok")) && (type2.equals("ok")) && (type3.equals("ok"))) {
             type = "";

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

@@ -74,19 +74,19 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_marginLeft="10dp">
-
+                    android:layout_marginLeft="@dimen/margin_side">
 
                     <TextView
                         android:id="@+id/tv_place"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:gravity="left|center"
                         android:text="场所名称：杭州市海智园1栋3楼"
-                        android:textColor="#444"
-                        android:textSize="16sp" />
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
@@ -97,12 +97,13 @@
                         android:id="@+id/tv_sitename"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:gravity="left|center"
-                        android:textColor="#444"
+                        android:textColor="@color/myblack"
                         android:text="设备类型：独立烟感报警探测器"
-                        android:textSize="16sp" />
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
@@ -113,12 +114,13 @@
                         android:id="@+id/tv_sitepalce"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:text="安装位置：墙上"
                         android:gravity="left|center"
-                        android:textColor="#444"
-                        android:textSize="16sp" />
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
@@ -129,12 +131,13 @@
                         android:id="@+id/tv_temp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:text="环境温度：0°C "
                         android:gravity="left|center"
-                        android:textColor="#444"
-                        android:textSize="16sp" />
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
@@ -145,12 +148,13 @@
                         android:id="@+id/tv_smoke"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:text="烟雾浓度：0db/m "
                         android:gravity="left|center"
-                        android:textColor="#444"
-                        android:textSize="16sp" />
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
@@ -160,16 +164,17 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp">
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:text="警情类型："
                             android:gravity="left|center"
-                            android:textColor="#444"
-                            android:textSize="16sp"/>
+                            android:textColor="@color/myblack"
+                            android:textSize="15sp"/>
 
                         <TextView
                             android:id="@+id/tv_type"
@@ -177,8 +182,8 @@
                             android:layout_height="match_parent"
                             android:text="火警"
                             android:gravity="left|center"
-                            android:textColor="#444"
-                            android:textSize="16sp" />
+                            android:textColor="@color/myblack"
+                            android:textSize="15sp" />
                     </LinearLayout>
 
                     <View
@@ -190,22 +195,25 @@
                         android:id="@+id/tv_time"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:layout_marginBottom="6dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="@dimen/margin_side"
                         android:text="发生时间：2018-12-03"
                         android:gravity="left|center"
-                        android:textColor="#444"
-                        android:textSize="16sp" />
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="@color/mygray"></View>
+
                 </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="20dp"/>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -241,9 +249,10 @@
                         android:background="@drawable/bg_corner"
                         android:textColor="@color/myblue"
                         style="?android:attr/borderlessButtonStyle"
-                        android:text="真实火警"
-                        />
+                        android:text="真实火警" />
+
                 </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
@@ -262,6 +271,7 @@
                     android:onClick="click1"
                     android:text="稍后处理"
                     />
+
                 <Button
                     android:id="@+id/button8"
                     android:layout_width="0dp"

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

@@ -1,10 +1,9 @@
 <?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"
+<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"
-    android:background="#fff"
     android:orientation="vertical"
     tools:context=".activity.NewsdetailActivity">
 
@@ -72,350 +71,360 @@
             android:textSize="19sp" />
 
     </RelativeLayout>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/dp_10"
-            android:background="#f0f0f0"
-            android:text="消息详情"
-            android:textColor="#444"
-            android:textSize="19sp" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <LinearLayout
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="10dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_height="match_parent"
+            android:background="#fff"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="场所名称："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_sitename"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="海智园物业"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-            </LinearLayout>
-
-            <View
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="设备类型："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-                <TextView
-                    android:id="@+id/tv_devicetype"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="独立烟感探测器"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_10"
+                android:background="@color/thinwhite"
+                android:text="消息详情"
+                android:textStyle="bold"
+                android:textColor="@color/myblack"
+                android:textSize="17sp" />
 
             <LinearLayout
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
+                android:layout_marginLeft="@dimen/margin_side"
+                android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="编"
-                    android:textColor="@color/myblack"
-                    android:textSize="17sp" />
-
-                <TextView
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="场所名称："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_sitename"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="海智园物业"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="空格"
-                    android:textColor="#fff"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="设备类型："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_devicetype"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="独立烟感探测器"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="号："
-                    android:textColor="@color/myblack"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_no"
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="编"
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="空格"
+                        android:textColor="#fff"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="号："
+                        android:textColor="@color/myblack"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="289945899"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="289945899"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="位        置："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_location"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="海胜海办公室"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="位        置："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_location"
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="警情类型："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_firetype"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="火警"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <ImageView
+                        android:id="@+id/img_fire"
+                        android:layout_width="19dp"
+                        android:layout_height="19dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="9dp"
+                        android:src="@mipmap/light" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="海胜海办公室"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="电池电压："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_batteryvoltage"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0V"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="警情类型："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_firetype"
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="20dp"
+                        android:text="信号强度："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_signalstrength"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0dB"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="火警"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <ImageView
-
-                    android:id="@+id/img_fire"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="9dp"
-                    android:src="@mipmap/light" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="电池电压："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_batteryvoltage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0V"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:text="信号强度："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_signalstrength"
-                    android:layout_width="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="20dp"
+                        android:text="环境温度："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_cputem"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0℃"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="0dB"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="发生时间："
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="2019-01-13"
+                        android:textColor="#444"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@color/mygray"></View>
 
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:text="环境温度："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_cputem"
+                    android:id="@+id/tv_place"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="0℃"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginRight="@dimen/margin_side"
+                    android:text="浙江省余杭区中兴路6号"
+                    android:lineSpacingMultiplier="1.2"
                     android:textColor="#444"
-                    android:textSize="17sp" />
-
+                    android:textSize="15sp" />
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="发生时间："
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:id="@+id/tv_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="2019-01-13"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-            </LinearLayout>
-
-            <View
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_10"
+                android:background="@color/thinwhite"
+                android:text="复核结果"
+                android:textStyle="bold"
+                android:textColor="@color/myblack"
+                android:textSize="17sp"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recycle_RecheckMsg"
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="4dp"
-                android:background="@color/mygray"></View>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:orientation="horizontal">
-                <!--<TextView-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:textSize="17sp"-->
-                <!--android:textColor="#444"-->
-                <!--android:text="详细地址：" />-->
-
-                <TextView
-                    android:id="@+id/tv_place"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="浙江省余杭区中兴路6号"
-                    android:textColor="#444"
-                    android:textSize="17sp" />
-
-
-            </LinearLayout>
-
+                android:layout_height="match_parent"/>
 
         </LinearLayout>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/dp_10"
-            android:background="#f0f0f0"
-            android:text="复核结果"
-            android:textSize="19sp" />
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recycle_RecheckMsg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+    </ScrollView>
 
 </LinearLayout>

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

@@ -139,6 +139,10 @@
     <string name="camerasetup_common_videomodel">视频模式</string>
     <string name="camerasetup_common_factorydatareset">恢复出厂设置</string>
 
+    <!-- 消息 -->
+    <string name="recheck_error">复核失败，请重新确认！</string>
+    <string name="recheck_success">复核确认成功！</string>
+
 
     <string name="EE_OK">OK</string>
     <string name="EE_OBJ_NOT_EXIST">EE_OBJ_NOT_EXIST</string>