6.21.2 空气卫士合并

app/app.iml

@@ -115,7 +115,6 @@
     <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.databinding:library-1.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\dewarp.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.databinding:adapters-1.2.1" level="project" />
     <orderEntry type="library" name="Gradle: com.huxq17.xrefreshview:xrefreshview-3.6.9" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
@@ -146,7 +145,6 @@
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide-4.8.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\Core.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: cn.bingoogolapple:bga-baseadapter-1.2.9" level="project" />
     <orderEntry type="library" name="Gradle: com.yanzhenjie:recyclerview-swipe-1.1.4" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:documentfile-28.0.0" level="project" />
@@ -154,7 +152,6 @@
     <orderEntry type="library" name="Gradle: com.android.support:design-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-gif-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\LibFunSDK.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.yanzhenjie:loading-1.0.2" level="project" />
     <orderEntry type="library" name="Gradle: top.zibin:Luban-1.1.8" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
@@ -164,10 +161,13 @@
     <orderEntry type="library" name="Gradle: com.android.support:transition-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\fastjson-1.2.8.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jpush-3.1.7" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\dewarp.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\stickygridheaders.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.facebook.fresco:drawee-1.3.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
@@ -181,15 +181,17 @@
     <orderEntry type="library" name="Gradle: com.youth.banner:banner-1.4.9" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\Core.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\LibFunSDK.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.wx.ovalimageview:roundimageview-1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.github.donkingliang:ImageSelector-1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-v4-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper-2.9.46" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\commons-lang3-3.1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\commons-lang3-3.1.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-base-1.3.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jcore-1.2.6" level="project" />
@@ -202,7 +204,6 @@
     <orderEntry type="library" name="Gradle: com.mylhyl:acp-1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: com.nostra13.universalimageloader:universal-image-loader:1.9.5@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\stickygridheaders.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.1" level="project" />
     <orderEntry type="library" name="Gradle: ywl.ywl5320:wlmedia-1.0.0-beta17" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-28.0.0" level="project" />
@@ -210,13 +211,12 @@
     <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshHeader-1.1.0-alpha-14" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.2@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\fastjson-1.2.8.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.github.chrisbanes:PhotoView-2.0.0" level="project" />
-    <orderEntry type="module" module-name="library" />
     <orderEntry type="module" module-name="photolibrary" />
+    <orderEntry type="module" module-name="library" />
     <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-28" level="project" />
   </component>
 </module>

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -61,6 +62,7 @@ public class AirGuardActivity extends BaseActivity implements AirGuardListener.V
 
     private TitlePopupMenu titlePopupMenu;
     String airDevId="";
+    String airDevName="";
     AirGuardPresenter presenter;
     String isOpen="0";//是否打开
     String isInit="";
@@ -119,9 +121,11 @@ public class AirGuardActivity extends BaseActivity implements AirGuardListener.V
      */
     private void showToast(String msg) {
         if (msg.equals("设备详情")) {
-                Intent intent = new Intent(AirGuardActivity.this,AirGuardDetailActivity.class);
-                //应该要传ID和名称
-                startActivity(intent);
+            Intent intent = new Intent(AirGuardActivity.this,AirGuardDetailActivity.class);
+            //应该要传ID和名称
+            intent.putExtra("airDevId",airDevId);
+            intent.putExtra("airDevName",airDevName);
+            startActivity(intent);
         }
     }
 
@@ -145,7 +149,7 @@ public class AirGuardActivity extends BaseActivity implements AirGuardListener.V
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.airguard_timeclock:
-                startActivity(new Intent(AirGuardActivity.this, AirGuardTimeClockActivity.class));
+                startActivity(new Intent().putExtra("airDevId",airDevId).setClass(AirGuardActivity.this, AirGuardTimeClockActivity.class));
                 break;
             case R.id.airguard_worktime:
                 startActivity(new Intent().putExtra("airDevId",airDevId).setClass(AirGuardActivity.this, AirGuardWordTimeActivity.class));
@@ -159,6 +163,14 @@ public class AirGuardActivity extends BaseActivity implements AirGuardListener.V
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 555 && resultCode == 555){
+            presenter.getData();
+        }
+    }
+
     /**
      * 蜂鸣器开关事件
      */
@@ -215,6 +227,7 @@ public class AirGuardActivity extends BaseActivity implements AirGuardListener.V
             img_power.setImageResource(R.mipmap.power_on);
         }
         isOpen=data.getIfOpen();
+        airDevName = data.getDeviceName();
     }
 
     //蜂鸣器开关

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

@@ -1,6 +1,7 @@
 package com.silence.commonframe.activity;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -20,6 +21,8 @@ import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AirGuardDetailListener;
+import com.silence.commonframe.activity.presenter.AirGuardDetailPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.UrlConstants;
 import com.silence.commonframe.utils.AtyContainer;
@@ -39,7 +42,7 @@ import okhttp3.Response;
  * @author 郑嘉明
  * tv_airguard_id、et_airguard_name、airguard_update_name
  */
-public class AirGuardDetailActivity extends BaseActivity {
+public class AirGuardDetailActivity extends BaseActivity implements AirGuardDetailListener.View {
 
     /**
      * 导航栏信息
@@ -55,7 +58,10 @@ public class AirGuardDetailActivity extends BaseActivity {
     @BindView(R.id.airguard_update_name)
     ImageView airguard_update_name;     //（笔）修改名称
 
-    private String deviceId = "000";
+    private String deviceId;
+    private String deviceName;
+
+    private AirGuardDetailPresenter presenter;
 
     @Override
     public int getLayoutId() {
@@ -64,6 +70,7 @@ public class AirGuardDetailActivity extends BaseActivity {
 
     @Override
     public void initPresenter() {
+        presenter = new AirGuardDetailPresenter(this,this);
     }
 
     @Override
@@ -72,10 +79,20 @@ public class AirGuardDetailActivity extends BaseActivity {
         //设置全屏
         initWindows();
 
+        getAirMsg();
+
         //修改名字事件
         updateAirName();
     }
 
+    private void getAirMsg() {
+        Intent intent = getIntent();
+        deviceId = intent.getStringExtra("airDevId");
+        deviceName = intent.getStringExtra("airDevName");
+        tv_airguard_id.setText(deviceId);
+        et_airguard_name.setText(deviceName);
+    }
+
     /**
      * 修改名字操作
      */
@@ -107,42 +124,12 @@ public class AirGuardDetailActivity extends BaseActivity {
         builder.setMessage(getResources().getString(R.string.dialog_update_name));
         builder.setPositiveButton(getResources().getString(R.string.sure), (dialog, which) -> {
             //确定修改后的操作
-            Toast.makeText(AirGuardDetailActivity.this,"确定修改",Toast.LENGTH_SHORT).show();
-            //这里修改名称的接口
-            updateDeviceName();
+            presenter.updateDeviceName();
         });
         builder.setNegativeButton(getResources().getString(R.string.cancle), (dialog, which) -> dialog.dismiss());
         builder.show();
     }
 
-    private void updateDeviceName() {
-        OkGo.get(UrlConstants.AIRGUARD_DEV_DETAIL)
-                .tag(this)
-                .params("deviceId",deviceId)
-                .params("deviceName",et_airguard_name.getText().toString())
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            int code = jsonObject.getInt("code");
-                            String message = jsonObject.get("msg").toString();
-                            if (code == 0){
-                                Toast.makeText(AirGuardDetailActivity.this,"修改成功",Toast.LENGTH_SHORT).show();
-                            }else {
-                                LoginIn.tokenOut(code+"",AirGuardDetailActivity.this);
-                                Toast.makeText(AirGuardDetailActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-    }
-
     /**
      * 页面全屏
      */
@@ -163,7 +150,27 @@ public class AirGuardDetailActivity extends BaseActivity {
      * 返回按钮
      */
     public void click_back(View view) {
+        setResult(555);
         finish();
     }
 
+    @Override
+    public String getDevId() {
+        return deviceId;
+    }
+
+    @Override
+    public String getDevName() {
+        return et_airguard_name.getText().toString();
+    }
+
+    @Override
+    public void onUpdateAirNameSuccess() {
+
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

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

@@ -17,7 +17,9 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AirGuardNewTimeListener;
 import com.silence.commonframe.activity.Interface.NewSubmitListener;
+import com.silence.commonframe.activity.presenter.AirGuardNewTimePresenter;
 import com.silence.commonframe.adapter.MyWheelAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.BaseBean;
@@ -42,7 +44,7 @@ import okhttp3.Response;
  * @author 郑嘉明
  * start_time_hour、start_time_minute、end_time_hour、end_time_minute、wind_speed_level(风速等级)、wind_speed_reduce（降低风速）、wind_speed_increase（提高风速）
  */
-public class AirGuardNewTimeActivity extends BaseActivity  {
+public class AirGuardNewTimeActivity extends BaseActivity implements AirGuardNewTimeListener.View {
 
     public static int WHEEL_SIZE = 5;      //显示的滚动的数量
     public static int WIND_SPEED_HIGN = 20;     //最高风速
@@ -80,11 +82,13 @@ public class AirGuardNewTimeActivity extends BaseActivity  {
 
     private Intent intent;
 
-    private String deviceId = "000";
+    private String deviceId = "";
     private String id;
     private String startTime;
     private String endTime;
 
+    AirGuardNewTimePresenter presenter;
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_air_guard_new_time;
@@ -92,7 +96,7 @@ public class AirGuardNewTimeActivity extends BaseActivity  {
 
     @Override
     public void initPresenter() {
-
+        presenter = new AirGuardNewTimePresenter(this,this);
     }
 
     @Override
@@ -109,7 +113,7 @@ public class AirGuardNewTimeActivity extends BaseActivity  {
         id = intent.getStringExtra("id");
         wind_speed = intent.getIntExtra("wind_speed",0);
         wind_speed_level.setText(String.valueOf(wind_speed));
-
+        deviceId = intent.getStringExtra("deviceId");
         type = intent.getStringExtra("type");
 
         wind_speed_increase.setOnClickListener(new View.OnClickListener() {
@@ -175,82 +179,15 @@ public class AirGuardNewTimeActivity extends BaseActivity  {
                     intent_result.putExtra("wind_speed",wind_speed);
                     if ("add".equals(type)){
                         setResult(222,intent_result);
-                        addTime();
-                        finish();
+                        presenter.addTime();
                     }else if ("update".equals(type)){
-                        intent_result.putExtra("position",intent.getIntExtra("position",-1));
-                        updateTime();
-                        setResult(333,intent_result);
-                        finish();
+                        presenter.updateTime();
                     }
                 }
             }
         });
     }
 
-    private void updateTime() {
-        OkGo.get(UrlConstants.AIRGUARD_UPDATE_RUNTIME)
-                .params("id",id)
-                .params("startTime",startTime)
-                .params("endTime",endTime)
-                .params("speedType",wind_speed)
-                .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){
-                            Toast.makeText(AirGuardNewTimeActivity.this,"修改成功",Toast.LENGTH_SHORT).show();
-                        }else {
-                            LoginIn.tokenOut(data.code+"",AirGuardNewTimeActivity.this);
-                            Toast.makeText(AirGuardNewTimeActivity.this,""+data.msg,Toast.LENGTH_SHORT).show();
-                        }
-                    }
-
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-
-                    }
-                });
-    }
-
-    /**
-     * 添加时间间隔接口
-     */
-    private void addTime() {
-        OkGo.get(UrlConstants.AIRGUARD_RUNTIME)
-                .tag(this)
-                .params("deviceId",deviceId)
-                .params("startTime",startTime)
-                .params("endTime",endTime)
-                .params("speedType",wind_speed)
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            int code = jsonObject.getInt("code");
-                            String message = jsonObject.get("msg").toString();
-                            if (code == 0){
-                                Toast.makeText(AirGuardNewTimeActivity.this,"添加成功",Toast.LENGTH_SHORT).show();
-                            }else {
-                                LoginIn.tokenOut(code+"",AirGuardNewTimeActivity.this);
-                                Toast.makeText(AirGuardNewTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-
-    }
-
     /**
      * 初始化时间选择的属性
      */
@@ -348,4 +285,46 @@ public class AirGuardNewTimeActivity extends BaseActivity  {
         finish();
     }
 
+    @Override
+    public String getDevId() {
+        return deviceId;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String getStartTime() {
+        return startTime;
+    }
+
+    @Override
+    public String getEndTime() {
+        return endTime;
+    }
+
+    @Override
+    public int getSpeedType() {
+        return wind_speed;
+    }
+
+    @Override
+    public void onAddTimeSuccess() {
+        finish();
+    }
+
+    @Override
+    public void onUpdateTimeSuccess() {
+        Intent intent_result=new Intent();
+        intent_result.putExtra("position",intent.getIntExtra("position",-1));
+        setResult(333,intent_result);
+        finish();
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

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

@@ -2,8 +2,6 @@ package com.silence.commonframe.activity;
 
 import android.graphics.Color;
 import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -15,9 +13,11 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AirGuardTimeClockListener;
+import com.silence.commonframe.activity.presenter.AirGuardTimeClockPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.AtyContainer;
+
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 
@@ -27,7 +27,7 @@ import org.json.JSONObject;
 import java.util.Calendar;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
+
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -36,7 +36,7 @@ import okhttp3.Response;
  * @author 郑嘉明
  * id：tv_current_time（当前时间）、bt_syn_nettime（同步时间按钮）
  */
-public class AirGuardTimeClockActivity extends BaseActivity {
+public class AirGuardTimeClockActivity extends BaseActivity implements AirGuardTimeClockListener.View {
 
     /**
      * 导航栏信息
@@ -54,7 +54,9 @@ public class AirGuardTimeClockActivity extends BaseActivity {
     private String currentMinute;
     private String currentTime;
 
-    private String deviceId = "000";
+    private String deviceId = "";
+
+    private AirGuardTimeClockPresenter presenter;
 
     @Override
     public int getLayoutId() {
@@ -63,7 +65,7 @@ public class AirGuardTimeClockActivity extends BaseActivity {
 
     @Override
     public void initPresenter() {
-
+        presenter = new AirGuardTimeClockPresenter(this,this);
     }
 
     @Override
@@ -72,47 +74,16 @@ public class AirGuardTimeClockActivity extends BaseActivity {
         //设置全屏
         initWindows();
 
+        deviceId = getIntent().getStringExtra("airDevId");
+
         getCurrentTime();
 
         //同步网络时间
-        bt_syn_nettime.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                setTimeClock();
-            }
-        });
-    }
-
-    private void setTimeClock() {
-        String url = UrlConstants.AIRGUARD_SETTIME;
-        OkGo.get(url)
-                .tag(this)
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .params("deviceId",deviceId)
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            int code = jsonObject.getInt("code");
-                            String message = jsonObject.get("msg").toString();
-                            if (code == 0){
-                                Toast.makeText(AirGuardTimeClockActivity.this,"同步成功",Toast.LENGTH_SHORT).show();
-                            }else {
-                                LoginIn.tokenOut(code+"",AirGuardTimeClockActivity.this);
-                                Toast.makeText(AirGuardTimeClockActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
+        bt_syn_nettime.setOnClickListener(v -> presenter.setTimeClock());
     }
 
     /**
-     *
+     * 获取当前时间
      */
     private void getCurrentTime() {
         Calendar calendar = Calendar.getInstance();
@@ -150,4 +121,19 @@ public class AirGuardTimeClockActivity extends BaseActivity {
     public void click_back(View view) {
         finish();
     }
+
+    @Override
+    public String getDevId() {
+        return deviceId;
+    }
+
+    @Override
+    public void onSuccess() {
+        Toast.makeText(this,"同步成功",Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

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

@@ -1,9 +1,7 @@
 package com.silence.commonframe.activity;
-
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -12,41 +10,24 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.lzy.okgo.OkGo;
-import com.lzy.okgo.cache.CacheMode;
-import com.lzy.okgo.callback.StringCallback;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.Interface.AirGuardWordTimeListener;
+import com.silence.commonframe.activity.presenter.AirGuardWordTimePresenter;
 import com.silence.commonframe.adapter.AirGuardWorKTimeAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.AirGuardRunTimeListModel;
-import com.silence.commonframe.bean.BaseBean;
-import com.silence.commonframe.common.constant.UrlConstants;
-import com.silence.commonframe.utils.Data;
+import com.silence.commonframe.model.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.LinearItemDecoration;
-import com.silence.commonframe.utils.LoginIn;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import butterknife.BindView;
-import okhttp3.Call;
-import okhttp3.Response;
 
 /**
  * 空气卫士-工作时间段
  * @author 郑嘉明
  */
-public class AirGuardWordTimeActivity extends BaseActivity {
+public class AirGuardWordTimeActivity extends BaseActivity implements AirGuardWordTimeListener.View {
 
     /**
      * 导航栏信息
@@ -60,17 +41,13 @@ public class AirGuardWordTimeActivity extends BaseActivity {
     @BindView(R.id.worktime_recyclerview)
     RecyclerView worktime_recyclerview;     //时间列表
 
-    @BindView(R.id.srl_refresh)
-    SmartRefreshLayout srlRefresh;
-
     AirGuardWorKTimeAdapter airGuardWorKTimeAdapter;    //工作时间适配器
 
     List<AirGuardRunTimeListModel.DataBean> listTime = new ArrayList<>();
 
-    private String id;
     private String deviceId = "";
 
-    private List<AirGuardRunTimeListModel.DataBean> listRunTime=new ArrayList<>();
+    AirGuardWordTimePresenter presenter;
 
     @Override
     public int getLayoutId() {
@@ -79,62 +56,24 @@ public class AirGuardWordTimeActivity extends BaseActivity {
 
     @Override
     public void initPresenter() {
-
+        presenter = new AirGuardWordTimePresenter(this,this);
     }
 
     @Override
     public void initView() {
         navi_head_text.setText(R.string.airguard_worktime);       //设置标题
         navi_head_text_right.setText(R.string.add);            //设置右侧文字
-        setTimeDate();
         //设置全屏
         initWindows();
-        getRunTime();
+
+        deviceId = getIntent().getStringExtra("airDevId");
+
+        presenter.getData();
+
+        setTimeDate();
 
         //导航栏添加按钮点击事件
         addNewTimeListener();
-        srlRefresh.setEnableLoadMore(false);
-        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                getRunTime();
-            }
-        });
-    }
-
-    private void getRunTime() {
-        OkGo.get(UrlConstants.AIRGUARD_RUNTIMELIST)
-                .tag(this)
-                .params("deviceId",deviceId)
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
-                        System.out.println(data.getData());
-                        if (data.getCode() == 0){
-                            //设置工作时间数据
-                            listTime.clear();
-                            listTime.addAll(data.getData());
-                            airGuardWorKTimeAdapter.notifyDataSetChanged();
-                        }
-                        if (srlRefresh!=null){
-                            srlRefresh.finishLoadMore();
-                            srlRefresh.finishRefresh();
-                        }
-                    }
-
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        super.onError(call, response, e);
-                        if (srlRefresh!=null){
-                            srlRefresh.finishLoadMore();
-                            srlRefresh.finishRefresh();
-                        }
-                    }
-                });
     }
 
     /**
@@ -148,13 +87,14 @@ public class AirGuardWordTimeActivity extends BaseActivity {
                 Intent intent = new Intent(AirGuardWordTimeActivity.this,AirGuardNewTimeActivity.class);
                 intent.putExtra("wind_speed",0);
                 intent.putExtra("type","add");
+                intent.putExtra("deviceId",deviceId);
                 startActivityForResult(intent,222);
             }
         });
     }
 
     /**
-     * 获取添加和修改的时间，添加修改时间的接口在这加
+     * 获取添加和修改的时间，添加修改时间的接口
      * @param requestCode 222 333
      * @param resultCode 222 333
      * @param data worktime
@@ -162,24 +102,15 @@ public class AirGuardWordTimeActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 222 && resultCode == 222){
-            assert data != null;
-            //获取运行时间段
-            getRunTime();
-
-        }else if (requestCode == 333 && resultCode == 333){
-            assert data != null;
-//            String newtime = data.getStringExtra("worktime");
-//            int pos = data.getIntExtra("position",-1);
-//            int wind_speed = data.getIntExtra("wind_speed",0);
-//            HashMap<String,String> hashMap = new HashMap<>();
-//            hashMap.put("time",newtime);
-//            hashMap.put("wind_speed",String.valueOf(wind_speed));
-//            hashMap.put("switch_state","0");            //开关状态，0是关，1是开。有接口后要传值
-//            airGuardWorKTimeAdapter.updateWorkTime(hashMap,pos);           //适配器修改数据刷新
-
-            //这里加修改时间的接口方法。
-            getRunTime();
+        if (data!=null){
+            if (requestCode == 222 && resultCode == 222){
+                //获取运行时间段
+                presenter.updateRunTime();
+            }else if (requestCode == 333 && resultCode == 333){
+                int pos = data.getIntExtra("position",-1);
+                //这里加修改时间的接口方法。
+                presenter.updateRunTime(pos);
+            }
         }
     }
 
@@ -188,7 +119,7 @@ public class AirGuardWordTimeActivity extends BaseActivity {
      */
     private void setTimeDate() {
 
-        airGuardWorKTimeAdapter = new AirGuardWorKTimeAdapter(AirGuardWordTimeActivity.this,listRunTime);
+        airGuardWorKTimeAdapter = new AirGuardWorKTimeAdapter(AirGuardWordTimeActivity.this,listTime);
         worktime_recyclerview.setLayoutManager(new LinearLayoutManager(AirGuardWordTimeActivity.this));
         worktime_recyclerview.addItemDecoration(new LinearItemDecoration(AirGuardWordTimeActivity.this,LinearLayoutManager.HORIZONTAL,R.drawable.decoration_item));     //设置分割线
         worktime_recyclerview.setAdapter(airGuardWorKTimeAdapter);
@@ -203,9 +134,11 @@ public class AirGuardWordTimeActivity extends BaseActivity {
             public void onDeleteClick(int position) {
                 //删除操作，删除的接口在这写
                 Toast.makeText(AirGuardWordTimeActivity.this,"删除成功",Toast.LENGTH_SHORT).show();
-                airGuardWorKTimeAdapter.deleteWorkTime(position);           //适配器删除数据刷新
+
                 //这里加删除时间的接口方法。
-                delRunTime(position);
+//                delRunTime(position);
+                presenter.delRunTime(position);
+                airGuardWorKTimeAdapter.deleteWorkTime(position);           //适配器删除数据刷新
             }
 
             @Override
@@ -223,9 +156,11 @@ public class AirGuardWordTimeActivity extends BaseActivity {
             public void onSwitchListener(Boolean isCheck, int position) {
                 //开关
                 if (isCheck){
-                    openCloseRunTime(position);
+//                    Toast.makeText(AirGuardWordTimeActivity.this,"打开",Toast.LENGTH_SHORT).show();
+                    presenter.openCloseRunTime(position);
                 }else {
-                    openCloseRunTime(position);
+//                    Toast.makeText(AirGuardWordTimeActivity.this,"关闭",Toast.LENGTH_SHORT).show();
+                    presenter.openCloseRunTime(position);
                 }
             }
 
@@ -235,66 +170,6 @@ public class AirGuardWordTimeActivity extends BaseActivity {
     }
 
     /**
-     * 删除运行时间间隔
-     */
-    private void delRunTime(int position) {
-        OkGo.get(UrlConstants.AIRGUARD_DEL_RUNTIME)
-                .tag(this)
-                .params("id",listTime.get(position).getId())
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            int code = jsonObject.getInt("code");
-                            String message = jsonObject.get("msg").toString();
-                            if (code == 0){
-                                Toast.makeText(AirGuardWordTimeActivity.this,"删除成功",Toast.LENGTH_SHORT).show();
-                            }else {
-                                LoginIn.tokenOut(code+"",AirGuardWordTimeActivity.this);
-                                Toast.makeText(AirGuardWordTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-    }
-
-    /**
-     * 打开或关闭运行时间间隔
-     */
-    private void openCloseRunTime(int position) {
-        OkGo.get(UrlConstants.AIRGUARD_OPEN_CLOSE_RUNTIME)
-                .tag(this)
-                .params("id",listTime.get(position).getId())        //
-                .cacheKey("cacheGetKey")
-                .cacheMode(CacheMode.DEFAULT)
-                .headers("token", Data.getToken())
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            int code = jsonObject.getInt("code");
-                            String message = jsonObject.get("msg").toString();
-                            if (code == 0){
-                                Toast.makeText(AirGuardWordTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }else {
-                                LoginIn.tokenOut(code+"",AirGuardWordTimeActivity.this);
-                                Toast.makeText(AirGuardWordTimeActivity.this,""+message,Toast.LENGTH_SHORT).show();
-                            }
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-    }
-
-    /**
      * 页面全屏
      */
     private void initWindows() {
@@ -317,4 +192,42 @@ public class AirGuardWordTimeActivity extends BaseActivity {
         finish();
     }
 
+    @Override
+    public String getDevId() {
+        return deviceId;
+    }
+
+    @Override
+    public List<AirGuardRunTimeListModel.DataBean> getListTime() {
+        return listTime;
+    }
+
+    @Override
+    public void onSuccess(List<AirGuardRunTimeListModel.DataBean> bean) {
+        //设置工作时间数据
+        listTime.clear();
+        listTime.addAll(bean);
+        airGuardWorKTimeAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onUpdateSuccess(int position, AirGuardRunTimeListModel data) {
+        //设置工作时间数据
+        listTime.clear();
+        listTime.addAll(data.getData());
+        airGuardWorKTimeAdapter.updateWorkTime(listTime.get(position),position);
+    }
+
+    @Override
+    public void onUpdateSuccess(AirGuardRunTimeListModel data) {
+        //设置工作时间数据
+        listTime.clear();
+        listTime.addAll(data.getData());
+        airGuardWorKTimeAdapter.addWorkTime(listTime);
+    }
+
+    @Override
+    public void onFile(String msg) {
+        Toast.makeText(this,""+msg,Toast.LENGTH_SHORT).show();
+    }
 }

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

@@ -1,10 +1,10 @@
 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.AirGuardDetailBean;
-import com.silence.commonframe.bean.AirGuardWordTimeBean;
+import com.silence.commonframe.model.AirGuardRunTimeListModel;
+
+import java.util.List;
 
 /**
  * Created by CC on 2018-10-25
@@ -13,11 +13,19 @@ import com.silence.commonframe.bean.AirGuardWordTimeBean;
 public interface AirGuardWordTimeListener {
     interface View{
         String getDevId();
-        void onSuccess(AirGuardWordTimeBean bean);
+        List<AirGuardRunTimeListModel.DataBean> getListTime();
+
+        void onSuccess(List<AirGuardRunTimeListModel.DataBean> bean);
+        void onUpdateSuccess(int position,AirGuardRunTimeListModel data);
+        void onUpdateSuccess(AirGuardRunTimeListModel data);
         void onFile(String msg);
     }
     abstract class Presenter extends BasePresenter<View,BaseModel> {
         public abstract void getData();
+        public abstract void delRunTime(int position);
+        public abstract void openCloseRunTime(int position);
+        public abstract void updateRunTime(int position);
+        public abstract void updateRunTime();
     }
 
 }

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

@@ -1,19 +1,16 @@
 package com.silence.commonframe.activity.presenter;
 
 import android.app.Activity;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
-import com.silence.commonframe.activity.Interface.AirGuardListener;
 import com.silence.commonframe.activity.Interface.AirGuardWordTimeListener;
-import com.silence.commonframe.bean.AirGuardDetailBean;
-import com.silence.commonframe.bean.AirGuardWordTimeBean;
 import com.silence.commonframe.bean.BaseBean;
 import com.silence.commonframe.common.constant.UrlConstants;
+import com.silence.commonframe.model.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.Data;
 import com.silence.commonframe.utils.LoginIn;
 
@@ -27,6 +24,8 @@ public class AirGuardWordTimePresenter extends AirGuardWordTimeListener.Presente
         this.mContext=mContext;
         this.mView=mView;
     }
+
+    //获取运行时间间隔
     @Override
     public void getData() {
         OkGo.get(UrlConstants.AIR_RUN_TIME)
@@ -38,14 +37,132 @@ public class AirGuardWordTimePresenter extends AirGuardWordTimeListener.Presente
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
-                        BaseBean<AirGuardWordTimeBean> data=new Gson().fromJson(s,new TypeToken<BaseBean<AirGuardWordTimeBean>>(){}.getType());
-                        if (data.code==0){
-                            mView.onSuccess(data.data);
+//                        BaseBean<AirGuardWordTimeBean> data=new Gson().fromJson(s,new TypeToken<BaseBean<AirGuardWordTimeBean>>(){}.getType());
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        if (data.getCode()==0){
+                            mView.onSuccess(data.getData());
+                        }else {
+                            LoginIn.tokenOut(data.getCode(),data.getMsg(),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 delRunTime(int position) {
+        OkGo.get(UrlConstants.AIRGUARD_DEL_RUNTIME)
+                .tag(this)
+                .params("id",mView.getListTime().get(position).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,new TypeToken<BaseBean>(){}.getType());
+                        if (data.code == 0){
+                            mView.onFile("删除成功");
+                        }else {
+                            LoginIn.tokenOut(data.code,mContext);
+                            mView.onFile(data.msg);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+
+    //打开或关闭运行时间
+    @Override
+    public void openCloseRunTime(int position) {
+        OkGo.get(UrlConstants.AIRGUARD_OPEN_CLOSE_RUNTIME)
+                .tag(this)
+                .params("id",mView.getListTime().get(position).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,new TypeToken<BaseBean>(){}.getType());
+                        if (data.code == 0){
+                            mView.onFile(data.msg);
                         }else {
-                            LoginIn.tokenOut(data.code,data.msg,mContext);
-                            Toast.makeText(mContext,""+data.msg,Toast.LENGTH_SHORT).show();
+                            LoginIn.tokenOut(data.code,mContext);
+                            mView.onFile(data.msg);
                         }
                     }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        mView.onFile("信息获取失败");
+                    }
+                });
+    }
+
+    //修改运行时间间隔
+    @Override
+    public void updateRunTime(int position) {
+        OkGo.get(UrlConstants.AIRGUARD_RUNTIMELIST)
+                .tag(this)
+                .params("deviceId",mView.getDevId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        System.out.println(data.getData());
+                        if (data.getCode() == 0){
+                            mView.onUpdateSuccess(position,data);
+                        }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 updateRunTime() {
+        OkGo.get(UrlConstants.AIRGUARD_RUNTIMELIST)
+                .tag(this)
+                .params("deviceId",mView.getDevId())
+                .cacheKey("cacheGetKey")
+                .cacheMode(CacheMode.DEFAULT)
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        AirGuardRunTimeListModel data = new Gson().fromJson(s,AirGuardRunTimeListModel.class);
+                        if (data.getCode() == 0){
+                            mView.onUpdateSuccess(data);
+                        }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);

app/src/main/java/com/silence/commonframe/adapter/AirGuardWorKTimeAdapter.java

@@ -12,7 +12,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.silence.commonframe.R;
-import com.silence.commonframe.bean.AirGuardRunTimeListModel;
+import com.silence.commonframe.model.AirGuardRunTimeListModel;
 import com.silence.commonframe.utils.ItemSlideHelper;
 
 import java.util.HashMap;
@@ -44,7 +44,16 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
         final MyViewHolder myViewHolder = (MyViewHolder) viewHolder;
 
-        String runTime = listTime.get(i).getStartTime() + "-" + listTime.get(i).getEndTime();
+        String StartTime = listTime.get(i).getStartTime();
+        String EndTime = listTime.get(i).getEndTime();
+        StringBuilder StartTimeBuilder = new StringBuilder(StartTime);
+        StartTimeBuilder.insert(2,":");
+        StringBuilder EndTimeBuilder = new StringBuilder(EndTime);
+        EndTimeBuilder.insert(2,":");
+        StartTime = StartTimeBuilder.toString();
+        EndTime = EndTimeBuilder.toString();
+        String runTime = StartTime + "-" + EndTime;
+
         myViewHolder.tv_worktime.setText(runTime);
         if ("1".equals(listTime.get(i).getIsValid())){
             myViewHolder.switch_worktime.setChecked(true);
@@ -96,9 +105,9 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
      * 添加时间
      * @param time worktime
      */
-    public void addWorkTime(AirGuardRunTimeListModel.DataBean time){
-        listTime.add(time);
-        this.notifyItemInserted(listTime.size() - 1);
+    public void addWorkTime(List<AirGuardRunTimeListModel.DataBean> time){
+        this.listTime = time;
+        this.notifyDataSetChanged();
     }
 
     /**
@@ -106,17 +115,15 @@ public class AirGuardWorKTimeAdapter extends RecyclerView.Adapter<RecyclerView.V
      * @param postion delete_position
      */
     public void deleteWorkTime(int postion){
-
         listTime.remove(postion);
         this.notifyItemRemoved(postion);
     }
 
     /**
      * 修改时间
-     * @param postion delete_position
+     * @param postion update_position
      */
     public void updateWorkTime(AirGuardRunTimeListModel.DataBean time,int postion){
-
         listTime.set(postion,time);
         this.notifyDataSetChanged();
     }

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

@@ -17,6 +17,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.CoustomerActivity;
 import com.silence.commonframe.activity.HistoryActivity;
@@ -89,7 +90,7 @@ public class MineFragment extends Fragment {
         butterKnife=ButterKnife.bind(this, view);
         name.setText(Data.getName());
         tel.setText(Data.getPhoto());
-        Glide.with(getContext()).load(Data.getUrlPicture()).into(image_head);
+        Glide.with(this).load(Data.getUrlPicture()).apply(new RequestOptions().error(R.mipmap.people3)).into(image_head);
         imageViewset.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -4,68 +4,52 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
-
-
-
-
-
-            <!--<ImageView-->
-            <!--android:layout_width="25dp"-->
-            <!--android:layout_height="25dp"-->
-            <!--android:layout_gravity="center"-->
-            <!--android:background="@mipmap/light" />-->
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:layout_marginBottom="3dp"
+                android:layout_marginTop="8dp"
                 android:orientation="vertical">
 
-
-
-
-
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:id="@+id/fire"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:layout_marginBottom="3dp"
+                        android:layout_marginRight="5dp"
                         android:layout_alignParentLeft="true"
                         android:layout_centerVertical="true"
-                        android:paddingLeft="5dp"
-                        android:textColor="#444"
-                        android:layout_marginLeft="10dp"
+                        android:textColor="@color/myblack"
                         android:text="@string/RecheckMsg_name"
                         android:textSize="15dp" />
 
                     <TextView
                         android:id="@+id/tv_name"
-                        android:layout_width="65dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="25dp"
                         android:layout_toRightOf="@+id/fire"
-                        android:textColor="#444"
+                        android:textColor="@color/myblack"
                         android:gravity="center"
-
-
-                        android:text="我知道了" />
-                    <!--android:visibility="gone"-->
+                        android:text="" />
 
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/mygray"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal">
 
                     <TextView
@@ -74,11 +58,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
                         android:layout_centerVertical="true"
-                        android:layout_marginTop="3dp"
-                        android:layout_marginBottom="3dp"
-                        android:paddingLeft="5dp"
-                        android:textColor="#444"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="5dp"
+                        android:textColor="@color/myblack"
                         android:text="@string/RecheckMsg_time"
                         android:textSize="15dp" />
 
@@ -88,79 +69,51 @@
                         android:layout_height="25dp"
                         android:layout_toRightOf="@+id/fire1"
                         android:gravity="center"
-                        android:textColor="#444"
-
-                        android:text="我知道了" />
-                    <!--android:visibility="gone"-->
+                        android:textColor="@color/myblack"
+                        android:text="" />
 
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/mygray"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:id="@+id/fire11"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:layout_marginBottom="3dp"
+                        android:layout_marginRight="5dp"
                         android:layout_alignParentLeft="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="10dp"
-                        android:textColor="#444"
-                        android:paddingLeft="5dp"
+                        android:textColor="@color/myblack"
                         android:text="@string/RecheckMsg_result"
                         android:textSize="15dp" />
 
                     <TextView
                         android:id="@+id/tv_result"
-                        android:layout_width="65dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="25dp"
                         android:layout_toRightOf="@+id/fire11"
                         android:gravity="center"
-                        android:textColor="#444"
-
-                        android:text="结果" />
-                    <!--android:visibility="gone"-->
+                        android:textColor="@color/myblack"
+                        android:text="" />
 
                 </RelativeLayout>
 
-
-
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-                    android:background="#ccc" />
-
-
-
-
-
-
-
-
-
-
-
-
+                    android:layout_height="5dp"
+                    android:background="@color/thinwhite" />
 
             </LinearLayout>
 
-
-
-
-        <!--<View-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="1dp"-->
-        <!--android:background="#cccccc" />-->
-
-
-
-
-
 </RelativeLayout>