wangh
/
beijing_daxing_android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成 巡检

Browse Source
idata
wanghao 6 months ago
parent cabb1bd15a
commit cd03058083
6 changed files with 69 additions and 43 deletions
Show Stats Download Patch File Download Diff File

7
app/src/main/java/com/example/beijing_daxing/CheckActivity.java
Unescape Escape View File

@ -50,6 +50,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP
private TakePictureDialog takeDialog;
private long id;
private long inspectionId;
private int backIndex;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -76,6 +77,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP
});*/
Intent intent = getIntent();
id = intent.getLongExtra("id", 0);
backIndex = intent.getIntExtra("backIndex", 0);
inspectionId = intent.getLongExtra("inspectionId", 0);
String code = intent.getStringExtra("code");
initRequest(code);
@ -146,12 +148,17 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP
.params("tableId", id)
.params("json", gson.toJson(list))
.params("inspectionId",inspectionId)
.params("user", SharedPreferencesUtils.getstring("user",""))
.addFileParams("files",files)
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show();
Intent resultIntent = new Intent();
resultIntent.putExtra("backIndex", backIndex);
files.forEach(File::delete);
setResult(RESULT_OK, resultIntent);
finish();
}
});

57
app/src/main/java/com/example/beijing_daxing/CheckListActivity.java
Unescape Escape View File

@ -31,20 +31,21 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall
private CheckListAdapter adapter;
private List<CheckTaskInfo> list;
private ObservableBoolean createState;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ActivityCheckListBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check_list);
adapter = new CheckListAdapter(this,this);
adapter = new CheckListAdapter(this, this);
binding.setAdapter(adapter);
createState=new ObservableBoolean();
createState = new ObservableBoolean();
createState.set(false);
binding.setState(createState);
initRequest();
}
private void initRequest() {
OkGo.<MyResult>post(url+"/inspection/selectTask")
OkGo.<MyResult>post(url + "/inspection/selectTask")
.params("user", SharedPreferencesUtils.getstring("user", ""))
.execute(new MyRecultCall(dialog, this) {
@SuppressLint("NotifyDataSetChanged")
@ -52,12 +53,13 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
MyResult body = response.body();
if (body.getCode()==0){
if (body.getCode() == 0) {
createState.set(false);
list=gson.fromJson(body.getData().toString(),new TypeToken<List<CheckTaskInfo>>(){}.getType());
list = gson.fromJson(body.getData().toString(), new TypeToken<List<CheckTaskInfo>>() {
}.getType());
adapter.setList(list);
adapter.notifyDataSetChanged();
}else {
} else {
createState.set(true);
}
@ -74,27 +76,42 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall
OkGo.<MyResult>post(url + "/xj/createTask")
.params("user", SharedPreferencesUtils.getstring("user", ""))
.execute(new MyRecultCall(dialog, this) {
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 0) {
initRequest();
return;
}
Toast.makeText(CheckListActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
}
});
@Override
public void onSuccess(Response<MyResult> response) {
super.onSuccess(response);
var body = response.body();
if (body.getCode() == 0) {
initRequest();
return;
}
Toast.makeText(CheckListActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show();
}
});
}
@Override
public void clickItem(int index) {
Intent intent=new Intent(this,CheckActivity.class);
Intent intent = new Intent(this, CheckActivity.class);
CheckTaskInfo checkTaskInfo = list.get(index);
intent.putExtra("id", checkTaskInfo.getId());
intent.putExtra("inspectionId", checkTaskInfo.getInspectionId());
intent.putExtra("code",checkTaskInfo.getLocationCode());
startActivity(intent);
intent.putExtra("code", checkTaskInfo.getLocationCode());
intent.putExtra("backIndex", index);
startActivityForResult(intent, 1);
}
@SuppressLint("NotifyDataSetChanged")
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 1 && data != null) {
int index = data.getIntExtra("backIndex", 0);
Log.e("TAG", "onActivityResult:" + index);
list.get(index).setTaskState("完成");
adapter.notifyDataSetChanged();
}
}
}

3
app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java
Unescape Escape View File

@ -175,7 +175,8 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
if (requestCode == CAMERA_PHOTO && resultCode == RESULT_OK) {
Bitmap bitmap = null;
try {
Log.e("TAG", "onActivityResult:" + img_uri.getPath());

26
app/src/main/java/com/example/beijing_daxing/base/MyApplication.java
Unescape Escape View File

@ -39,7 +39,7 @@ import okhttp3.OkHttpClient;
public class MyApplication extends Application {
MyApplication application;
// public static UHFRManager uhfLongerManager;
public static UHFRManager uhfLongerManager;
@Override
public void onCreate() {
@ -60,18 +60,18 @@ public class MyApplication extends Application {
.init(this);
}
// public static UHFRManager getUhfLongerManager() {
// if (uhfLongerManager==null){
// try {
// uhfLongerManager = UHFRManager.getInstance();
// uhfLongerManager.setPower(33,33);
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//
// return uhfLongerManager;
// }
public static UHFRManager getUhfLongerManager() {
if (uhfLongerManager==null){
try {
uhfLongerManager = UHFRManager.getInstance();
uhfLongerManager.setPower(33,33);
} catch (Exception e) {
e.printStackTrace();
}
}
return uhfLongerManager;
}
// OKGO 初始化
private void okGoBase() {
OkHttpClient.Builder builder = new OkHttpClient.Builder();

10
app/src/main/res/layout/activity_check_list.xml
Unescape Escape View File

@ -49,9 +49,9 @@
<TextView
style="@style/item_text_style"
android:layout_width="match_parent"
android:layout_width="115dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="机坪"
/>
@ -63,9 +63,9 @@
<TextView
style="@style/item_text_style"
android:layout_width="match_parent"
android:layout_width="115dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="机位编码"
/>
@ -90,7 +90,7 @@
style="@style/item_text_style"
android:layout_width="63dp"
android:layout_height="match_parent"
android:textColor="#E71717" />
android:text="操作" />
</LinearLayout>

9
app/src/main/res/layout/item_check_list.xml
Unescape Escape View File

@ -32,9 +32,8 @@
<TextView
style="@style/item_text_style"
android:layout_width="match_parent"
android:layout_width="115dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@{vm.areaName}"
/>
@ -45,9 +44,9 @@
<TextView
style="@style/item_text_style"
android:layout_width="match_parent"
android:layout_width="115dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@{vm.locationCode}"
/>
@ -76,6 +75,8 @@
android:layout_width="63dp"
android:layout_height="match_parent"
android:src="@mipmap/ic_start"
android:visibility='@{vm.taskState.equals("待完成")?View.VISIBLE:View.GONE}'
android:padding="5dp"/>
</LinearLayout>
</layout>
Write Preview
Loading…
Cancel
Save