文本名称放入资源文件

app/build.gradle

@@ -5,13 +5,13 @@ plugins {
 
 android {
     namespace 'com.rehome.dywoa'
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         applicationId "com.rehome.dywoa"
         minSdk 24
-        targetSdk 35
-        versionCode 25
-        versionName "1.2.4"
+        targetSdk 36
+        versionCode 27
+        versionName "1.2.6"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

app/src/main/java/com/rehome/dywoa/App.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -54,7 +55,10 @@ public class App extends LitePalApplication {
         initUser();
         AutoLayoutConifg.getInstance().useDeviceSize();
         XUI.init(this); //初始化UI框架
-        CrashReport.initCrashReport(getApplicationContext(), "f147ce3be5", true);
+        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(getApplicationContext());
+        // 通过UserStrategy设置
+        strategy.setDeviceModel(Build.MODEL);
+        CrashReport.initCrashReport(getApplicationContext(), "f147ce3be5", true, strategy);
 
         String applicationId = App.getApplicationId(context);
         showLog(applicationId);

app/src/main/java/com/rehome/dywoa/adapter/SisRealDataAdapter.kt

@@ -0,0 +1,46 @@
+package com.rehome.dywoa.adapter
+
+
+import android.content.Context
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.rehome.dywoa.base.BaseViewBindingAdapter
+import com.rehome.dywoa.bean.SisBaseBean
+import com.rehome.dywoa.bean.XjZhTjBean
+import com.rehome.dywoa.databinding.AdapterSisRealDataBinding
+
+class SisRealDataAdapter(var context: Context,
+                    var data: MutableList<SisBaseBean>) : BaseViewBindingAdapter<AdapterSisRealDataBinding>(context) {
+    override fun getCount(): Int {
+        return data.count()
+    }
+
+    override fun getItem(position: Int): Any {
+        return data[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup?
+    ) = AdapterSisRealDataBinding.inflate(inflater, parent, false)
+
+    override fun handleData(position: Int, binding: AdapterSisRealDataBinding) {
+        val item: SisBaseBean = data[position]
+        binding.tvSisBh.text = item.sisno
+
+        binding.tvSisMc.text = item.sisDesc
+        if(TextUtils.isEmpty(item.dw)){
+            binding.tvSisRealValue.text = item.sisValue
+        }else{
+            binding.tvSisRealValue.text = buildString {
+                append(item.sisValue)
+                append(item.dw)
+            }
+        }
+    }
+}

app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java

@@ -23,6 +23,8 @@ public class KksDataBean extends BaseListBean{
         private String parentCode;
         private String sisno;
 
+        private List<SisBaseBean> sisDataList;
+
         public String getId() {
             return id;
         }
@@ -86,5 +88,13 @@ public class KksDataBean extends BaseListBean{
         public void setSisno(String sisno) {
             this.sisno = sisno;
         }
+
+        public List<SisBaseBean> getSisDataList() {
+            return sisDataList;
+        }
+
+        public void setSisDataList(List<SisBaseBean> sisDataList) {
+            this.sisDataList = sisDataList;
+        }
     }
 }

app/src/main/java/com/rehome/dywoa/bean/SisBaseBean.java

@@ -0,0 +1,40 @@
+package com.rehome.dywoa.bean;
+
+public class SisBaseBean {
+    private String sisno;
+    private String sisDesc;
+    private String sisValue;
+    private String dw;
+
+    public String getSisno() {
+        return sisno;
+    }
+
+    public void setSisno(String sisno) {
+        this.sisno = sisno;
+    }
+
+    public String getSisDesc() {
+        return sisDesc;
+    }
+
+    public void setSisDesc(String sisDesc) {
+        this.sisDesc = sisDesc;
+    }
+
+    public String getSisValue() {
+        return sisValue;
+    }
+
+    public void setSisValue(String sisValue) {
+        this.sisValue = sisValue;
+    }
+
+    public String getDw() {
+        return dw;
+    }
+
+    public void setDw(String dw) {
+        this.dw = dw;
+    }
+}

app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt

@@ -6,8 +6,12 @@ import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import com.rehome.dywoa.Contans
+import com.rehome.dywoa.adapter.SisRealDataAdapter
+import com.rehome.dywoa.adapter.XjZhTjAdapter
 import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding
 import com.rehome.dywoa.bean.KksDataBean
+import com.rehome.dywoa.bean.SisBaseBean
+import com.rehome.dywoa.bean.XjZhTjBean
 import com.rehome.dywoa.databinding.ActivityKksSearchBinding
 import com.rehome.dywoa.utils.GsonUtils
 import com.rehome.dywoa.utils.HttpListener
@@ -19,6 +23,10 @@ import com.yolanda.nohttp.rest.Response
 class KksSearchActivity : BaseActivityOaToolbarViewBinding<ActivityKksSearchBinding>() {
 
 
+//    SisRealDataAdapter  adapter_sis_real_data
+    private lateinit var adapter: SisRealDataAdapter
+    private var datas: MutableList<SisBaseBean> = mutableListOf()
+
     private var qrCodeStrSearch: String? = null
 
     private lateinit var launcherResultQRCode: ActivityResultLauncher<Intent>
@@ -35,6 +43,9 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding<ActivityKksSearchBind
         binding.tvNodata.visibility=View.VISIBLE
         binding.llTop.visibility=View.GONE
 
+        adapter = SisRealDataAdapter(context, datas)
+        binding.lv.adapter = adapter
+
         binding.llGongDan.setOnClickListener(View.OnClickListener { view: View? ->
             if(qrCodeStrSearch!=null){
                 val intent = Intent(context, KksSearchGongDanActivity::class.java)
@@ -141,6 +152,11 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding<ActivityKksSearchBind
                             if(!TextUtils.isEmpty(row.sisno)){
                                 binding.tvSisValue.text = row.sisno
                             }
+                            if(row.sisDataList!=null&&row.sisDataList.size>0){
+                                datas.clear()
+                                datas.addAll(row.sisDataList)
+                                adapter.notifyDataSetChanged()
+                            }
                             qrCodeStrSearch = row.kksCode
                         }else {
                             binding.tvNodata.visibility=View.VISIBLE

app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt

@@ -46,6 +46,7 @@ import com.rehome.dywoa.utils.SPUtils
 import com.rehome.dywoa.utils.StatusBarUtil
 import com.rehome.dywoa.utils.UiUtlis
 import com.sangfor.sdk.SFUemSDK
+import com.tencent.bugly.crashreport.CrashReport
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
 import com.yolanda.nohttp.rest.RequestQueue
@@ -635,7 +636,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
         //val json: String = "Ms97MbjVaypr+CF04BTQ+Y7hbYp+orLZbXM2u+I+PZKSPSSaqR1dcuM3tsig3UpJ7s2qEw5DsJcVd0t4eJM79ABUFWW/0Nplhx37+6jR2YVaSJgA30L0O2FbuyG7SOjP0qfISNaN1L8eC3a7W5oFPpHxkZdxUf5sxJIQHA2c6lCI+Mo/BUgU1MgTIjM3puiWx99mvxOyl9k2oLZUjcjMOygzNUYYD21SQYQ6dtvdVz3iAtqeJ+0EVCtScPXePG/CH/s0Ti/VS54/KSrlRVfdn5s2pHqw5fd2BZX+ZGtIWTGpWb+Wt1ZtrPXPdv/r1Zx84Zcw0EqKicieeuYpfUH+eg==";
 
         val url = Contans.IP + Contans.APPLOGINRSA
-        //val url = "http://192.168.2.115:8601/" + Contans.APPLOGINRSA
+        //val url = "http://192.168.2.84:8601/" + Contans.APPLOGINRSA
 
 
         val request = NoHttp.createStringRequest(url, RequestMethod.POST)
@@ -662,6 +663,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
                         if (userInfo.statusMsg == "success") { //登录成功
                             val usernameLogin: String = binding.etUsername.text.toString().trim()
+                            CrashReport.putUserData(context, "UserName", binding.etUsername.text.toString().trim());
+                            CrashReport.setUserId(binding.etUsername.text.toString().trim())
                             if (userInfo.manid != null && usernameLogin != null && userInfo.manid.equals(
                                     usernameLogin
                                 )

app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java

@@ -168,6 +168,24 @@ public class CJFragment extends BaseFragment {
                     public void selectText(String text, int position) {
                         btn_selectCheckResult.setText(text);
                         et_jg.setText(text);
+                        if("轻微异常".equals(text)||"明显异常".equals(text)||"明显异音".equals(text)||"异常".equals(text)||"报警".equals(text)||"超温".equals(text)||
+                                "超压".equals(text)||"有泄露".equals(text)||"设备异常".equals(text)||"异常跳闸".equals(text)||"有异音".equals(text)||"轻微泄漏".equals(text)||
+                                "严重泄漏".equals(text)||"液位偏低".equals(text)||"油位偏低".equals(text)||"常用源及备用源异常".equals(text)){
+                            showToast("采集结果数据存在异常，请填写分析内容");
+                            llFxnr.setVisibility(View.VISIBLE);
+                            sv.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    sv.fullScroll(View.FOCUS_DOWN);
+                                }
+                            });
+//                            sv.post(new Runnable() {
+//                                @Override
+//                                public void run() {
+//                                    sv.scrollTo(0, sv.getBottom());
+//                                }
+//                            });
+                        }
                     }
                 });
                 dialog.show();
@@ -194,8 +212,16 @@ public class CJFragment extends BaseFragment {
                 if (!s.toString().trim().isEmpty()) {
                     double jg = UiUtlis.getNum(s.toString().trim());
                     if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) {
-                        showToast("采集结果超限");
+                        showToast("数据采集结果存在异常、超限，请填写分析内容");
                         llFxnr.setVisibility(View.VISIBLE);
+                        //sv.fullScroll(View.FOCUS_DOWN);
+                        //sv.scrollTo(0, sv.getBottom());
+                        sv.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                sv.scrollTo(0, sv.getBottom());
+                            }
+                        });
                     } else {
                         llFxnr.setVisibility(View.GONE);
                     }
@@ -284,6 +310,7 @@ public class CJFragment extends BaseFragment {
     public void updata(DjjhRwQy info, int item, int size) {
         this.info = info;
         btn_selectCheckResult.setText("点击选择采集结果");
+        llFxnr.setVisibility(View.GONE);
         tv_dmc.setText(info.getPOINTNAME());
         tv_ff.setText(info.getMEAMETHOD());
         tv_bw.setText(info.getMEAPOS());
@@ -371,6 +398,12 @@ public class CJFragment extends BaseFragment {
 //            }
             if(!TextUtils.isEmpty(info.getCJJG())){
                 btn_selectCheckResult.setText(info.getCJJG());
+                if("轻微异常".equals(info.getCJJG())||"明显异常".equals(info.getCJJG())||"明显异音".equals(info.getCJJG())||"异常".equals(info.getCJJG())||"报警".equals(info.getCJJG())||"超温".equals(info.getCJJG())||
+                        "超压".equals(info.getCJJG())||"有泄露".equals(info.getCJJG())||"设备异常".equals(info.getCJJG())||"异常跳闸".equals(info.getCJJG())||"有异音".equals(info.getCJJG())||"轻微泄漏".equals(info.getCJJG())||
+                        "严重泄漏".equals(info.getCJJG())||"液位偏低".equals(info.getCJJG())||"油位偏低".equals(info.getCJJG())||"常用源及备用源异常".equals(info.getCJJG())){
+                    //showToast("采集结果数据存在异常，请填写分析内容");
+                    llFxnr.setVisibility(View.VISIBLE);
+                }
             }
         } else {
             //未检
@@ -384,9 +417,16 @@ public class CJFragment extends BaseFragment {
                     }else{
                         //观察
                         List<String> selectList = stringToList(info.getMEASTANDARDSELECT());
-                        if(selectList!=null&&selectList.size()>0){
-                            btn_selectCheckResult.setText(selectList.get(0));
-                            et_jg.setText(selectList.get(0));
+                        if(!selectList.isEmpty()){
+                            String firstSelectText = selectList.get(0);
+                            btn_selectCheckResult.setText(firstSelectText);
+                            et_jg.setText(firstSelectText);
+                            if("轻微异常".equals(firstSelectText)||"明显异常".equals(firstSelectText)||"明显异音".equals(firstSelectText)||"异常".equals(firstSelectText)||"报警".equals(firstSelectText)||"超温".equals(firstSelectText)||
+                                    "超压".equals(firstSelectText)||"有泄露".equals(firstSelectText)||"设备异常".equals(firstSelectText)||"异常跳闸".equals(firstSelectText)||"有异音".equals(firstSelectText)||"轻微泄漏".equals(firstSelectText)||
+                                    "严重泄漏".equals(firstSelectText)||"液位偏低".equals(firstSelectText)||"油位偏低".equals(firstSelectText)||"常用源及备用源异常".equals(firstSelectText)){
+                                //showToast("采集结果数据存在异常，请填写分析内容");
+                                llFxnr.setVisibility(View.VISIBLE);
+                            }
                         }
                     }
                 }
@@ -397,29 +437,32 @@ public class CJFragment extends BaseFragment {
 //        rb2.setChecked(!rb1.isChecked());
 //        rb3.setChecked(info.isBYZT());
 
-        cxsx = UiUtlis.getNum(info.getUPPERACTION());
-        cxxx = UiUtlis.getNum(info.getLOWERACTION());
-        bjsx = UiUtlis.getNum(info.getUPPERWARNING());
-        bjxx = UiUtlis.getNum(info.getLOWERWARNING());
+        if("观察".equals(info.getMEAMETHOD())){
 
-        if (info.getFxnr() == null) {
-            llFxnr.setVisibility(View.GONE);
-        } else {
-            double jg = UiUtlis.getNum(info.getCJJG());
-            if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) {
-                llFxnr.setVisibility(View.VISIBLE);
-                llFxnr.setVisibility(View.VISIBLE);
-            } else {
+        }else{
+            cxsx = UiUtlis.getNum(info.getUPPERACTION());
+            cxxx = UiUtlis.getNum(info.getLOWERACTION());
+            bjsx = UiUtlis.getNum(info.getUPPERWARNING());
+            bjxx = UiUtlis.getNum(info.getLOWERWARNING());
+
+            if (info.getFxnr() == null) {
                 llFxnr.setVisibility(View.GONE);
+            } else {
+                double jg = UiUtlis.getNum(info.getCJJG());
+                if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) {
+                    llFxnr.setVisibility(View.VISIBLE);
+                } else {
+                    llFxnr.setVisibility(View.GONE);
+                }
             }
-        }
 
-        sv.post(new Runnable() {
-            @Override
-            public void run() {
-                sv.fullScroll(View.FOCUS_DOWN);
-            }
-        });
+            sv.post(new Runnable() {
+                @Override
+                public void run() {
+                    sv.fullScroll(View.FOCUS_DOWN);
+                }
+            });
+        }
     }
 
 
@@ -452,4 +495,15 @@ public class CJFragment extends BaseFragment {
         String str[] = strs.split(";");
         return Arrays.asList(str);
     }
+
+    public boolean getEditTextFxIsShow() {
+        if(llFxnr!=null){
+            return llFxnr.getVisibility()==View.VISIBLE;
+        }
+        return false;
+    }
+
+    public String getEditTextFxContent() {
+        return etFxnr.getText().toString().trim();
+    }
 }

app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt

@@ -472,12 +472,14 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding<ActivityMjApplyBinding>
                             adapter.notifyDataSetChanged()
                             binding.tvNodata.visibility= View.VISIBLE
                             binding.lv.visibility= View.GONE
+                            binding.tvLjzrws.text="0"
                         }
                     }else {
                         datas.clear()
                         adapter.notifyDataSetChanged()
                         binding.tvNodata.visibility= View.VISIBLE
                         binding.lv.visibility=View.GONE
+                        binding.tvLjzrws.text="0"
                     }
                 }
             }

app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java

@@ -302,6 +302,10 @@ public class SQxgdlrfActivity extends BaseActivity {
                         if (savaData()) {
                             showToast("保存成功");
                             clearView();
+                            Intent intent = new Intent(SQxgdlrfActivity.this, QxgdListActivity.class);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                            startActivity(intent);
+                            finish();
                         }
                     }
                 } else {

app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java

@@ -50,6 +50,46 @@ public class SjcjFragment extends BaseFragment {
     Button btn_exit;
     Button btn_submit_qx;
 
+
+
+    private final int checkItem = 0;
+
+    private MyFragmentYXAdapter adapter;
+    private List<Fragment> list;
+    private CJFragment cj;
+    private FfFragment ff;
+    private BzFragment bz;
+    private ArrayList<DjjhRwQy> lists;
+    private int item = 0;
+    private boolean isEdit = false;
+
+    private int index = 0;
+
+    public SjcjFragment() {
+    }
+
+    public static SjcjFragment newInstance(boolean b, ArrayList<DjjhRwQy> lists, int item) {
+        Bundle bundle = new Bundle();
+        bundle.putBoolean("edit", b);
+        bundle.putParcelableArrayList("list", lists);
+        bundle.putInt(Contans.KEY_ITEM, item);
+        SjcjFragment fragment = new SjcjFragment();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            isEdit = bundle.getBoolean("edit");
+            lists = bundle.getParcelableArrayList("list");
+            index = bundle.getInt(Contans.KEY_ITEM);
+            item = bundle.getInt(Contans.KEY_ITEM) + 1;
+        }
+    }
+
     private void findView() {
         vp = view.findViewById(R.id.vp);
         rb1 = view.findViewById(R.id.rb1);
@@ -79,7 +119,15 @@ public class SjcjFragment extends BaseFragment {
         btn_next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                next();
+                if(cj.getEditTextFxIsShow()){
+                    if(TextUtils.isEmpty(cj.getEditTextFxContent())){
+                        showToast("数据采集结果存在异常、超限，分析内容必填，请填写分析内容");
+                    }else{
+                        next();
+                    }
+                }else{
+                    next();
+                }
             }
         });
         btn_submit_qx.setOnClickListener(new View.OnClickListener() {
@@ -183,44 +231,6 @@ public class SjcjFragment extends BaseFragment {
         });
     }
 
-    private final int checkItem = 0;
-
-    private MyFragmentYXAdapter adapter;
-    private List<Fragment> list;
-    private CJFragment cj;
-    private FfFragment ff;
-    private BzFragment bz;
-    private ArrayList<DjjhRwQy> lists;
-    private int item = 0;
-    private boolean isEdit = false;
-
-    private int index = 0;
-
-    public SjcjFragment() {
-    }
-
-    public static SjcjFragment newInstance(boolean b, ArrayList<DjjhRwQy> lists, int item) {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean("edit", b);
-        bundle.putParcelableArrayList("list", lists);
-        bundle.putInt(Contans.KEY_ITEM, item);
-        SjcjFragment fragment = new SjcjFragment();
-        fragment.setArguments(bundle);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Bundle bundle = getArguments();
-        if (bundle != null) {
-            isEdit = bundle.getBoolean("edit");
-            lists = bundle.getParcelableArrayList("list");
-            index = bundle.getInt(Contans.KEY_ITEM);
-            item = bundle.getInt(Contans.KEY_ITEM) + 1;
-        }
-    }
-
     @Override
     protected void initView() {
         findView();
@@ -237,7 +247,7 @@ public class SjcjFragment extends BaseFragment {
             btn_save_next.setVisibility(View.GONE);
         }
         list = new ArrayList<>();
-        if (lists.size() != 0) {
+        if (!lists.isEmpty()) {
             cj = CJFragment.newInstance(isEdit, lists.get(index), lists.size(), index + 1);
             ff = FfFragment.newInstance(isEdit, lists.get(index).getMEAMETHOD());
             bz = BzFragment.newInstance(isEdit, lists.get(index).getMEASTANDARD());
@@ -280,7 +290,7 @@ public class SjcjFragment extends BaseFragment {
     }
 
     public void next() {
-        if (lists.size() != 0) {
+        if (!lists.isEmpty()) {
             if (!btn_last.isEnabled()) {
                 btn_last.setEnabled(true);
             }
@@ -345,7 +355,7 @@ public class SjcjFragment extends BaseFragment {
                     ff.update(lists.get(item - 1).getMEAMETHOD());
                 }
             } else {
-                if (lists.size() != 0) {
+                if (!lists.isEmpty()) {
                     ++item;
                     if (!btn_last.isEnabled()) {
                         btn_last.setEnabled(true);

app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java

@@ -150,21 +150,24 @@ public class WjFragment extends BaseFragment {
     }
 
     private void initDlbinfo() {
-
-        for (int i = 0; i < rwqys.size(); i++) {
-            DlbInfo info = new DlbInfo();
-            info.setXh(i + 1);
-            //info.setDian(rwqys.get(i).getPOINTNAME() + "(" + rwqys.get(i).getDESCRIPTION() + ")");
-            info.setDian(rwqys.get(i).getDESCRIPTION() + "(" + rwqys.get(i).getPOINTNAME() + ")");
-            info.setStatu(rwqys.get(i).isChecked());
-            info.setCjjg(rwqys.get(i).getCJJG());
-            list.add(info);
+        if(rwqys!=null&&rwqys.size()>0){
+            for (int i = 0; i < rwqys.size(); i++) {
+                DlbInfo info = new DlbInfo();
+                info.setXh(i + 1);
+                //info.setDian(rwqys.get(i).getPOINTNAME() + "(" + rwqys.get(i).getDESCRIPTION() + ")");
+                info.setDian(rwqys.get(i).getDESCRIPTION() + "(" + rwqys.get(i).getPOINTNAME() + ")");
+                info.setStatu(rwqys.get(i).isChecked());
+                info.setCjjg(rwqys.get(i).getCJJG());
+                list.add(info);
+            }
         }
     }
 
     public void setListadapter() {
         list.clear();
         initDlbinfo();
-        adapter.notifyDataSetChanged();
+        if(adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
     }
 }

app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyActivity.kt

@@ -474,12 +474,14 @@ class XjMjApplyActivity : BaseActivityOaToolbarViewBinding<ActivityXjMjApplyBind
                             adapter.notifyDataSetChanged()
                             binding.tvNodata.visibility= View.VISIBLE
                             binding.lv.visibility= View.GONE
+                            binding.tvLjzrws.text="0"
                         }
                     }else {
                         datas.clear()
                         adapter.notifyDataSetChanged()
                         binding.tvNodata.visibility= View.VISIBLE
                         binding.lv.visibility=View.GONE
+                        binding.tvLjzrws.text="0"
                     }
                 }
             }

app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java

@@ -336,10 +336,10 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
             @Override
             public void run() {
                 AlertDialog messageDialog = new AlertDialog.Builder(PrimaryAuthActivity.this)
-                        .setTitle(PrimaryAuthActivity.this.getString(com.sangfor.sdk.R.string.info))
+                        .setTitle(PrimaryAuthActivity.this.getString(R.string.info))
                         .setMessage(errMsg)
                         .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setPositiveButton(com.sangfor.sdk.R.string.ok, new DialogInterface.OnClickListener() {
+                        .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();

app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java

@@ -412,7 +412,8 @@ public class HomeFragment extends BaseFragment {
                         Intent intentHightRisk = new Intent(mActivity, HightRiskActivity.class);
                         intentHightRisk.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
                         String typeHightRisk = "高风险";
-                        String urlWHightRisk = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/998396522831962120/page/1069629959971758112-8233268850081530012";
+                        //String urlWHightRisk = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/998396522831962120/page/1069629959971758112-8233268850081530012";
+                        String urlWHightRisk = "https://mis.dywzhny.com.cn/mobile/cusapp/4704115945164108075/ebuilder?cusMenuId=6374571844917308830";
                         intentHightRisk.putExtra("type",typeHightRisk);
                         intentHightRisk.putExtra("urlLog",urlWHightRisk);
                         startActivity(intentHightRisk);

app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java

@@ -10,7 +10,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年09月21日");
+            Date date = sdFormat.parse("2026年09月20日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {
@@ -43,7 +43,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年09月22日");
+            Date date = sdFormat.parse("2026年09月22日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {
@@ -58,7 +58,7 @@ public class DataPassUtils {
         try {
             //格式化日期的对象(转化成习惯的时间格式)
             SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
-            Date date = sdFormat.parse("2025年09月23日");
+            Date date = sdFormat.parse("2026年09月23日");
             Calendar calendarOne = Calendar.getInstance();
             calendarOne.setTime(date);
             if (!Calendar.getInstance().after(calendarOne)) {

app/src/main/res/layout/activity_kks_search.xml

@@ -26,7 +26,7 @@
                 android:orientation="vertical">
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -57,7 +57,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -88,7 +88,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
                 <LinearLayout
 
                     android:layout_width="match_parent"
@@ -118,7 +118,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -149,7 +149,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -180,7 +180,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -211,7 +211,7 @@
                 </LinearLayout>
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
 
                 <LinearLayout
 
@@ -241,71 +241,80 @@
 
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10px" />
                 <LinearLayout
-
+                    android:id="@+id/ll_gongDan"
                     android:layout_width="match_parent"
                     android:gravity="center_vertical"
                     style="@style/logItemStyle">
 
                     <TextView
+
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:background="@drawable/selector_list_item"
                         android:gravity="center_vertical"
                         android:padding="20px"
-                        android:text="sis实时数据:"
+                        android:text="工单消缺"
                         android:textColor="@color/black"
                         style="@style/logItemTextStyle" />
 
                     <TextView
-                        android:id="@+id/tv_sis_value"
+                        android:id="@+id/tv_toGongDan"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:gravity="left|center_vertical"
+                        android:paddingEnd="10dp"
+                        android:drawableRight="@drawable/packup"
+                        android:drawablePadding="20px"
                         android:text=""
                         android:background="@drawable/selector_list_item"
                         android:textColor="@color/black"
                         android:textSize="18sp"/>
 
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="10px" />
                 <LinearLayout
-                    android:id="@+id/ll_gongDan"
+
                     android:layout_width="match_parent"
                     android:gravity="center_vertical"
                     style="@style/logItemStyle">
 
                     <TextView
-
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:background="@drawable/selector_list_item"
                         android:gravity="center_vertical"
                         android:padding="20px"
-                        android:text="工单消缺"
+                        android:text="sis实时数据:"
                         android:textColor="@color/black"
                         style="@style/logItemTextStyle" />
 
                     <TextView
-                        android:id="@+id/tv_toGongDan"
+                        android:id="@+id/tv_sis_value"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:gravity="left|center_vertical"
-                        android:paddingEnd="10dp"
-                        android:drawableRight="@drawable/packup"
-                        android:drawablePadding="20px"
                         android:text=""
                         android:background="@drawable/selector_list_item"
                         android:textColor="@color/black"
                         android:textSize="18sp"/>
 
                 </LinearLayout>
-                <View
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="15px" />
+                    android:layout_height="match_parent">
+                    <ListView
+                        android:id="@+id/lv"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:divider="#00000000"
+                        android:dividerHeight="10dp"/>
+                </FrameLayout>
             </LinearLayout>
 
             <TextView

app/src/main/res/layout/adapter_sis_real_data.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#ffffff"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            tools:ignore="UselessParent">
+
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    style="@style/dagerDetailLeftStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="SIS编号:" />
+
+                <TextView
+                    android:id="@+id/tv_sis_bh"
+                    style="@style/dagerDetailRightStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    style="@style/dagerDetailLeftStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="SIS名称:" />
+
+                <TextView
+                    android:id="@+id/tv_sis_mc"
+                    style="@style/dagerDetailRightStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/dagerListMarginTopStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    style="@style/dagerDetailLeftStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="SIS实时数据:" />
+
+                <TextView
+                    android:id="@+id/tv_sis_real_value"
+                    style="@style/dagerDetailRightStyleFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/fragment_cj.xml

@@ -379,6 +379,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="70px"
                     android:gravity="center_vertical"
+                    android:layout_marginStart="@dimen/px_20"
                     android:text="异常数据分析内容："
                     android:textSize="@dimen/sbtextSize" />
 
@@ -387,6 +388,7 @@
                     style="@style/editTextTheme"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:hint="请填写分析内容"
                     android:gravity="left|top" />
             </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -106,4 +106,6 @@
     <string name="shanke_sign">签到</string>
     <string name="shan_please_sign">请扫描二维码进行签到</string>
     <string name="tv_mj_apply_manage">免检申请管理</string>
+    <string name="info">提示</string>
+    <string name="ok">确定</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -30,7 +30,7 @@
         <item name="android:layout_margin">10px</item>
         <item name="android:background">@drawable/bg_edittext</item>
         <item name="android:textColor">#bb000000</item>
-        <item name="android:textSize">36px</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">80px</item>
@@ -193,6 +193,17 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/black</item>
     </style>
+    <style name="dagerDetailLeftStyleFirst">
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
+    <style name="dagerDetailRightStyleFirst">
+        <item name="android:layout_marginStart">5dp</item>
+        <item name="android:gravity">center|start</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
     <style name="xjcjRightStyle">
         <item name="android:layout_marginStart">5dp</item>
         <item name="android:gravity">center|start</item>

autolayout/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.zhy.autolayout'

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agentwebCore = "v5.1.1-androidx"
-agp = "8.9.1"
+agp = "8.10.0"
 androidxLocalbroadcastmanager = "1.1.0"
 annotationVersion = "1.9.1"
 appupdate = "4.2.6"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 #Thu Jan 16 17:33:21 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip

litepal/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'org.litepal'

matisse/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.zhihu.matisse'

nohttp/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.yolanda.nohttp'

tkrefreshlayout/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.lcodecore.tkrefreshlayout'

videocompressor/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         minSdk 24
-        targetSdk 35
+        targetSdk 36
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.vincent.videocompressor'