Browse Source

6.22.3
场所详情
联系人列表和添加联系人调整

Moon 6 năm trước cách đây
mục cha
commit
c41a1a4bc7
19 tập tin đã thay đổi với 899 bổ sung925 xóa
  1. 115 0
      app/src/main/java/com/silence/commonframe/Dialog/AddLinkManDialog.java
  2. 149 450
      app/src/main/java/com/silence/commonframe/activity/AddlinkmanActivity.java
  3. 175 162
      app/src/main/java/com/silence/commonframe/activity/AddlinkmandetailActivity.java
  4. 18 0
      app/src/main/java/com/silence/commonframe/activity/Interface/AddLinkManDetailListener.java
  5. 25 0
      app/src/main/java/com/silence/commonframe/activity/Interface/AddLinkManListener.java
  6. 21 41
      app/src/main/java/com/silence/commonframe/activity/SiteManagement.java
  7. 2 0
      app/src/main/java/com/silence/commonframe/activity/presenter/AboutPresenter.java
  8. 64 0
      app/src/main/java/com/silence/commonframe/activity/presenter/AddLinkManDetailPresenter.java
  9. 120 0
      app/src/main/java/com/silence/commonframe/activity/presenter/AddLinkManPresenter.java
  10. 42 0
      app/src/main/java/com/silence/commonframe/base/basemvp/BaseActivity.java
  11. 22 0
      app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java
  12. 1 1
      app/src/main/java/com/silence/commonframe/base/basemvp/TitleBar.java
  13. 76 0
      app/src/main/java/com/silence/commonframe/bean/LinkManBean.java
  14. 8 0
      app/src/main/java/com/silence/commonframe/common/constant/UrlConstants.java
  15. 15 110
      app/src/main/res/layout/activity_addlinkman.xml
  16. 9 77
      app/src/main/res/layout/activity_addlinkmandetail.xml
  17. 35 82
      app/src/main/res/layout/activity_site_management.xml
  18. 0 1
      app/src/main/res/layout/dialog_bottom.xml
  19. 2 1
      app/src/main/res/values/strings.xml

+ 115 - 0
app/src/main/java/com/silence/commonframe/Dialog/AddLinkManDialog.java

@@ -0,0 +1,115 @@
+package com.silence.commonframe.Dialog;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AddLinkManDetailListener;
+import com.silence.commonframe.activity.presenter.AddLinkManDetailPresenter;
+import com.silence.commonframe.utils.Data;
+
+import butterknife.BindView;
+
+public class AddLinkManDialog extends PopupWindow implements View.OnClickListener,AddLinkManDetailListener.View {
+    EditText etName;
+    EditText etPhone;
+    TextView tvCancel;
+    TextView tvSubmit;
+    private selectOnclick listener;
+
+    private String data;
+
+    private AddLinkManDetailPresenter presenter;
+
+    private View mView; // PopupWindow 菜单布局
+    private Activity mContext; // 上下文参数
+
+    public AddLinkManDialog(Activity context,String data) {
+        super(context);
+        this.mContext = context;
+        this.data = data;
+        initViews();
+    }
+    private void initViews() {
+        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mView = inflater.inflate(R.layout.activity_addlinkmandetail, null);
+        etName = mView.findViewById(R.id.et_name);
+        etPhone = mView.findViewById(R.id.et_phone);
+        tvCancel = mView.findViewById(R.id.tv_cancel);
+        tvSubmit = mView.findViewById(R.id.tv_submit);
+
+        presenter = new AddLinkManDetailPresenter(mContext,this);
+
+        // 导入布局
+        this.setContentView(mView);
+        // 设置动画效果
+        this.setBackgroundDrawable(new BitmapDrawable());
+        this.setAnimationStyle(R.style.popwindow_anim_style);
+        this.setWidth(WindowManager.LayoutParams.MATCH_PARENT);
+        this.setHeight(WindowManager.LayoutParams.MATCH_PARENT);
+        // 设置可触
+        this.setFocusable(true);
+        tvCancel.setOnClickListener(this);
+        tvSubmit.setOnClickListener(this);
+    }
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            //确定
+            case R.id.tv_submit:
+                presenter.addLinkMan();
+                break;
+            case R.id.tv_cancel:
+                this.dismiss();
+                break;
+        }
+    }
+
+    @Override
+    public String getName() {
+        return etName.getText().toString().trim();
+    }
+
+    @Override
+    public String getSiteId() {
+        return data.equals("-1")?Data.getLinkmanname():data;
+    }
+
+    @Override
+    public String getPhone() {
+        return etPhone.getText().toString().trim();
+    }
+
+    @Override
+    public void onSuccess() {
+        if (data.equals("-1")){
+            listener.OnItemClick(1,etName.getText().toString().trim(),etPhone.getText().toString().trim());
+        }else {
+            listener.OnItemClick(2,etName.getText().toString().trim(),etPhone.getText().toString().trim());
+            Data.setLinkmanname(data);
+        }
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(mContext,""+msg,Toast.LENGTH_SHORT).show();
+    }
+
+    public interface selectOnclick {
+        void OnItemClick(int postion,String name,String phone);
+    }
+
+    public void setOnItemClick(selectOnclick listener) {
+        this.listener = listener;
+    }
+}

+ 149 - 450
app/src/main/java/com/silence/commonframe/activity/AddlinkmanActivity.java

@@ -5,10 +5,14 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -18,10 +22,18 @@ import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.ApiService;
+import com.silence.commonframe.Dialog.AddLinkManDialog;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AddLinkManListener;
+import com.silence.commonframe.activity.presenter.AddLinkManPresenter;
 import com.silence.commonframe.adapter.LinkmanAdapter;
+import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.bean.LinkManBean;
 import com.silence.commonframe.model.LinkmanModel;
 import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.Data;
@@ -41,491 +53,178 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class AddlinkmanActivity extends AppCompatActivity {
+public class AddlinkmanActivity extends BaseActivity implements AddLinkManListener.View {
    @BindView(R.id.recView_linkman)
     RecyclerView recViewLinkman;
+    @BindView(R.id.srl_refresh)
+   SmartRefreshLayout srlRefresh;
+
     private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
     private LinkmanAdapter mAdapter;
     private List<String> list = new ArrayList<>();
     private String id;
     String data1;
+    String etName;
+    String etPhone;
+
+    private AddLinkManPresenter presenter;
+
+    AddLinkManDialog addLinkManDialog;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_addlinkman);
-        ButterKnife.bind(this);
-        AtyContainer.getInstance().addActivity(this);
-        initWindows();
+    public int getLayoutId() {
+        return R.layout.activity_addlinkman;
     }
 
-    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);
-        }
+    @Override
+    public void initPresenter() {
+        presenter = new AddLinkManPresenter(this,this);
     }
 
-
-    private void getData() {
-
-//        HashMap<String, String> params = new HashMap<>();
-//        params.put("siteid", "7");
-////        params.put("page", "1");
-////    params.put("phone", "13333311338");
-//
-//
-//        final JSONObject jsonObject = new JSONObject(params);
-//        String s = Data.getToken();
-//        LoginIn.v("Tag", s);
-//
-//        String str = jsonObject.toString();
-//
-//        OkGo.post(ApiService.httpUrl + "getlinkman")
-//                .tag(this)
-//                .cacheKey("cachePostRegister11")
-//                .cacheMode(CacheMode.DEFAULT)
-//                .upJson(jsonObject.toString())
-//
-//                .headers("token", Data.getToken())
-////                .params("format", "json")
-////                .params("albumId", "Lqfme5hSolM")
-////                .params("pageNo", "1")
-////                .params("pageSize", "2")
-//                .execute(new StringCallback() {
-//                    @Override
-//                    public void onSuccess(String s, Call call, Response response) {
-//                        //  mTextView2.setText(s);
-//                        // System.out.println("sss"+response);
-//
-////                        LoginModel jsonRootBean = new Gson().fromJson(s, LoginModel.class);
-////                        Data.setName(jsonRootBean.getObject().getUsername().toString());
-////                        System.out.println("rst:" + jsonRootBean.getObject().getUsername().toString());
-//
-//
-//                        LinkmanModel jsonBean = new Gson().fromJson(s, LinkmanModel.class);
-//
-//                        for (int i = 0; i < jsonBean.getObject().size(); i++) {
-//                            HashMap<String, String> hashMap = new HashMap<>();
-//                            String name = jsonBean.getObject().get(i).getName();
-//                            String phone = jsonBean.getObject().get(i).getPhone();
-//                            //     String place1 = siteDevice.getObject().get(i).getRegionalism();
-//
-//                            hashMap.put("name", name);
-//                            hashMap.put("phone", phone);
-//
-//
-//                            //   list.add(place);
-//
-//                            listmap.add(hashMap);
-//                        }
-//
-//
-//                        runOnUiThread(new Runnable() {
-//                            @Override
-//                            public void run() {
-//
-//
-////                                MyAdapterSlide    adapter = new MyAdapterSlide(getContext(), listmap);
-//
-//
-//                               mAdapter = new LinkmanAdapter(AddlinkmanActivity.this, listmap);
-//                                recViewLinkman.setLayoutManager(new LinearLayoutManager(AddlinkmanActivity.this));
-//                                recViewLinkman.setAdapter(mAdapter);
-//                                recViewLinkman.addItemDecoration(new DividerItemDecoration(AddlinkmanActivity.this, DividerItemDecoration.VERTICAL_LIST));
-//
-//
-//                                //RecyclerView点击事件
-//                                mAdapter.setOnItemClickLitener(new LinkmanAdapter.OnItemClickLitener() {
-//                                    @Override
-//                                    public void onItemClick(View view, int position) {
-//                                        Toast.makeText(AddlinkmanActivity.this, position + "click", Toast.LENGTH_SHORT).show();
-//                                    }
-//
-//                                    @Override
-//                                    public void onItemLongClick(View view, final int position) {
-//                                        //这里长按定义的是删除
-//                                        AlertDialog.Builder dialog = new AlertDialog.Builder(AddlinkmanActivity.this);
-//                                        dialog.setTitle("是否删除");
-//                                        dialog.setMessage("确定吗?");
-//                                        dialog.setCancelable(false);
-//                                        dialog.setPositiveButton("确认",new DialogInterface.OnClickListener(){
-//
-//                                            @Override
-//                                            public void onClick(DialogInterface dialog, int which) {
-//                                                mAdapter.removeData(position);
-//                                            }
-//                                        } );
-//
-//                                        dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-//                                            @Override
-//                                            public void onClick(DialogInterface dialog, int which) {
-//
-//                                            }
-//                                        });
-//                                        dialog.show();
-//
-//                                        Toast.makeText(AddlinkmanActivity.this, position + "Long click", Toast.LENGTH_SHORT).show();
-//                                    }
-//                                });
-//
-//
-//
-//
-//
-//
-////                                mAdapter.setOnItemClickListener(new FindAdapter.MyItemClickListener() {
-////                                    @Override
-////                                    public void onItemClick(View view, int postion) {
-////                                        Toast.makeText(getContext(), postion+"", Toast.LENGTH_SHORT).show();
-////                                    }
-////                                });
-//
-//
-//                            }
-//                        });
-//
-//
-//                        //          handler.obtainMessage(1).sendToTarget();
-//                    }
-//
-//                    @Override
-//                    public void onError(Call call, Response response, Exception e) {
-//                        super.onError(call, response, e);
-//                        //  mTextView2.setText(e.getMessage());
-//                        //  Toast.makeText(getContext(),"NOsuccess "+e,Toast.LENGTH_SHORT).show();
-//                        System.out.println("sss" + e);
-//                    }
-//                });
-        // Data.setListid(listid);
-
-        String url = ApiService.httpUrl1 + Data.getConfigUrl() + "/getLinkman?siteid=" + Data.getLinkmanname();
-        OkGo.get(url)
-                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
-                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
-                .cacheMode(CacheMode.DEFAULT)    // 缓存模式,详细请看缓存介绍
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
+    @Override
+    public void initView() {
+        clickTitle(this,"联系人",R.mipmap.add_linkman,true).setRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i2 = getIntent();
+                if (i2.getStringExtra("data1").equals("-1")) {
+                    data1 = "-1";
+                } else {
+                    data1 = i2.getStringExtra("data1");
+                }
+                addLinkManDialog = new AddLinkManDialog(AddlinkmanActivity.this,data1);
+                View rootView = LayoutInflater.from(AddlinkmanActivity.this)
+                        .inflate(R.layout.activity_addlinkman, null);
+                addLinkManDialog.showAtLocation(rootView,Gravity.CENTER,0,0);
+                addLinkManDialog.setOnItemClick(new AddLinkManDialog.selectOnclick() {
                     @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        //   mTextView2.setText(s);
-                        //   System.out.println("sss"+s);
-                        //    Toast.makeText(getContext(),"s"+s,Toast.LENGTH_SHORT).show();
-
-//                        Device device = new Gson().fromJson(s, Device.class);
-//                        List<Device.DataBean.DataListBean> listBeans = device.getData().getDataList();
-
-                        //      Toast.makeText(AddlinkmanActivity.this,"ff"+s,Toast.LENGTH_SHORT).show();
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            if (message.equalsIgnoreCase("success")) {
-                                LinkmanModel jsonBean = new Gson().fromJson(s, LinkmanModel.class);
-                                for (int i = 0; i < jsonBean.getData().size(); i++) {
-                                    HashMap<String, String> hashMap = new HashMap<>();
-                                    String name = jsonBean.getData().get(i).getName();
-                                    String phone = jsonBean.getData().get(i).getPhone();
-                                    String id = jsonBean.getData().get(i).getId();
-                                    //     String place1 = siteDevice.getObject().get(i).getRegionalism();
-
-                                    hashMap.put("name", name);
-                                    hashMap.put("phone", phone);
-                                    hashMap.put("id", id);
-                                    list.add(id);
-                                    listmap.add(hashMap);
-                                }
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        //                                MyAdapterSlide    adapter = new MyAdapterSlide(getContext(), listmap);
-                                        mAdapter = new LinkmanAdapter(AddlinkmanActivity.this, listmap);
-                                        recViewLinkman.setLayoutManager(new LinearLayoutManager(AddlinkmanActivity.this));
-                                        recViewLinkman.setAdapter(mAdapter);
-                                        recViewLinkman.addItemDecoration(new DividerItemDecoration(AddlinkmanActivity.this, DividerItemDecoration.VERTICAL_LIST));
-                                        //RecyclerView点击事件
-                                        mAdapter.setOnItemClickLitener(new LinkmanAdapter.OnItemClickLitener() {
-                                            @Override
-                                            public void onItemClick(View view, final int position) {
-                                                CDialog.Builder builder = new CDialog.Builder(AddlinkmanActivity.this);
-                                                //    AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(getContext(), R.style.dialog));
-                                                //builder.setIcon(R.drawable.ic_launcher);
-                                                //                builder.setTitle("你确定要退出系统吗?");
-                                                // builder.setMessage("你确定要删除信息吗?");//////////////////////////////////////////////////////////
-                                                //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
-                                                //                View view = LayoutInflater.from(getContext()).inflate(R.layout.item_addsite, null);
-                                                //                //    设置我们自己定义的布局文件作为弹出框的Content
-                                                //                builder.setView(view);
-                                                builder.setCancelable(false);
-                                                builder.setTitle("提示");
-                                                builder.setMessage("你确定要删除该联系人吗?");
-                                                //    final EditText deviceno = (EditText)view.findViewById(R.id.deviceno);
-                                                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-                                                        mAdapter.removeData(position);
-                                                        id = list.get(position);
-                                                        delLinkman();
-                                                    }
-                                                });
-                                                builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-
-                                                    }
-                                                });
-                                                builder.show();
-                                            }
-
-                                            @Override
-                                            public void onItemLongClick(View view, final int position) {
-                                                //这里长按定义的是删除
-                                                //                                        AlertDialog.Builder dialog = new AlertDialog.Builder(AddlinkmanActivity.this);
-                                                //                                        dialog.setTitle("是否删除");
-                                                //                                        dialog.setMessage("确定吗?");
-                                                //                                        dialog.setCancelable(false);
-                                                //                                        dialog.setPositiveButton("确认",new DialogInterface.OnClickListener(){
-                                                //
-                                                //                                            @Override
-                                                //                                            public void onClick(DialogInterface dialog, int which) {
-                                                //                                                mAdapter.removeData(position);
-                                                //                                            }
-                                                //                                        } );
-                                                //
-                                                //                                        dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                                                //                                            @Override
-                                                //                                            public void onClick(DialogInterface dialog, int which) {
-                                                //
-                                                //                                            }
-                                                //                                        });
-                                                //                                        dialog.show();
-                                                //
-                                                //                                        Toast.makeText(AddlinkmanActivity.this, position + "Long click", Toast.LENGTH_SHORT).show();
-
-
-                                                CDialog.Builder builder = new CDialog.Builder(AddlinkmanActivity.this);
-                                                //    AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(getContext(), R.style.dialog));
-                                                //builder.setIcon(R.drawable.ic_launcher);
-                                                //                builder.setTitle("你确定要退出系统吗?");
-                                                // builder.setMessage("你确定要删除信息吗?");//////////////////////////////////////////////////////////
-                                                //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
-                                                //                View view = LayoutInflater.from(getContext()).inflate(R.layout.item_addsite, null);
-                                                //                //    设置我们自己定义的布局文件作为弹出框的Content
-                                                //                builder.setView(view);
-                                                builder.setCancelable(false);
-                                                builder.setTitle("提示");
-                                                builder.setMessage("你确定要删除该联系人吗?");
-                                                //    final EditText deviceno = (EditText)view.findViewById(R.id.deviceno);
-                                                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-                                                        mAdapter.removeData(position);
-                                                        id = list.get(position);
-                                                        delLinkman();
-                                                    }
-                                                });
-                                                builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-
-                                                    }
-                                                });
-                                                builder.show();
-                                            }
-                                        });
-                                        //                                mAdapter.setOnItemClickListener(new FindAdapter.MyItemClickListener() {
-                                        //                                    @Override
-                                        //                                    public void onItemClick(View view, int postion) {
-                                        //                                        Toast.makeText(getContext(), postion+"", Toast.LENGTH_SHORT).show();
-                                        //                                    }
-                                        //                                });
-                                    }
-                                });
-
-                            } else {
-                                LoginIn.tokenOut(message, AddlinkmanActivity.this);
+                    public void OnItemClick(int postion,String name,String phone) {
+                        switch (postion){
+                            case 1:{
+                                addLinkManDialog.dismiss();
+                            }
+                            break;
+                            case 2:{
+                                etName = name;
+                                etPhone = phone;
+                                presenter.addLinkMan();
+                                addLinkManDialog.dismiss();
                             }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
                         }
                     }
-
                 });
-    }
-    public void myclick(View view) {
+            }
+        });
         setResult(2);
-        finish();
+        initAdapter();
+
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                presenter.getData();
+            }
+        });
+        srlRefresh.setEnableLoadMore(false);
+        presenter.getData();
     }
 
-    public void myClick(View view) {
-//        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this);
-//        // builder.setIcon(R.drawable.people);
-//        builder.setTitle("添加联系人");
-//        //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
-//        View view1 = LayoutInflater.from(this).inflate(R.layout.item_addsite, null);
-//        //    设置我们自己定义的布局文件作为弹出框的Content
-//        builder.setView(view1);
-//
-//        final EditText username = (EditText)view1.findViewById(R.id.deviceno);
-//
-//
-//        builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
-//        {
-//            @Override
-//            public void onClick(DialogInterface dialog, int which)
-//            {
-//                String a = username.getText().toString().trim();
-//                // String b = password.getText().toString().trim();
-//                //    将输入的用户名和密码打印出来
-//                //  Toast.makeText(SitedetailActivity.this, "用户名: "  + a, Toast.LENGTH_SHORT).show();
-//
-//                getdata1();
-//
-//
-//            }
-//        });
-//        builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
-//        {
-//            @Override
-//            public void onClick(DialogInterface dialog, int which)
-//            {
-//
-//            }
-//        });
-//        builder.show();
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
 
-        //  Toast.makeText()
+    }
 
-        Intent i2 = getIntent();
-        if (i2.getStringExtra("data1").equals("-1")) {
-            data1 = "-1";
-        } else {
-            data1 = i2.getStringExtra("data1");
-        }
+    private void initAdapter() {
+        mAdapter = new LinkmanAdapter(AddlinkmanActivity.this, listmap);
+        recViewLinkman.setLayoutManager(new LinearLayoutManager(AddlinkmanActivity.this));
+        recViewLinkman.setAdapter(mAdapter);
+        recViewLinkman.addItemDecoration(new DividerItemDecoration(AddlinkmanActivity.this, DividerItemDecoration.VERTICAL_LIST));
+        //RecyclerView点击事件
+        mAdapter.setOnItemClickLitener(new LinkmanAdapter.OnItemClickLitener() {
+            @Override
+            public void onItemClick(View view, final int position) {
+                CDialog.Builder builder = new CDialog.Builder(AddlinkmanActivity.this);
+                builder.setCancelable(false);
+                builder.setTitle("提示");
+                builder.setMessage("你确定要删除该联系人吗?");
+                //    final EditText deviceno = (EditText)view.findViewById(R.id.deviceno);
+                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        mAdapter.removeData(position);
+                        id = list.get(position);
+                        presenter.delData();
+                    }
+                });
+                builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                });
+                builder.show();
+            }
 
-        Intent intent = new Intent(AddlinkmanActivity.this, AddlinkmandetailActivity.class);
-        intent.putExtra("data1", data1);
-        startActivity(intent);
+            @Override
+            public void onItemLongClick(View view, final int position) {
+            }
+        });
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
-        int size = listmap.size();
-        if (size > 0) {
-            listmap.clear();
-            mAdapter.notifyDataSetChanged();
-            recViewLinkman.setAdapter(mAdapter);
-        }
-        getData();
+    public String getId() {
+        return id;
     }
 
-    private void getdata1() {
-        HashMap<String, String> params = new HashMap<>();
-        params.put("siteid", "7");//id
-        //   params.put("dLocation", stringplace);
-        params.put("name", "liming");
-        params.put("phone", "13124257879");
-//    params.put("phone", "13333311338");
-        JSONObject jsonObject = new JSONObject(params);
-        String s = Data.getToken();
-        Log.v("Tag", s);
-        String str = jsonObject.toString();
-        OkGo.post(ApiService.httpUrl + "addlinkman")
-                .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) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            if (message.equalsIgnoreCase("success")) {
-                                Toast.makeText(AddlinkmanActivity.this, "联系中人添加成功!" + s, Toast.LENGTH_SHORT).show();
-                            } else {
-                                LoginIn.tokenOut(message, AddlinkmanActivity.this);
-                            }
-
-//                        SiteDevice siteDevice = new Gson().fromJson(s,SiteDevice.class);
-//
-//                        for (int i = 0;i<siteDevice.getObject().size();i++){
-//                            HashMap<String,String>  hashMap = new HashMap<>();
-//                            String place = siteDevice.getObject().get(i).getDeployment();
-//                            String place1 = siteDevice.getObject().get(i).getRegionalism();
-//                            hashMap.put("place",place);
-//                            hashMap.put("place1",place1);
-//
-//                            list.add(place);
-//
-//                            listmap.add(hashMap);
-//                        }
-//
-//
-//                        Data.setList(list);
-//                        Data.setListmap(listmap);
-//
-//
-//                        getActivity().runOnUiThread(new Runnable() {
-//                            @Override
-//                            public void run() {
-//                                myAdapter1 = new MyAdapter( listmap,getContext());
-//                                listView.setAdapter(myAdapter1);
-//
-//
-//                            }
-//                        });
+    @Override
+    public String getName() {
+        return etName;
+    }
 
+    @Override
+    public String getSiteId() {
+        return data1.equals("-1")?Data.getLinkmanname():data1;
+    }
 
-//                    System.out.println(""+s);
+    @Override
+    public String getPhone() {
+        return etPhone;
+    }
 
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
+    @Override
+    public void onAddLinkManSuccess() {
+        if (data1.equals("-1")){
 
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
+        }else {
+            Data.setLinkmanname(data1);
+        }
+        srlRefresh.autoRefresh();
+    }
 
-//                        Toast.makeText(getContext(),"NOsuccess "+e,Toast.LENGTH_SHORT).show();
-                        System.out.println("sss" + e);
-                    }
-                });
+    @Override
+    public void onSuccess(List<LinkManBean.DataBean> dataBean) {
+        list.clear();
+        listmap.clear();
+        for (int i = 0; i < dataBean.size(); i++) {
+            HashMap<String, String> hashMap = new HashMap<>();
+            String name = dataBean.get(i).getName();
+            String phone = dataBean.get(i).getPhone();
+            String id = dataBean.get(i).getId();
+            //     String place1 = siteDevice.getObject().get(i).getRegionalism();
+            hashMap.put("name", name);
+            hashMap.put("phone", phone);
+            hashMap.put("id", id);
+            list.add(id);
+            listmap.add(hashMap);
+        }
+        mAdapter.notifyDataSetChanged();
+        if (srlRefresh != null){
+            srlRefresh.finishRefresh();
+        }
     }
-    private void delLinkman() {
-        String url = ApiService.httpUrl1 + Data.getConfigUrl() + "/deleteLinkman?id=" + id;
-        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) {
-                        //   mTextView2.setText(s);
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String message = jsonObject.get("msg").toString();
-                            if (message.equalsIgnoreCase("success")) {
-                                Toast.makeText(AddlinkmanActivity.this, "数据删除成功!", Toast.LENGTH_SHORT).show();
-                            } else {
-                                LoginIn.tokenOut(message, AddlinkmanActivity.this);
-                                Toast.makeText(AddlinkmanActivity.this, "" + s, Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
 
-                });
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
     }
 }

+ 175 - 162
app/src/main/java/com/silence/commonframe/activity/AddlinkmandetailActivity.java

@@ -15,6 +15,9 @@ 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.AddLinkManDetailListener;
+import com.silence.commonframe.activity.presenter.AddLinkManDetailPresenter;
+import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.model.SiteModel;
 import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils.Data;
@@ -30,7 +33,7 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class AddlinkmandetailActivity extends AppCompatActivity {
+public class AddlinkmandetailActivity extends BaseActivity implements AddLinkManDetailListener.View {
 
    @BindView(R.id.et_name)
     EditText etName;
@@ -41,195 +44,205 @@ public class AddlinkmandetailActivity extends AppCompatActivity {
    @BindView(R.id.tv_submit)
     TextView tvSubmit;
 
+    private String data;
+
+    private AddLinkManDetailPresenter presenter;
+
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+//        setContentView(R.layout.activity_addlinkmandetail);
+//        ButterKnife.bind(this);
+//        this.setFinishOnTouchOutside(false);
+//
+//        AtyContainer.getInstance().addActivity(this);
+//        Intent intent = getIntent();
+//        final String data = intent.getStringExtra("data1");
+//        data1 = data;
+//
+//
+//        tvSubmit.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                if (data.equals("-1")){
+//                    getData();
+//                }else {
+//                    getData1();
+//                }
+//            }
+//        });
+//        tvCancel.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//               finish();
+//            }
+//        });
+//
+//    }
 
-    private String data1;
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_addlinkmandetail;
+    }
+
+    @Override
+    public void initPresenter() {
+        presenter = new AddLinkManDetailPresenter(this,this);
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void initView() {
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_addlinkmandetail);
-        ButterKnife.bind(this);
         this.setFinishOnTouchOutside(false);
 
-        AtyContainer.getInstance().addActivity(this);
         Intent intent = getIntent();
-        final String data = intent.getStringExtra("data1");
-        data1 = data;
-
+        data = intent.getStringExtra("data1");
 
         tvSubmit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (data.equals("-1")){
-                    getData();
-                }else {
-                    getData1();
-                }
-
-
-
+                presenter.addLinkMan();
             }
         });
         tvCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-               finish();
+                finish();
             }
         });
 
     }
 
-
-
-    private void getData() {
-
-
-        HashMap<String, String> params = new HashMap<>();
-        params.put("name", etName.getText().toString().trim());
-        params.put("siteid", Data.getLinkmanname());
-        params.put("phone", etPhone.getText().toString().trim());
-
-
-        JSONObject jsonObject = new JSONObject(params);
-        String s = Data.getToken();
-        //       LoginIn.v("Tag",s);
-
-        String str = jsonObject.toString();
-
-
-        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+"/insertLinkMan")
-                .tag(this)
-                .cacheKey("cachePostRegister11")
-                .cacheMode(CacheMode.DEFAULT)
-                .upJson(jsonObject.toString())
-
-                .headers("token", Data.getToken())
-//                .params("format", "json")
-//                .params("albumId", "Lqfme5hSolM")
-//                .params("pageNo", "1")
-//                .params("pageSize", "2")
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        //  mTextView2.setText(s);
-                        // System.out.println("sss"+response);
-
-//                        LoginModel jsonRootBean = new Gson().fromJson(s, LoginModel.class);
-//                        Data.setName(jsonRootBean.getObject().getUsername().toString());
-//                        System.out.println("rst:" + jsonRootBean.getObject().getUsername().toString());
-
-
-                        //   SiteDevice siteDevice = new Gson().fromJson(s,SiteDevice.class);
-
-
-                        SiteModel siteModel = new Gson().fromJson(s,SiteModel.class);
-                        String message = siteModel.getMsg();
-                        int code = siteModel.getCode();
-                            if (message.equalsIgnoreCase("success")){
-
-                                Toast.makeText(AddlinkmandetailActivity.this,"添加成功!",Toast.LENGTH_SHORT).show();
-                                // return;
-                            }else {
-                                LoginIn.tokenOut(code,message,AddlinkmandetailActivity.this);
-                                Toast.makeText(AddlinkmandetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-
-
-                   //     Toast.makeText(AddlinkmandetailActivity.this,"联系人添加成功!",Toast.LENGTH_SHORT).show();
-
-                        finish();
-
-                    }
-
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-                        //  mTextView2.setText(e.getMessage());
-                        Toast.makeText(AddlinkmandetailActivity.this,"NOsuccess "+e,Toast.LENGTH_SHORT).show();
+//    private void getData() {
+//
+//        HashMap<String, String> params = new HashMap<>();
+//        params.put("name", etName.getText().toString().trim());
+//        params.put("siteid", Data.getLinkmanname());
+//        params.put("phone", etPhone.getText().toString().trim());
+//        JSONObject jsonObject = new JSONObject(params);
+//        String s = Data.getToken();
+//        //       LoginIn.v("Tag",s);
+//        String str = jsonObject.toString();
+//        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+"/insertLinkMan")
+//                .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) {
+//
+//                        SiteModel siteModel = new Gson().fromJson(s,SiteModel.class);
+//                        String message = siteModel.getMsg();
+//                        int code = siteModel.getCode();
+//                            if (message.equalsIgnoreCase("success")){
+//
+//                                Toast.makeText(AddlinkmandetailActivity.this,"添加成功!",Toast.LENGTH_SHORT).show();
+//                                // return;
+//                            }else {
+//                                LoginIn.tokenOut(code,message,AddlinkmandetailActivity.this);
+//                                Toast.makeText(AddlinkmandetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
+//                                return;
+//                            }
+//                        finish();
+//
+//                    }
+//
+//                    @Override
+//                    public void onError(Call call, Response response, Exception e) {
+//                        super.onError(call, response, e);
+//                        //  mTextView2.setText(e.getMessage());
+//                        Toast.makeText(AddlinkmandetailActivity.this,"NOsuccess "+e,Toast.LENGTH_SHORT).show();
+////                        System.out.println("sss"+e);
+//                    }
+//                });
+//    }
+//
+//    private void getData1() {
+//        HashMap<String, String> params = new HashMap<>();
+//        params.put("name", etName.getText().toString().trim());
+//        params.put("siteid", data1);
+//        params.put("phone", etPhone.getText().toString().trim());
+//
+//        JSONObject jsonObject = new JSONObject(params);
+//        String s = Data.getToken();
+//        //       LoginIn.v("Tag",s);
+//        String str = jsonObject.toString();
+//        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+"/insertLinkMan")
+//                .tag(this)
+//                .cacheKey("cachePostRegister11")
+//                .cacheMode(CacheMode.DEFAULT)
+//                .upJson(jsonObject.toString())
+//
+//                .headers("token", Data.getToken())
+////                .params("format", "json")
+////                .params("albumId", "Lqfme5hSolM")
+////                .params("pageNo", "1")
+////                .params("pageSize", "2")
+//                .execute(new StringCallback() {
+//                    @Override
+//                    public void onSuccess(String s, Call call, Response response) {
+//                        SiteModel siteModel = new Gson().fromJson(s,SiteModel.class);
+//                        String message = siteModel.getMsg();
+//                        int code = siteModel.getCode();
+//                            if (message.equalsIgnoreCase("success")){
+//
+//                                Toast.makeText(AddlinkmandetailActivity.this,"添加成功!",Toast.LENGTH_SHORT).show();
+//                                // return;
+//                            }else {
+//                                LoginIn.tokenOut(code,message,AddlinkmandetailActivity.this);
+//                                Toast.makeText(AddlinkmandetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
+//                                return;
+//                            }
+//
+//                        //     Toast.makeText(AddlinkmandetailActivity.this,"联系人添加成功!",Toast.LENGTH_SHORT).show();
+//                        Data.setLinkmanname(data1);
+//                        finish();
+//
+//                    }
+//
+//                    @Override
+//                    public void onError(Call call, Response response, Exception e) {
+//                        super.onError(call, response, e);
+//                        //  mTextView2.setText(e.getMessage());
+//                        Toast.makeText(AddlinkmandetailActivity.this,"NOsuccess "+e,Toast.LENGTH_SHORT).show();
 //                        System.out.println("sss"+e);
-                    }
-                });
+//                    }
+//                });
+//
+//
+//    }
 
 
+    @Override
+    public String getName() {
+        return etName.getText().toString().trim();
     }
 
+    @Override
+    public String getSiteId() {
+        return data.equals("-1")?Data.getLinkmanname():data;
+    }
 
-
-
-
-    private void getData1() {
-
-
-        HashMap<String, String> params = new HashMap<>();
-        params.put("name", etName.getText().toString().trim());
-        params.put("siteid", data1);
-        params.put("phone", etPhone.getText().toString().trim());
-
-
-        JSONObject jsonObject = new JSONObject(params);
-        String s = Data.getToken();
-        //       LoginIn.v("Tag",s);
-
-        String str = jsonObject.toString();
-
-
-        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+"/insertLinkMan")
-                .tag(this)
-                .cacheKey("cachePostRegister11")
-                .cacheMode(CacheMode.DEFAULT)
-                .upJson(jsonObject.toString())
-
-                .headers("token", Data.getToken())
-//                .params("format", "json")
-//                .params("albumId", "Lqfme5hSolM")
-//                .params("pageNo", "1")
-//                .params("pageSize", "2")
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        //  mTextView2.setText(s);
-                        // System.out.println("sss"+response);
-
-//                        LoginModel jsonRootBean = new Gson().fromJson(s, LoginModel.class);
-//                        Data.setName(jsonRootBean.getObject().getUsername().toString());
-//                        System.out.println("rst:" + jsonRootBean.getObject().getUsername().toString());
-
-
-                        //   SiteDevice siteDevice = new Gson().fromJson(s,SiteDevice.class);
-
-
-                        SiteModel siteModel = new Gson().fromJson(s,SiteModel.class);
-                        String message = siteModel.getMsg();
-                        int code = siteModel.getCode();
-                            if (message.equalsIgnoreCase("success")){
-
-                                Toast.makeText(AddlinkmandetailActivity.this,"添加成功!",Toast.LENGTH_SHORT).show();
-                                // return;
-                            }else {
-                                LoginIn.tokenOut(code,message,AddlinkmandetailActivity.this);
-                                Toast.makeText(AddlinkmandetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-
-                        //     Toast.makeText(AddlinkmandetailActivity.this,"联系人添加成功!",Toast.LENGTH_SHORT).show();
-                        Data.setLinkmanname(data1);
-                        finish();
-
-                    }
-
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-                        //  mTextView2.setText(e.getMessage());
-                        Toast.makeText(AddlinkmandetailActivity.this,"NOsuccess "+e,Toast.LENGTH_SHORT).show();
-                        System.out.println("sss"+e);
-                    }
-                });
-
-
+    @Override
+    public String getPhone() {
+        return etPhone.getText().toString().trim();
     }
 
+    @Override
+    public void onSuccess() {
+        if (data.equals("-1")){
+            finish();
+        }else {
+            Data.setLinkmanname(data);
+            finish();
+        }
+    }
 
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

+ 18 - 0
app/src/main/java/com/silence/commonframe/activity/Interface/AddLinkManDetailListener.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;
+
+public interface AddLinkManDetailListener {
+    interface View{
+        String getName();
+        String getSiteId();
+        String getPhone();
+
+        void onSuccess();
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View ,BaseModel>{
+        public abstract void addLinkMan();
+    }
+}

+ 25 - 0
app/src/main/java/com/silence/commonframe/activity/Interface/AddLinkManListener.java

@@ -0,0 +1,25 @@
+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.LinkManBean;
+
+import java.util.List;
+
+public interface AddLinkManListener {
+    interface View{
+        String getId();
+        String getName();
+        String getSiteId();
+        String getPhone();
+
+        void onAddLinkManSuccess();
+        void onSuccess(List<LinkManBean.DataBean> dataBean);
+        void onFile(String msg);
+    }
+    abstract class Presenter extends BasePresenter<View, BaseModel>{
+        public abstract void getData();
+        public abstract void delData();
+        public abstract void addLinkMan();
+    }
+}

+ 21 - 41
app/src/main/java/com/silence/commonframe/activity/SiteManagement.java

@@ -13,6 +13,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.silence.commonframe.R;
+import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.utils.Data;
 
 import java.util.HashMap;
@@ -21,15 +22,7 @@ import java.util.HashMap;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SiteManagement extends AppCompatActivity {
-   @BindView(R.id.imageView4)
-    ImageView imageView4;
-   @BindView(R.id.textView15)
-    TextView textView15;
-   @BindView(R.id.textView3)
-    TextView textView3;
-   @BindView(R.id.textView_comfirm)
-    TextView textViewComfirm;
+public class SiteManagement extends BaseActivity {
    @BindView(R.id.tv_palce)
     TextView tvPalce;
    @BindView(R.id.tv_area)
@@ -45,12 +38,25 @@ public class SiteManagement extends AppCompatActivity {
     private HashMap<String, String> list1;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_site_management);
-        ButterKnife.bind(this);
-        initWindows();
+    public int getLayoutId() {
+        return R.layout.activity_site_management;
+    }
 
+    @Override
+    public void initPresenter() {
+
+    }
+
+    @Override
+    public void initView() {
+        clickTitle(this,getResources().getString(R.string.site_detail),"联系人",true).setRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(SiteManagement.this, AddlinkmanActivity.class);
+                intent.putExtra("data1","-1");
+                startActivity(intent);
+            }
+        });
 
         list1 = new HashMap<>();
         Intent intent = getIntent();
@@ -63,31 +69,13 @@ public class SiteManagement extends AppCompatActivity {
 
             tvPalce.setText(list1.get("deployment"));
             tvArea.setText(list1.get("RegionName"));
-            tvAddress.setText(list1.get("Location"));
-
+            tvAddress.setText("详细地址:" + list1.get("Location"));
 
             tvName.setText(Data.getName());
             tvTel.setText(Data.getPhoto());
         }
     }
 
-    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);
-        }
-    }
-
     public void diallPhone(View view) {
         Intent intent = new Intent(Intent.ACTION_DIAL);
         Uri data = Uri.parse("tel:" + tvTel.getText());
@@ -96,12 +84,4 @@ public class SiteManagement extends AppCompatActivity {
 
     }
 
-
-
-
-    public void myClick(View view) {
-        Intent intent = new Intent(this, AddlinkmanActivity.class);
-        intent.putExtra("data1","-1");
-        startActivity(intent);
-    }
 }

+ 2 - 0
app/src/main/java/com/silence/commonframe/activity/presenter/AboutPresenter.java

@@ -11,6 +11,7 @@ import com.silence.commonframe.activity.Interface.AboutListener;
 import com.silence.commonframe.bean.VersionBean;
 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;
@@ -37,6 +38,7 @@ public class AboutPresenter extends AboutListener.Presenter {
                             mView.onSuccess(data.getData());
                         }else {
                             mView.onFile(data.getMsg());
+                            LoginIn.tokenOut(data.getCode(),mContext);
                         }
                     }
 

+ 64 - 0
app/src/main/java/com/silence/commonframe/activity/presenter/AddLinkManDetailPresenter.java

@@ -0,0 +1,64 @@
+package com.silence.commonframe.activity.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.Interface.AddLinkManDetailListener;
+import com.silence.commonframe.activity.Interface.AddLinkManListener;
+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 org.json.JSONObject;
+
+import java.util.HashMap;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class AddLinkManDetailPresenter extends AddLinkManDetailListener.Presenter {
+
+    public AddLinkManDetailPresenter(Activity mContext, AddLinkManDetailListener.View mView){
+        this.mContext = mContext;
+        this.mView = mView;
+    }
+
+
+    @Override
+    public void addLinkMan() {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("name", mView.getName());
+        params.put("siteid", Data.getLinkmanname());
+        params.put("phone", mView.getPhone());
+        JSONObject jsonObject = new JSONObject(params);
+        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+ UrlConstants.ADD_LINK_MAN)
+                .tag(this)
+                .upJson(jsonObject)
+                .cacheKey("cachePostRegister11")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean data = new Gson().fromJson(s,BaseBean.class);
+                        if (data.code == 0){
+                            mView.onSuccess();
+                        }else {
+                            mView.onFile(data.getMsg());
+                            LoginIn.tokenOut(data.getCode(),mContext);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+}

+ 120 - 0
app/src/main/java/com/silence/commonframe/activity/presenter/AddLinkManPresenter.java

@@ -0,0 +1,120 @@
+package com.silence.commonframe.activity.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.R;
+import com.silence.commonframe.activity.Interface.AddLinkManListener;
+import com.silence.commonframe.bean.BaseBean;
+import com.silence.commonframe.bean.LinkManBean;
+import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.utils.LoginIn;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class AddLinkManPresenter extends AddLinkManListener.Presenter {
+
+    public AddLinkManPresenter(Activity mContext,AddLinkManListener.View mView){
+        this.mContext = mContext;
+        this.mView = mView;
+    }
+
+    @Override
+    public void getData() {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.GET_LINK_MAN)
+                .tag(this)
+                .params("siteid",Data.getLinkmanname())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        LinkManBean data = new Gson().fromJson(s,LinkManBean.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("信息获取失败");
+                    }
+                });
+    }
+
+    @Override
+    public void delData() {
+        OkGo.get(ApiService.httpUrl1 + Data.getConfigUrl() + UrlConstants.DELETE_LINK_MAN)
+                .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) {
+                        BaseBean data = new Gson().fromJson(s,BaseBean.class);
+                        if (data.code == 0){
+                            mView.onFile("删除成功");
+                        }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("信息获取失败");
+                    }
+                });
+    }
+
+    @Override
+    public void addLinkMan() {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("name", mView.getName());
+        params.put("siteid", Data.getLinkmanname());
+        params.put("phone", mView.getPhone());
+        JSONObject jsonObject = new JSONObject(params);
+        OkGo.post(ApiService.httpUrl1+Data.getConfigUrl()+ UrlConstants.ADD_LINK_MAN)
+                .tag(this)
+                .upJson(jsonObject)
+                .cacheKey("cachePostRegister11")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        BaseBean data = new Gson().fromJson(s,BaseBean.class);
+                        if (data.code == 0){
+                            mView.onAddLinkManSuccess();
+                        }else {
+                            mView.onFile(data.getMsg());
+                            LoginIn.tokenOut(data.getCode(),mContext);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+}

+ 42 - 0
app/src/main/java/com/silence/commonframe/base/basemvp/BaseActivity.java

@@ -300,7 +300,49 @@ public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel>
                 .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
                 );
     }
+    public TitleBar clickTitle(final Activity activity, String title,int resoure,boolean isBack){
+        TitleBar titleBar=findViewById(R.id.base_title_bar);
+        titleBar
+                .setTitle(title)
+                .setTitleColor(R.color.white)
+                .setSubTitleColor(R.color.white)
+                .setLeftTextSize(66)
+                .setRightImageResource(resoure)
+                .setImmersive(activity,false,true)
+                .setLeftClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        activity.finish();
+                    }
+                })
+                .setLeftImageIsHite(isBack)
+                .setLeftImageResource(R.mipmap.whiteback)
+                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
+                );
+        return titleBar;
+    }
 
+    public TitleBar clickTitle(final Activity activity, String title,String rightText,boolean isBack){
+        TitleBar titleBar=findViewById(R.id.base_title_bar);
+        titleBar
+                .setTitle(title)
+                .setTitleColor(R.color.white)
+                .setSubTitleColor(R.color.white)
+                .setLeftTextSize(66)
+                .setRightText(rightText)
+                .setImmersive(activity,false,true)
+                .setLeftClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        activity.finish();
+                    }
+                })
+                .setLeftImageIsHite(isBack)
+                .setLeftImageResource(R.mipmap.whiteback)
+                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
+                );
+        return titleBar;
+    }
 
     public boolean hasLollipop() {
         return Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1;

+ 22 - 0
app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java

@@ -325,6 +325,28 @@ public abstract  class BaseFragment<T extends BasePresenter, E extends BaseModel
         return titleBar;
     }
 
+    public TitleBar clickTitle(final Activity activity, String title,String rightText,boolean isBack){
+        TitleBar titleBar=rootView.findViewById(R.id.base_title_bar);
+        titleBar
+                .setTitle(title)
+                .setTitleColor(R.color.white)
+                .setSubTitleColor(R.color.white)
+                .setLeftTextSize(66)
+                .setRightText(rightText)
+                .setImmersive(activity,false,true)
+                .setLeftClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        activity.finish();
+                    }
+                })
+                .setLeftImageIsHite(isBack)
+                .setLeftImageResource(R.mipmap.whiteback)
+                .setBackgroundColor(ContextCompat.getColor(activity,R.color.myblue)
+                );
+        return titleBar;
+    }
+
     public static int getStatusBarHeight(Context context) {
         int statusBarHeight = 0;
         Resources res = context.getResources();

+ 1 - 1
app/src/main/java/com/silence/commonframe/base/basemvp/TitleBar.java

@@ -27,7 +27,7 @@ import java.util.LinkedList;
 public class TitleBar extends ViewGroup implements View.OnClickListener {
     private static final int DEFAULT_MAIN_TEXT_SIZE = 18;
     private static final int DEFAULT_SUB_TEXT_SIZE = 12;
-    private static final int DEFAULT_ACTION_TEXT_SIZE = 15;
+    private static final int DEFAULT_ACTION_TEXT_SIZE = 18;
     private static final int DEFAULT_TITLE_BAR_HEIGHT = 48;
 
     private static final String STATUS_BAR_HEIGHT_RES_NAME = "status_bar_height";

+ 76 - 0
app/src/main/java/com/silence/commonframe/bean/LinkManBean.java

@@ -0,0 +1,76 @@
+package com.silence.commonframe.bean;
+
+import java.util.List;
+
+public class LinkManBean {
+
+    /**
+     * code : 0
+     * msg : success
+     * data : [{"id":"eb430309774140468268b439ecba5370","name":"得得","phone":"15779890000"},{"id":"6c9ca03db5c4410f83513d6907839287","name":"啦啦啦啦啦","phone":"15779891111"}]
+     */
+
+    private int code;
+    private String msg;
+    private List<DataBean> data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * id : eb430309774140468268b439ecba5370
+         * name : 得得
+         * phone : 15779890000
+         */
+
+        private String id;
+        private String name;
+        private String phone;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+    }
+}

+ 8 - 0
app/src/main/java/com/silence/commonframe/common/constant/UrlConstants.java

@@ -81,4 +81,12 @@ public interface UrlConstants {
     //获取版本信息
     String GET_VERSION = "/version/getVersionAndroid";
 
+    /*--------------------------------联系人-----------------------------------------*/
+    //获取联系人
+    String GET_LINK_MAN = "/getLinkman";
+    //删除联系人
+    String DELETE_LINK_MAN = "/deleteLinkman";
+    //添加联系人
+    String ADD_LINK_MAN = "/insertLinkMan";
+
 }

+ 15 - 110
app/src/main/res/layout/activity_addlinkman.xml

@@ -1,122 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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:orientation="vertical"
     tools:context=".activity.AddlinkmanActivity">
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-
-        <RelativeLayout
+        <com.silence.commonframe.base.basemvp.TitleBar
+            android:id="@+id/base_title_bar"
             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="myclick"
-                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/textView3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="联系人"
-                    android:textColor="#fff"
-                    android:textSize="19sp"/>
-
-            </LinearLayout>
-
+            android:layout_height="wrap_content"/>
 
-
-            <!--<ImageView-->
-            <!--android:id="@+id/imageView_daohang"-->
-            <!--android:layout_width="35dp"-->
-            <!--android:layout_height="31dp"-->
-            <!--android:layout_marginBottom="9dp"-->
-            <!--app:srcCompat="@mipmap/daohang" />-->
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginBottom="6dp"
-                android:onClick="myClick">
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:layout_centerInParent="true"
-                    android:background="@mipmap/add_linkman" />
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="添加 "
-                    android:textColor="#00000000"
-                    android:textSize="19sp" />
-
-
-            </RelativeLayout>
-
-        </RelativeLayout>
-
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recView_linkman"
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/srl_refresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="match_parent">
 
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="1.0"></android.support.v7.widget.RecyclerView>
-    </LinearLayout>
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recView_linkman"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
 
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-</android.support.constraint.ConstraintLayout>
+</LinearLayout>

+ 9 - 77
app/src/main/res/layout/activity_addlinkmandetail.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_corner_addlinkman"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="#30000000"
     tools:context=".activity.AddlinkmandetailActivity">
 
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,9 +43,7 @@
                         android:layout_height="wrap_content"
                         android:text="姓名:"
                         android:textSize="16sp"
-                        android:textColor="@color/myblack"
-
-                        />
+                        android:textColor="@color/myblack" />
 
                     <LinearLayout
                         android:layout_width="180dp"
@@ -61,20 +59,15 @@
                             android:hint="请输入姓名"
                             android:textSize="16sp"
                             android:textColor="@color/myblack"
+                            android:background="@null"
                             android:paddingLeft="10dp"
                             android:theme="@style/MyEditText"
-                            android:background="@drawable/bg_corner_addsidetext"
-                            android:inputType="textPersonName"
-                            >
+                            android:inputType="textPersonName">
 
                         </EditText>
 
-
                     </LinearLayout>
 
-
-
-
                 </LinearLayout>
 
                 <LinearLayout
@@ -106,25 +99,15 @@
                             android:textColor="@color/myblack"
                             android:paddingLeft="10dp"
                             android:theme="@style/MyEditText"
-                            android:background="@drawable/bg_corner_addsidetext"
+                            android:background="@null"
                             android:hint="请输入号码"
                             android:inputType="phone" />
 
-
                     </LinearLayout>
                 </LinearLayout>
 
-
-
-
-
-
             </LinearLayout>
 
-
-
-
-
         </LinearLayout>
 
         <View
@@ -136,9 +119,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:orientation="horizontal"
-
-            >
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/tv_cancel"
@@ -155,7 +136,6 @@
                 android:layout_height="match_parent"
                 android:background="#ccc"></View>
 
-
             <TextView
                 android:id="@+id/tv_submit"
                 android:layout_width="match_parent"
@@ -166,56 +146,8 @@
                 android:text="确认"
                 android:textSize="18sp" />
 
-
-
         </LinearLayout>
 
-
-
-
     </LinearLayout>
-    <!--<LinearLayout-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:orientation="horizontal">-->
-
-    <!--<LinearLayout-->
-    <!--android:id="@+id/ll_cancel"-->
-    <!--android:layout_width="0dp"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_weight="1" >-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/tv_cancel"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:gravity="center"-->
-    <!--android:text="撤销"-->
-    <!--android:textSize="16sp" />-->
-    <!--</LinearLayout>-->
-
-    <!--<LinearLayout-->
-    <!--android:id="@+id/ll_submit"-->
-    <!--android:layout_width="0dp"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_weight="1" >-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/tv_submit"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:gravity="center"-->
-    <!--android:text="提交了哟"-->
-    <!--android:textSize="16sp" />-->
-    <!--</LinearLayout>-->
-    <!---->
-    <!---->
-    <!---->
-    <!---->
-    <!--</LinearLayout>-->
-
-
-
-
 
 </LinearLayout>

+ 35 - 82
app/src/main/res/layout/activity_site_management.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".activity.SiteManagement">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -12,80 +12,25 @@
         tools:layout_editor_absoluteX="150dp"
         tools:layout_editor_absoluteY="0dp"
         tools:ignore="MissingConstraints">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="63dp"
-            android:gravity="bottom"
-            android:background="@color/myblue">
-
-            <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/textView3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="场所详情"
-                    android:textColor="#fff"
-                    android:textSize="19sp"/>
-            </LinearLayout>
 
-            <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="30dp"
-                    android:layout_height="30dp"
-                    android:padding="5dp"
-                    android:src="@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="返回" />
+        <com.silence.commonframe.base.basemvp.TitleBar
+            android:id="@+id/base_title_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
-            </LinearLayout>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/textView_comfirm"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginBottom="6dp"
-                android:layout_marginRight="10dp"
-                android:textColor="#fff"
-                android:textSize="19sp"
-                android:onClick="myClick"
-                android:text="联系人" />
-
-        </RelativeLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="名称:"
+                android:text="场所名称:"
                 android:textColor="@color/myblack"
                 android:textSize="17sp"/>
 
@@ -93,20 +38,25 @@
                 android:id="@+id/tv_palce"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
                 android:text="杭州市海智中心3栋4...."
                 android:textColor="@color/myblack"
                 android:textSize="17sp" />
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginLeft="@dimen/margin_side"
+            android:background="@color/mygray"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:layout_marginRight="10dp"
-            android:layout_marginBottom="2dp"
             android:orientation="horizontal">
 
             <TextView
@@ -116,7 +66,12 @@
                 android:textColor="@color/myblack"
                 android:textSize="17sp" />
 
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="空格"
+                android:textColor="#00000000"
+                android:textSize="17sp"/>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -129,35 +84,33 @@
                 android:id="@+id/tv_area"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
                 android:text="杭州市海智中心3栋4...."
                 android:textColor="@color/myblack"
                 android:textSize="17sp" />
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginLeft="@dimen/margin_side"
+            android:background="@color/mygray"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:layout_marginRight="10dp"
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="详细地址:"
-                android:textColor="@color/myblack"
-                android:textSize="17sp" />
-
-            <TextView
                 android:id="@+id/tv_address"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="杭州市海智中心3栋4栋5层"
-                android:layout_marginLeft="5dp"
+                android:lineSpacingMultiplier="1.2"
                 android:textColor="@color/myblack"
                 android:textSize="17sp" />
 
@@ -184,8 +137,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
                     android:orientation="horizontal">
 
                     <TextView
@@ -213,8 +166,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
                     android:orientation="horizontal">
 
                     <TextView

+ 0 - 1
app/src/main/res/layout/dialog_bottom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -156,7 +156,8 @@
 
     <!-- 我的 -->
     <string name="site_list">场所列表</string>
-    <string name="site_management">场所列表</string>
+    <string name="site_management">场所管理</string>
+    <string name="site_detail">场所详情</string>
     <string name="normal_question">常见问题</string>
     <string name="fire_history">火警通知</string>
     <string name="coustomer_phone">客服电话</string>