Skip to content

郑
郑州生态环境局-app
提交 16a46905 authored 作者: yubingbing's avatar yubingbing
浏览文件
操作

行业类型接口调试 

功能性-首页-土壤环境-重点监管单位企业编辑页面中，“行业类别”选择框点击无响应（参见附件截图）-需提供接口及UI
重点监管单位企业编辑页面行业代码问题
视频会议加入会议的时候传用户的名称
上级 f7fa460e
隐藏空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 11 行删除
.idea/deploymentTargetDropDown.xml 0 → 100644
浏览文件 @ 16a46905
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="L203216F01228" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-11-16T06:14:44.929411Z" />
</component>
</project>
\ No newline at end of file
app/build.gradle
浏览文件 @ 16a46905
......@@ -75,7 +75,7 @@ dependencies {
implementation 'io.github.scwang90:refresh-footer-classics:2.0.5'
//权限请求框架
implementation 'com.github.getActivity:XXPermissions:13.6'
implementation 'com.github.getActivity:XXPermissions:15.0'
//版本更新
// implementation 'com.github.AlexLiuSheng:CheckVersionLib:2.4.1_androidx'
......
app/src/main/java/com/zztrapp/zztrapp/http/HttpApi.java
浏览文件 @ 16a46905
......@@ -9,6 +9,7 @@ package com.zztrapp.zztrapp.http;
public class HttpApi {
public static final String BASE_URL = "http://39.104.75.126:8061/trzz-java/";// 开发环境域名now
// public static final String BASE_URL = "http://123.160.223.44:82/trzz-java/";// 测测环境域名now
//-------------------首页-------------------
public static final String INDEX_LIST = "app/index/list";//index列表查询
......
app/src/main/java/com/zztrapp/zztrapp/ui/currency/activity/QuickMeetingActivity.java
浏览文件 @ 16a46905
......@@ -92,7 +92,8 @@ public class QuickMeetingActivity extends BaseActivity {
SPUtils.getInstance().put("sphyId", httpResult.getResult().getId());
NEJoinMeetingParams params = new NEJoinMeetingParams(); //会议参数
params.meetingId = httpResult.getResult().getHyh(); //会议号
params.displayName = httpResult.getResult().getHymc(); //会议昵称
// params.displayName = httpResult.getResult().getHymc(); //会议昵称
params.displayName = SPUtils.getInstance().getString("userName"); //会议昵称
// params.password = "123456"; //会议密码
NEJoinMeetingOptions options = new NEJoinMeetingOptions(); //会议选项，可自定义会中的 UI 显示、菜单、行为等
options.noVideo = true; //入会时关闭视频，默认为 true
......
app/src/main/java/com/zztrapp/zztrapp/ui/currency/activity/VideoconferencingActivity.java
浏览文件 @ 16a46905
......@@ -174,7 +174,8 @@ public class VideoconferencingActivity extends BaseActivity {
if (httpResult.getCode() == 200) {
NEJoinMeetingParams params = new NEJoinMeetingParams(); //会议参数
params.meetingId = list.get(position).getHyh(); //会议号
params.displayName = list.get(position).getHymc(); //会议昵称
// params.displayName = list.get(position).getHymc(); //会议昵称
params.displayName = SPUtils.getInstance().getString("userName"); //会议昵称
// params.password = "123456"; //会议密码
NEJoinMeetingOptions options = new NEJoinMeetingOptions(); //会议选项，可自定义会中的 UI 显示、菜单、行为等
options.noVideo = true; //入会时关闭视频，默认为 true
......@@ -195,7 +196,7 @@ public class VideoconferencingActivity extends BaseActivity {
@Override
public void onResult(int resultCode, String resultMsg, Void result) {
KLog.e("bby001",resultCode+","+resultMsg);
KLog.e("bby001", resultCode + "," + resultMsg);
if (resultCode == NEMeetingError.ERROR_CODE_SUCCESS) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
......
app/src/main/java/com/zztrapp/zztrapp/ui/currency/activity/WrwxcActivity.java
浏览文件 @ 16a46905
package com.zztrapp.zztrapp.ui.currency.activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.text.Editable;
import android.text.TextUtils;
......@@ -11,6 +12,7 @@ import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.scwang.smart.refresh.footer.ClassicsFooter;
......@@ -137,6 +139,26 @@ public class WrwxcActivity extends BaseActivity {
}
});
adapter.setOnItemClickListener(new WrwxcAdapter.OnItemClickListener() {
@Override
public void onDelClick(String id, int position) {
AlertDialog.Builder alertdialogbuilder = new AlertDialog.Builder(WrwxcActivity.this);
alertdialogbuilder.setMessage("确定删除吗？");
alertdialogbuilder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
//todo
}
});
alertdialogbuilder.setNeutralButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
}
});
final AlertDialog alertdialog1 = alertdialogbuilder.create();
alertdialog1.show();
}
@Override
public void onEditClick(String id, int position) {
Intent intent = new Intent(new Intent(WrwxcActivity.this, AddWrwxcActivity.class));
......
app/src/main/java/com/zztrapp/zztrapp/ui/currency/adapter/VideoconferencingAdapter.java
浏览文件 @ 16a46905
......@@ -55,7 +55,7 @@ public class VideoconferencingAdapter extends RecyclerView.Adapter<Videoconferen
public void onBindViewHolder(ItemHolder holder, @SuppressLint("RecyclerView") int position) {
holder.bindings.meetingName.setText(list.get(position).getHymc());
holder.bindings.meetingNumber.setText("会议号："+list.get(position).getHyh());
holder.bindings.name.setText("发起人：："+list.get(position).getFqr());
holder.bindings.name.setText("发起人："+list.get(position).getFqr());
holder.bindings.time.setText("预约开始时间："+list.get(position).getKssj());
if (list.get(position).getZt()==2){
holder.bindings.lookDetailView.setVisibility(View.GONE);
......
app/src/main/java/com/zztrapp/zztrapp/ui/currency/adapter/WrwxcAdapter.java
浏览文件 @ 16a46905
......@@ -30,6 +30,8 @@ public class WrwxcAdapter extends RecyclerView.Adapter<WrwxcAdapter.ItemHolder>
private List<WrwxcBean.RecordsBean> list;
public interface OnItemClickListener {
void onDelClick(String id, int position);
void onEditClick(String id, int position);
void onLookDetailClick(String id, int position);
......@@ -74,6 +76,15 @@ public class WrwxcAdapter extends RecyclerView.Adapter<WrwxcAdapter.ItemHolder>
}
}
});
holder.bindings.del.setVisibility(View.VISIBLE);
holder.bindings.del.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (onItemClickListener != null) {
onItemClickListener.onDelClick(list.get(position).getId(), position);
}
}
});
holder.bindings.lookDetail.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
......
app/src/main/java/com/zztrapp/zztrapp/ui/index/activity/ZdjgdwListEditActivity.java
浏览文件 @ 16a46905
......@@ -349,6 +349,7 @@ public class ZdjgdwListEditActivity extends BaseActivity {
if (hylxdlList == null || hylxdlList.size() == 0) {
binding.hylxdlmcView.setVisibility(View.GONE);
}
binding.hydm.setText("");
existHylxdl = true;
}
}
......@@ -389,6 +390,7 @@ public class ZdjgdwListEditActivity extends BaseActivity {
if (hylxzlList == null || hylxzlList.size() == 0) {
binding.hylxzlmcView.setVisibility(View.GONE);
}
binding.hydm.setText("");
}
}
});
......@@ -427,6 +429,7 @@ public class ZdjgdwListEditActivity extends BaseActivity {
if (hylxxlList == null || hylxxlList.size() == 0) {
binding.hylxxlmcView.setVisibility(View.GONE);
}
binding.hydm.setText("");
}
}
});
......@@ -460,6 +463,7 @@ public class ZdjgdwListEditActivity extends BaseActivity {
binding.hylxxlmc.setText(list.get(0).getName());
detail.setHylxxlmc(list.get(0).getName());
detail.setHylxxl(list.get(0).getId());
binding.hydm.setText(detail.getHylxml() + detail.getHylxxl() + " " + detail.getHylxxlmc());
}
}
});
......
app/src/main/java/com/zztrapp/zztrapp/ui/mine/activity/LoginActivity.java
浏览文件 @ 16a46905
......@@ -147,16 +147,16 @@ public class LoginActivity extends BaseActivity {
public void onNext(HttpResult<CreateUserBean> httpResult) {
if (httpResult.getCode() == 200) {
SPUtils.getInstance().put("isLogin", true);
SPUtils.getInstance().put("userName", result.getUserInfo().getUsername());
SPUtils.getInstance().put("userName", result.getUserInfo().getUsername());
// SPUtils.getInstance().put("parcelName", result.getUserInfo().getWrdkmc());
SPUtils.getInstance().put("realname", result.getUserInfo().getRealname());
SPUtils.getInstance().put("realname", result.getUserInfo().getRealname());
// String address = result.getUserInfo().getProvinceName() + result.getUserInfo().getCityName() + result.getUserInfo().getCountyName();
// SPUtils.getInstance().put("address", address);
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
// SPUtils.getInstance().put("userType", result.getUserInfo().getUserType());//0是土地使用权人，1是市质控
//网易云会议账号信息
SPUtils.getInstance().put("accountId", httpResult.getResult().getUserUuid());
SPUtils.getInstance().put("accountToken", httpResult.getResult().getUserToken());
SPUtils.getInstance().put("accountId", httpResult.getResult().getUserUuid());
SPUtils.getInstance().put("accountToken", httpResult.getResult().getUserToken());
startActivity(intent);
finish();
} else {
......@@ -196,7 +196,7 @@ public class LoginActivity extends BaseActivity {
@Override
public void onError(int code, String message) {
KLog.e("onError"+code);
KLog.e("onError" + code);
binding.randomImage.setImageResource(R.mipmap.random_image);
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show(message);
......@@ -289,7 +289,7 @@ public class LoginActivity extends BaseActivity {
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == XXPermissions.REQUEST_CODE) {
if (XXPermissions.isGranted(this, Permission.CAMERA) && XXPermissions.isGranted(this, Permission.ACCESS_COARSE_LOCATION) && XXPermissions.isGranted(this, Permission.ACCESS_FINE_LOCATION) && XXPermissions.isGranted(this, Permission.Group.STORAGE)) {
if (XXPermissions.isGranted(this, Permission.CAMERA) && XXPermissions.isGranted(this, Permission.ACCESS_COARSE_LOCATION) && XXPermissions.isGranted(this, Permission.ACCESS_FINE_LOCATION) && XXPermissions.isGranted(this, Permission.Group.STORAGE) && XXPermissions.isGranted(this, Permission.Group.BLUETOOTH)) {
isHaveAllPermission = true;
}
}
......
app/src/main/res/layout/item_rv_special_tasks.xml
浏览文件 @ 16a46905
......@@ -40,6 +40,21 @@
android:gravity="end|center_vertical"
android:visibility="visible">
<TextView
android:id="@+id/del"
android:layout_width="wrap_content"
android:layout_height="27pt"
android:layout_marginStart="10pt"
android:background="@drawable/shape_white_stroke_d7d7d7_6"
android:gravity="center"
android:minWidth="82pt"
android:paddingStart="20pt"
android:paddingEnd="20pt"
android:text="删除"
android:textColor="@color/color232323"
android:textSize="13pt"
android:visibility="gone" />
<TextView
android:id="@+id/record"
android:layout_width="wrap_content"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论