diff --git a/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java b/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java index 633d87f..f9bf970 100644 --- a/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/ClassItemActivity.java @@ -1,14 +1,92 @@ package com.example.haiwei_mom; import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; +import android.view.View; -public class ClassItemActivity extends AppCompatActivity { +import com.example.haiwei_mom.base.BaseActivity; +import com.example.haiwei_mom.base.MyRecultCall; +import com.example.haiwei_mom.base.MyResult; +import com.example.haiwei_mom.data.TeamInfoVo; +import com.example.haiwei_mom.databinding.ActivityClassItemBinding; +import com.example.haiwei_mom.uitls.SharedPreferencesUtils; +import com.google.gson.reflect.TypeToken; +import com.lzy.okgo.OkGo; +import com.lzy.okgo.model.Response; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import okhttp3.RequestBody; + +public class ClassItemActivity extends BaseActivity { + private List classList; + private List shiftList; + private ActivityClassItemBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_class_item); + + binding = DataBindingUtil.setContentView(this, R.layout.activity_class_item); + binding.setDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + selectShiftInfo(); + } + + private List list; + + // 获取班次 + private void selectShiftInfo() { + OkGo.post(url + "/wms/pda/selectTeams").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()); + classList = new ArrayList<>(); + shiftList = new ArrayList<>(); + list.forEach(teamInfoVo -> { + if (teamInfoVo.getType().equals("班组")) { + classList.add(teamInfoVo.getTeamName()); + } else { + shiftList.add(teamInfoVo.getTeamName()); + } + }); + binding.setList1(classList); + binding.setList2(shiftList); + } + } + }); + } + + public void classSubmit(View view) { + String shiftText = binding.spinner2.getSelectedItem().toString(); + String classText = binding.spinner1.getSelectedItem().toString(); + Optional shiftId = list.stream().filter(t -> t.getTeamName().equals(shiftText)).map(TeamInfoVo::getTeamId).findFirst(); + Optional classTeamId = list.stream().filter(t -> t.getTeamName().equals(classText)).map(TeamInfoVo::getTeamId).findFirst(); + OkGo.post(url + "/wms/pda/shiftChangeSubmit") + .params("shiftId", shiftId.get()) + .params("classTeamId",classTeamId.get() ) + .params("userName", SharedPreferencesUtils.getstring("nickname", "")) + .execute(new MyRecultCall(dialog, this) { + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 200) { + finish(); + return; + } + myToastUitls.show(body.getMsg()); + } + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/haiwei_mom/MainActivity.java b/app/src/main/java/com/example/haiwei_mom/MainActivity.java index f6aae60..fcb6da9 100644 --- a/app/src/main/java/com/example/haiwei_mom/MainActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/MainActivity.java @@ -83,13 +83,16 @@ public class MainActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - String accessToken = JSONObject.parseObject(body.getDataJson()).get("access_token").toString(); + JSONObject jsonObject = JSONObject.parseObject(body.getDataJson()); + String accessToken = jsonObject.get("access_token").toString(); + MyApplication.getApplication().setAccessToken("Bearer "+accessToken); boolean remember = loginVm.isRemember(); if (remember) { SharedPreferencesUtils.putboolean("isRemember", remember); SharedPreferencesUtils.putstring("user", name); SharedPreferencesUtils.putstring("pass", pass); + SharedPreferencesUtils.putstring("nickname", jsonObject.get("nickname").toString()); } Intent intent = new Intent(MainActivity.this, HomePageActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java index 191015f..863d0d6 100644 --- a/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/base/BaseActivity.java @@ -50,6 +50,7 @@ public class BaseActivity extends AppCompatActivity implements MyScannerCall { public MyToastUitls myToastUitls; @SuppressLint("SimpleDateFormat") public SimpleDateFormat format= new SimpleDateFormat( "yyyyMMdd_HHmmss"); + // public SimpleDateFormat dateFormat= new SimpleDateFormat( "yyyy-MM-dd"); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/example/haiwei_mom/data/TeamInfoVo.java b/app/src/main/java/com/example/haiwei_mom/data/TeamInfoVo.java new file mode 100644 index 0000000..f4fc5bd --- /dev/null +++ b/app/src/main/java/com/example/haiwei_mom/data/TeamInfoVo.java @@ -0,0 +1,33 @@ +package com.example.haiwei_mom.data; + + +public class TeamInfoVo { + private Long teamId; + private String teamName; + private String type; + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + +} diff --git a/app/src/main/res/layout/activity_class_item.xml b/app/src/main/res/layout/activity_class_item.xml index 61d7425..f67ef3c 100644 --- a/app/src/main/res/layout/activity_class_item.xml +++ b/app/src/main/res/layout/activity_class_item.xml @@ -1,131 +1,42 @@ - + xmlns:tools="http://schemas.android.com/tools"> - + - - - - - + - - - - - + - - - - - - + + + + + + + + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".ClassItemActivity"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="用户账号:" /> + android:text='@{SharedPreferencesUtils.getstring("user","")}' /> - - - - - - + android:layout_height="45dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="4dp"> - + - + + + - + android:layout_height="45dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="4dp"> -