From 6ab21e954f87f2f53d71c616b4651a5ba3a6fa27 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Tue, 18 Mar 2025 18:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhdcoa/adapter/GridViewYxNewAdapter.java | 111 ++++++++++++++++++ .../rehome/zhdcoa/service/PushService.java | 26 ++-- .../zhdcoa/service/UploadDataService.java | 6 +- .../rehome/zhdcoa/service/UploadService.java | 12 +- .../zhdcoa/ui/activity/LoginActivity.kt | 3 + .../ui/activity/XwangcMainActivity.java | 5 +- .../zhdcoa/ui/fragment/YunXingFragment.kt | 5 + app/src/main/res/layout/activity_xwaqgc.xml | 2 +- .../res/layout/adapter_grid_view_yx_new.xml | 34 ++++++ app/src/main/res/layout/gridview_item.xml | 11 +- 10 files changed, 189 insertions(+), 26 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/adapter/GridViewYxNewAdapter.java create mode 100644 app/src/main/res/layout/adapter_grid_view_yx_new.xml diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/GridViewYxNewAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/GridViewYxNewAdapter.java new file mode 100644 index 0000000..516fe5b --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/GridViewYxNewAdapter.java @@ -0,0 +1,111 @@ +package com.rehome.zhdcoa.adapter; + + +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import com.rehome.zhdcoa.R; +import com.rehome.zhdcoa.bean.GridViewBean; +import com.zhy.autolayout.utils.AutoUtils; +import java.util.List; + +/** + * Created by ruihong on 2017/10/25. + */ + +public class GridViewYxNewAdapter extends BaseAdapter { + + private final Context context; + + private final List datas; + + + private final int item = 0; + + private final List items;//通过传入一些item，让传入的item不可以点击 + + + private final boolean flag; + + + public GridViewYxNewAdapter(Context context, List datas, List items, boolean flag) { + this.context = context; + this.items = items; + this.flag = flag; + this.datas = datas; + } + + @Override + public int getCount() { + + return datas.size(); + } + + @Override + public GridViewBean getItem(int i) { + return datas.get(i); + } + + @Override + public long getItemId(int i) { + return i; + } + + @Override + public View getView(int position, View view, ViewGroup viewGroup) { + + ViewHolder holder; + + if (view == null) { + holder = new ViewHolder(); + view = LayoutInflater.from(context).inflate(R.layout.adapter_grid_view_yx_new, viewGroup, false); + holder.iv = view.findViewById(R.id.iv); + holder.tv = view.findViewById(R.id.tv); + holder.ll = view.findViewById(R.id.ll); + view.setTag(holder); + AutoUtils.autoSize(view); + } else { + holder = (ViewHolder) view.getTag(); + } + + GridViewBean bean = getItem(position); + +// holder.ll.setBackgroundColor(context.getResources().getColor(bean.getBackgroup())); + + holder.ll.setBackgroundResource(bean.getBackgroup()); + + if (!TextUtils.isEmpty(bean.getTitle())) { + holder.iv.setImageResource(bean.getImageid()); + } + holder.tv.setText(bean.getTitle()); + return view; + } + + static class ViewHolder { + TextView tv; + ImageView iv; + LinearLayout ll; + } + + //重写isEnabled,传入哪个position， + @Override + public boolean isEnabled(int position) { + + if (!flag) { + for (int i = 0; i < items.size(); i++) { + if (position == items.get(i)) { + return true; + } + } + return false; + } + return true; + } +} + diff --git a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java index cc056b1..b0de02d 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java @@ -96,47 +96,51 @@ public class PushService extends IntentService { } Request qy = NoHttp.createStringRequest(Contans.IP + Contans.QY); - NohttpUtils.getInstance().add(null, 12, qy, callback, false, false, ""); - + NohttpUtils.getInstance().addNoProgress(this, 12, qy, callback); Request ck_ip = NoHttp.createStringRequest(Contans.IP + Contans.GET_CK_IP); - NohttpUtils.getInstance().add(null, 14, ck_ip, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 14, ck_ip, callback); for (int value : what) { + Log.i("app","PushService---"); + Log.i("app",String.valueOf(value)); switch (value) { //消防保卫 case 0: Request xfbw = NoHttp.createStringRequest(Contans.IP + Contans.XFDJJHALL); String str = (String) SPUtils.get(getApplicationContext(), Contans.SCBZBH, "152145221"); xfbw.add("bzbh", UiUtlis.encoder(str)); - NohttpUtils.getInstance().add(null, 0, xfbw, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 0, xfbw, callback); break; //点检 case 1: Request dj = NoHttp.createStringRequest(Contans.IP + Contans.DJJHLIST); dj.add("BZMC", UiUtlis.encoder((String) SPUtils.get(getApplicationContext(), Contans.SCBZBH, "12108080102"))); - NohttpUtils.getInstance().add(null, 1, dj, callback, false, false, "加载中..."); + NohttpUtils.getInstance().addNoProgress(this, 1, dj, callback); String url = Contans.IP + Contans.QXGDZY; showLog(url); showLog("11"); Request zy = NoHttp.createStringRequest(url); - NohttpUtils.getInstance().add(null, 11, zy, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 11, zy, callback); break; //安建环 case 2: Request request = NoHttp.createStringRequest(Contans.IP + Contans.AJHJHLIST); request.add("BZMC", UiUtlis.encoder((String) SPUtils.get(getApplicationContext(), Contans.SCBZBH, "12108080102"))); - NohttpUtils.getInstance().add(null, 2, request, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 2, request, callback); break; //行为安全观察 case 3: + showLog("------XWAQGC------"); + showLog(Contans.IP + Contans.XWAQGC); Request xwaq = NoHttp.createStringRequest(Contans.IP + Contans.XWAQGC); xwaq.add("gh", App.getInstance().getUserInfo().getManid()); - NohttpUtils.getInstance().add(null, 3, xwaq, callback, false, false, ""); + showLog(xwaq.url()); + NohttpUtils.getInstance().addNoProgress(this, 3, xwaq, callback); break; } } @@ -238,8 +242,12 @@ public class PushService extends IntentService { } break; case 3: + showLog("------行为安全观察------"); + String resutl = response.get(); + showLog("------result------"); //行为安全观察 - XwaqgcJhList xwaq = GsonToBean(response.get(), XwaqgcJhList.class); + XwaqgcJhList xwaq = GsonToBean(resutl, XwaqgcJhList.class); + showLog(GsonUtils.GsonString(xwaq)); if (xwaq != null) { if (xwaq.getTotal() != 0) { List jhs = new ArrayList<>(); diff --git a/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java b/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java index 742fb30..eff60d1 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/UploadDataService.java @@ -266,7 +266,7 @@ public class UploadDataService extends IntentService { requestCount++; Request request = NoHttp.createStringRequest(Contans.IP + Contans.DJJHSC, RequestMethod.POST); request.setDefineRequestBodyForJson(toJson()); - NohttpUtils.getInstance().add(null, 0, request, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 0, request, callback); //缺陷工单，如果缺陷工单为空，就没有上传 List infos = DataSupport.findAll(QxgdInfo.class); @@ -277,7 +277,7 @@ public class UploadDataService extends IntentService { //Logger.json(qxgdjson); System.out.println(qxgdjson); request1.setDefineRequestBodyForJson(qxgdjson); - NohttpUtils.getInstance().add(null, 1, request1, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 1, request1, callback); } for (String jhid : djjhids) { @@ -289,7 +289,7 @@ public class UploadDataService extends IntentService { "&jhid=" + UiUtlis.encoder(info.getJhid()) + "&pointnum=" + UiUtlis.encoder(info.getPointnum()) + "&djr=" + UiUtlis.encoder(info.getDjr()), RequestMethod.POST); xcjs.add(Contans.FILEPS, new FileBinary(new File(info.getFilename()))); - NohttpUtils.getInstance().add(null, 2, xcjs, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(null, 2, xcjs, callback); } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/service/UploadService.java b/app/src/main/java/com/rehome/zhdcoa/service/UploadService.java index a164f56..fbbd1bf 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/UploadService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/UploadService.java @@ -165,7 +165,7 @@ public class UploadService extends IntentService { //计划 Request request = NoHttp.createStringRequest(Contans.IP+Contans.DJJHSC, RequestMethod.POST); request.setDefineRequestBodyForJson(json); - NohttpUtils.getInstance().add(null, 0, request, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 0, request, callback); //缺陷工单，如果缺陷工单为空，就没有上传 List infos = DataSupport.findAll(QxgdInfo.class); @@ -175,7 +175,7 @@ public class UploadService extends IntentService { String qxgdjson = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}"; // Logger.json(qxgdjson); request1.setDefineRequestBodyForJson(qxgdjson); - NohttpUtils.getInstance().add(null, 1, request1, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 1, request1, callback); } //现场记事 List xcjss = DataSupport.findAll(XcjsInfo.class); @@ -185,7 +185,7 @@ public class UploadService extends IntentService { "&jhid=" + xcjss.get(i).getJhid() + "&pointnum=" + xcjss.get(i).getPointnum() + "&djr=" + xcjss.get(i).getDjr(), RequestMethod.POST); xcjs.add(Contans.FILEPS, new FileBinary(new File(xcjss.get(i).getFilename()))); - NohttpUtils.getInstance().add(null, 2, xcjs, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 2, xcjs, callback); } } @@ -210,7 +210,7 @@ public class UploadService extends IntentService { String json = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}"; Request request = NoHttp.createStringRequest(Contans.IP+Contans.AJHSC, RequestMethod.POST); request.setDefineRequestBodyForJson(json); - NohttpUtils.getInstance().add(null, 0, request, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 0, request, callback); for (String jhid : jhids) { List xcjs = DataSupport.where("jhid = ?", jhid).find(Ajhxcjs.class); @@ -222,7 +222,7 @@ public class UploadService extends IntentService { "&areacode=" + UiUtlis.encoder(ajhxcjs.getAreacode()) + "&jsr=" + UiUtlis.encoder(App.getInstance().getUserInfo().getManid()), RequestMethod.POST); request1.add(Contans.FILEPS, new FileBinary(new File(ajhxcjs.getFile()))); - NohttpUtils.getInstance().add(null, 1, request1, callback, false, false, ""); + NohttpUtils.getInstance().addNoProgress(this, 1, request1, callback); } } Request request2 = NoHttp.createStringRequest(Contans.IP+Contans.YHPC, RequestMethod.POST); @@ -231,7 +231,7 @@ public class UploadService extends IntentService { requestCount++; String json1 = "{\"Rows\":" + GsonUtils.GsonString(info) + ",\"Total\": " + info.size() + "}"; request.setDefineRequestBodyForJson(json1); - NohttpUtils.getInstance().add(null, 3, request2, callback, false, false, "上传中..."); + NohttpUtils.getInstance().addNoProgress(this, 3, request2, callback); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index c9512ea..6c33ac5 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -240,6 +240,9 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("sfd02910291Z+") // binding.etUsername.setText("310465") // binding.etPassword.setText("Liu524042*") + binding.etUsername.setText("310456") + binding.etPassword.setText("Ysq+1234") + } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XwangcMainActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XwangcMainActivity.java index 9159f9b..970d404 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XwangcMainActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XwangcMainActivity.java @@ -9,6 +9,7 @@ import android.widget.AdapterView; import android.widget.GridView; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.GridViewYXAdapter; +import com.rehome.zhdcoa.adapter.GridViewYxNewAdapter; import com.rehome.zhdcoa.base.BaseActivity2; import com.rehome.zhdcoa.bean.GridViewBean; import java.util.ArrayList; @@ -20,7 +21,7 @@ public class XwangcMainActivity extends BaseActivity2 { private final String[] str = {"行为安全观察任务下载", "行为安全观察任务豁免", "豁免审核"}; private final int[] imageId = {R.mipmap.icon3, R.mipmap.icon4, R.mipmap.icon5}; private final int[] colors = {R.drawable.radius_b1, R.drawable.radius_b2, R.drawable.radius_e2}; - private GridViewYXAdapter adapter; + private GridViewYxNewAdapter adapter; @Override public int getContentViewID() { @@ -37,7 +38,7 @@ public class XwangcMainActivity extends BaseActivity2 { title.setText("行为安全观察"); setBack(); - adapter = new GridViewYXAdapter(this, getGridViewData(), new ArrayList(), true); + adapter = new GridViewYxNewAdapter(this, getGridViewData(), new ArrayList(), true); gv.setSelector(new ColorDrawable(Color.TRANSPARENT)); gv.setAdapter(adapter); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YunXingFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YunXingFragment.kt index 4f93cd7..acb5ae3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YunXingFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YunXingFragment.kt @@ -444,6 +444,10 @@ class YunXingFragment : BaseViewBindingKotlinFragment() private fun checkPush() { val whats = intArrayOf(-1, -1, -1, -1, -1) val test = intArrayOf(0, 1, 2, 3, 4) + +// showLog("---------item-------") +// showLog(GsonUtils.GsonString(item)) +// item.add(3) for (i in item.indices) { if (item[i] == 0) { //点检 @@ -458,6 +462,7 @@ class YunXingFragment : BaseViewBindingKotlinFragment() } } + val intent = Intent(activity, PushService::class.java) //intent.putExtra("what", 0); val bundle = Bundle() diff --git a/app/src/main/res/layout/activity_xwaqgc.xml b/app/src/main/res/layout/activity_xwaqgc.xml index 65425cd..fd95cd5 100644 --- a/app/src/main/res/layout/activity_xwaqgc.xml +++ b/app/src/main/res/layout/activity_xwaqgc.xml @@ -21,6 +21,6 @@ android:numColumns="2" android:scrollbars="none" android:stretchMode="columnWidth" - android:verticalSpacing="@dimen/gridview_interval" /> + android:verticalSpacing="20dp" /> diff --git a/app/src/main/res/layout/adapter_grid_view_yx_new.xml b/app/src/main/res/layout/adapter_grid_view_yx_new.xml new file mode 100644 index 0000000..2096666 --- /dev/null +++ b/app/src/main/res/layout/adapter_grid_view_yx_new.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/gridview_item.xml b/app/src/main/res/layout/gridview_item.xml index 4de1055..cb559fb 100644 --- a/app/src/main/res/layout/gridview_item.xml +++ b/app/src/main/res/layout/gridview_item.xml @@ -5,19 +5,19 @@ android:background="#00000000" android:gravity="center" android:orientation="vertical" - android:padding="2px"> + android:padding="2dp"> @@ -26,6 +26,7 @@ android:id="@+id/tv" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="10dp" android:textSize="15sp" android:text="xxxx" />