diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 36d7884..f5ecdc3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,9 @@ android:theme="@style/Theme.Aucmames" android:usesCleartextTraffic="true" tools:targetApi="31"> + @@ -90,7 +93,6 @@ android:exported="true"> - diff --git a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java index bc16885..b77060f 100644 --- a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java @@ -15,6 +15,7 @@ import com.example.aucma_mes.dialog.InfoDialog; import com.example.aucma_mes.entity.LoginInfoBeen; import com.example.aucma_mes.run_state.DeviceStopActivity; import com.example.aucma_mes.run_state.DeviceStopRecordActivity; +import com.example.aucma_mes.run_state.SubInfoActivity; import com.example.aucma_mes.service.MyService; import com.example.aucma_mes.utils.SharedPreferencesUtils; import com.example.aucma_mes.vm.User; @@ -162,11 +163,17 @@ public class HomePageActivity extends AppCompatActivity { startActivity(intent); }); - // binding.homeButton15.setOnClickListener(v -> { - // intent = new Intent(this, LubricationActivity.class); - // startActivity(intent); - // - // }); + Intent intent2 = new Intent(this, SubInfoActivity.class); + binding.homeButton15.setOnClickListener(v -> { + intent2.putExtra("type", true); + startActivity(intent2); + + }); + binding.homeButton16.setOnClickListener(v -> { + intent2.putExtra("type", false); + startActivity(intent2); + + }); } catch (Exception e) { diff --git a/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java b/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java index 2763e5c..aaa3ced 100644 --- a/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java +++ b/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java @@ -45,9 +45,9 @@ import okhttp3.MediaType; public abstract class BaseActivity extends AppCompatActivity { private MyBroad receiver; - // public static String url="http://10.11.187.161:6061"; + public static String url="http://10.11.187.161:6061"; // public static String url = "http://10.100.72.10:8080";//河南现场IP - public static String url = "http://10.100.70.50:8080";//黄岛现场IP + // public static String url = "http://10.100.70.50:8080";//黄岛现场IP public ProgressDialog dialog; public Gson gson; public MediaType JSON = MediaType.parse("application/json; charset=utf-8"); diff --git a/app/src/main/java/com/example/aucma_mes/entity/device/DeviceBeen.java b/app/src/main/java/com/example/aucma_mes/entity/device/DeviceBeen.java index 6ff7736..7fd0262 100644 --- a/app/src/main/java/com/example/aucma_mes/entity/device/DeviceBeen.java +++ b/app/src/main/java/com/example/aucma_mes/entity/device/DeviceBeen.java @@ -14,6 +14,15 @@ public class DeviceBeen { private Long deviceTypeId; private String deviceSpec; private int deviceStatus; + private String paramValue; + + public String getParamValue() { + return paramValue; + } + + public void setParamValue(String paramValue) { + this.paramValue = paramValue; + } public Long getDeviceId() { return deviceId; diff --git a/app/src/main/java/com/example/aucma_mes/run_state/SubInfoActivity.java b/app/src/main/java/com/example/aucma_mes/run_state/SubInfoActivity.java new file mode 100644 index 0000000..86be9ed --- /dev/null +++ b/app/src/main/java/com/example/aucma_mes/run_state/SubInfoActivity.java @@ -0,0 +1,99 @@ +package com.example.aucma_mes.run_state; + +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; + +import androidx.databinding.DataBindingUtil; + +import com.example.aucma_mes.R; +import com.example.aucma_mes.base.BaseActivity; +import com.example.aucma_mes.base.MyRecultCall; +import com.example.aucma_mes.base.MyResult; +import com.example.aucma_mes.databinding.ActivitySubInfoBinding; +import com.example.aucma_mes.entity.device.DeviceBeen; +import com.example.aucma_mes.utils.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.util.ArrayList; +import java.util.List; + +import okhttp3.RequestBody; + +public class SubInfoActivity extends BaseActivity { + private ActivitySubInfoBinding binding; + private String uri; + private List list; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = DataBindingUtil.setContentView(this, R.layout.activity_sub_info); + initSelect(); + + boolean type = getIntent().getBooleanExtra("type", true); + binding.setType(type); + if (type) { + binding.setTitle("提交产量"); + uri = "/dms/mobile/device/updateDailyOutput"; + + } else { + binding.setTitle("提交运行时间"); + uri = "/dms/mobile/device/updateRunTime"; + } + } + + + @Override + protected void sanInfo(String code) { + + } + + public void initSelect() { + OkGo.get(url + "/dms/mobile/device/getDevices").tag(this).execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + + list = gson.fromJson(body.getDataJson(), new TypeToken>() { + }.getType()); + + List tagList = new ArrayList<>(list.size()); + list.forEach(deviceBeen -> tagList.add(deviceBeen.getDeviceName())); + binding.setDeviceStringS(tagList); + + } + + } + }); + } + + public void subSubmit(View view) { + if (list == null || list.isEmpty()) { + Toast.makeText(context, "请先获取设备列表", Toast.LENGTH_SHORT).show(); + return; + } + DeviceBeen deviceBeen = list.get((int) binding.subSelect.getSelectedItemId()); + + deviceBeen.setParamValue(binding.subParamValue.getText().toString()); + + OkGo.post(url + uri).tag(this) + .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) + .upRequestBody(RequestBody.create(JSON, gson.toJson(deviceBeen))) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + } + Toast.makeText(context, "提交成功", Toast.LENGTH_SHORT).show(); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home_page.xml b/app/src/main/res/layout/activity_home_page.xml index 7fdaad2..57e3420 100644 --- a/app/src/main/res/layout/activity_home_page.xml +++ b/app/src/main/res/layout/activity_home_page.xml @@ -37,7 +37,7 @@ + + + + + + + + + + + + + + +