diff --git a/app/build.gradle b/app/build.gradle index d88e941..6b0276d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 36 - versionCode 28 - versionName "2.4.4" + versionCode 29 + versionName "2.4.5" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt index 15de6c4..2f9c533 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceManagerListAdapter.kt @@ -24,6 +24,7 @@ import com.yolanda.nohttp.rest.CacheMode import com.yolanda.nohttp.rest.OnResponseListener import com.yolanda.nohttp.rest.RequestQueue import com.yolanda.nohttp.rest.Response +import org.w3c.dom.Text import javax.net.ssl.HostnameVerifier class DeviceManagerListAdapter( @@ -104,7 +105,7 @@ class DeviceManagerListAdapter( if(!TextUtils.isEmpty(itemBean.areaFullName)){ binding.tvArea.text = itemBean.areaFullName } - binding.tvSbzt.text = itemBean.description + //binding.tvSbzt.text = itemBean.description if(itemBean.online){ binding.tvZxzt.text = "在线" binding.tvZxzt.setTextColor(Color.parseColor("#67C23A"))//0099ff @@ -112,6 +113,26 @@ class DeviceManagerListAdapter( binding.tvZxzt.text = "离线" binding.tvZxzt.setTextColor(Color.parseColor("#ff0000")) } + if(TextUtils.isEmpty(itemBean.major)){ + binding.tvSbzt.text = "" + }else{ + if(itemBean.status=="0"){ + binding.tvSbzt.text = "检修/下线" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + if(itemBean.status=="1"){ + binding.tvSbzt.text = "上线" + binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff + } + if(itemBean.status=="2"){ + binding.tvSbzt.text = "丢失" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + if(itemBean.status=="3"){ + binding.tvSbzt.text = "报废" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + } binding.tvZtsysc.text = itemBean.continuedTime binding.tvAzsj.text = itemBean.installTime binding.tvYczsc.text = itemBean.runningTime diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt index 64b3dc6..9e057f6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/DeviceOverviewListAdapter.kt @@ -104,10 +104,10 @@ class DeviceOverviewListAdapter( }else{ binding.tvMc.text = itemBean.name } - binding.tvSbzt.text = itemBean.description - if(!TextUtils.isEmpty(itemBean.description)&&"正常"==itemBean.description){ - binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff - } +// binding.tvSbzt.text = itemBean.description +// if(!TextUtils.isEmpty(itemBean.description)&&"正常"==itemBean.description){ +// binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff +// } if(itemBean.online){ binding.tvZxzt.text = "在线" @@ -116,6 +116,26 @@ class DeviceOverviewListAdapter( binding.tvZxzt.text = "离线" binding.tvZxzt.setTextColor(Color.parseColor("#ff0000")) } + if(TextUtils.isEmpty(itemBean.major)){ + binding.tvSbzt.text = "" + }else{ + if(itemBean.status=="0"){ + binding.tvSbzt.text = "检修/下线" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + if(itemBean.status=="1"){ + binding.tvSbzt.text = "上线" + binding.tvSbzt.setTextColor(Color.parseColor("#67C23A"))//0099ff + } + if(itemBean.status=="2"){ + binding.tvSbzt.text = "丢失" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + if(itemBean.status=="3"){ + binding.tvSbzt.text = "报废" + binding.tvSbzt.setTextColor(Color.parseColor("#ff0000")) + } + } binding.tvYczsc.text = itemBean.runningTime binding.tvSjgxsj.text = itemBean.warningTime binding.llCwcz.setOnClickListener { diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceManagerListResultBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceManagerListResultBean.java index 055d547..07fd0f9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceManagerListResultBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceManagerListResultBean.java @@ -44,9 +44,11 @@ public class DeviceManagerListResultBean extends DeviceAlarmBaseBean{ private String continuedTime;//状态持续时间 private String installTime;//安装时间 private String runningTime;//运行总时长 - private String state;//设备状态 + private String state; private String areaFullPath; private String areaFullName; + private String status;//设备状态 + private String major;//专业 public String getCode() { return code; @@ -175,5 +177,21 @@ public class DeviceManagerListResultBean extends DeviceAlarmBaseBean{ public void setAreaFullName(String areaFullName) { this.areaFullName = areaFullName; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceManagerListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceManagerListActivity.kt index 012fcd5..c4beab7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceManagerListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceManagerListActivity.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.os.Bundle import android.text.TextUtils import android.view.View +import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.RadioGroup import androidx.activity.enableEdgeToEdge @@ -51,10 +52,12 @@ class DeviceManagerListActivity : BaseActivityOaToolbarViewBinding private var nodeKey: String? = null private var cname: String? = null - - //DeviceManagerListAdapter - //adapter_device_manager_list -// DeviceManagerListResultBean + //专业下拉 + val specialtyList = mutableListOf("全部", "汽机", "环化", "锅炉", "电气") + private lateinit var spinnerAdapter:ArrayAdapter + //设备状态下拉 + val deviceSpinnerList = mutableListOf("全部", "检修/下线", "上线", "丢失", "报废") + private lateinit var deviceSpinnerAdapter:ArrayAdapter override fun getViewBinding() = ActivityDeviceManagerListBinding.inflate(layoutInflater) @@ -86,6 +89,49 @@ class DeviceManagerListActivity : BaseActivityOaToolbarViewBinding?, view: View?, position: Int, id: Long) { + val selectedItem = parent?.getItemAtPosition(position).toString() + showLog(selectedItem) + authenticationLoginDeviceAlarmInfoRsa() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + // 处理未选择的情况 + } + } + + // 创建适配器 + deviceSpinnerAdapter = ArrayAdapter.createFromResource( + this, + R.array.spinner_items_sbzt, + android.R.layout.simple_spinner_item + ) + deviceSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + binding.spSbzt.adapter = deviceSpinnerAdapter + // 设置选择监听 + binding.spSbzt.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { + val selectedItem = parent?.getItemAtPosition(position).toString() + showLog(selectedItem) + authenticationLoginDeviceAlarmInfoRsa() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + // 处理未选择的情况 + } + } + + val gson = GsonBuilder() .setPrettyPrinting() .serializeNulls() @@ -239,6 +285,8 @@ class DeviceManagerListActivity : BaseActivityOaToolbarViewBinding { @@ -352,6 +400,7 @@ class DeviceManagerListActivity : BaseActivityOaToolbarViewBinding { override fun onSucceed(what: Int, response: Response?) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOverviewListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOverviewListActivity.kt index ec5e0bc..9ba1e7e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOverviewListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOverviewListActivity.kt @@ -4,6 +4,8 @@ import android.content.Intent import android.os.Bundle import android.text.TextUtils import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter import android.widget.RadioGroup import androidx.activity.enableEdgeToEdge import androidx.activity.result.ActivityResultLauncher @@ -52,6 +54,10 @@ class DeviceOverviewListActivity : private var nodeKey: String? = null private var cname: String? = null + //专业下拉 + val specialtyList = mutableListOf("全部", "汽机", "环化", "锅炉", "电气") + private lateinit var spinnerAdapter: ArrayAdapter + override fun getViewBinding() = ActivityDeviceOverviewListBinding.inflate(layoutInflater) @@ -73,6 +79,27 @@ class DeviceOverviewListActivity : binding.lv.emptyView = binding.tvNodata + // 创建适配器 + spinnerAdapter = ArrayAdapter.createFromResource( + this, + R.array.spinner_items_zy, + android.R.layout.simple_spinner_item + ) + spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + binding.spZy.adapter = spinnerAdapter + // 设置选择监听 + binding.spZy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { + val selectedItem = parent?.getItemAtPosition(position).toString() + showLog(selectedItem) + authenticationLoginDeviceAlarmInfoRsa() + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + // 处理未选择的情况 + } + } + val gson = GsonBuilder() .setPrettyPrinting() .serializeNulls() @@ -193,6 +220,8 @@ class DeviceOverviewListActivity : Contans.IP + Contans.DeviceManagerListUrl, RequestMethod.GET ) + val zyIndex:Int = binding.spZy.selectedItemPosition + request.add("major",specialtyList[zyIndex]) NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { 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 cb9eef1..883c6b2 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 @@ -136,7 +136,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // Contans.BASE_URL_COMPANY_SERVER_EXTRANET //智慧安防平台登录 电厂外网 // Contans.BASE_URL_AI_3D_SERVER = // Contans.BASE_URL_AI_3D_SERVER_EXTRANET //AI三维可视化安防平台登录 电厂外网 - binding.rg.check(R.id.rb3) + binding.rg.check(R.id.rb1) Contans.IP = Contans.IP_INTRANET //运行IP内网 Contans.BASE_URL = Contans.BASE_URL_INTRANET //行政IP内网 Contans.BASE_URL_COMPANY_SERVER = @@ -241,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") // binding.etUsername.setText("310187") // binding.etPassword.setText("4321@cwxING") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringPhotoFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringPhotoFragment.java index cc1359b..b9850cb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringPhotoFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringPhotoFragment.java @@ -1,15 +1,50 @@ package com.rehome.zhdcoa.ui.fragment; +import static com.rehome.zhdcoa.utils.GsonUtils.GsonToBean; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Color; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.rehome.zhdcoa.Contans; +import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.base.BaseViewBindingFragment; +import com.rehome.zhdcoa.bean.DeviceOnlineStatusImgBean; import com.rehome.zhdcoa.databinding.FragmentDeviceMonitoringPhotoBinding; import com.rehome.zhdcoa.databinding.FragmentDeviceMonitoringStatisticsBinding; +import com.rehome.zhdcoa.ui.activity.PhotoRiskViewActivity; +import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils; +import com.rehome.zhdcoa.utils.HttpListener; +import com.rehome.zhdcoa.utils.NohttpUtils; +import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener; +import com.rehome.zhdcoa.utils.RSAAndroid; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.CacheMode; +import com.yolanda.nohttp.rest.OnResponseListener; +import com.yolanda.nohttp.rest.Request; +import com.yolanda.nohttp.rest.RequestQueue; +import com.yolanda.nohttp.rest.Response; + +import java.util.ArrayList; +import java.util.List; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; public class DeviceMonitoringPhotoFragment extends BaseViewBindingFragment { @@ -17,6 +52,10 @@ public class DeviceMonitoringPhotoFragment extends BaseViewBindingFragment onlinePhotoList = new ArrayList<>(); + private List deviceOnlineStatusImgList = new ArrayList<>(); + private RequestQueue queue; + public DeviceMonitoringPhotoFragment(String deviceCode,String deviceName,String areaFullName){ this.deviceCode=deviceCode; this.deviceName=deviceName; @@ -30,11 +69,158 @@ public class DeviceMonitoringPhotoFragment extends BaseViewBindingFragment request = NoHttp.createStringRequest(url, RequestMethod.GET); + + NohttpUtils.getInstance().add(requireActivity(),0, request, new HttpListener() { + + @SuppressLint({"SetTextI18n", "DefaultLocale", "NotifyDataSetChanged"}) + @Override + public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { + + String result = response.get(); + showLog(result); + + + DeviceOnlineStatusImgBean bean = GsonToBean(result, DeviceOnlineStatusImgBean.class); + if(bean!=null && bean.getCode()==20000 && bean.isSuccess() && bean.getData()!=null && !bean.getData().isEmpty()){ + deviceOnlineStatusImgList.clear(); + deviceOnlineStatusImgList.addAll(bean.getData()); + onlinePhotoList.clear(); + + ArrayList onlinePhotoListTemp = new ArrayList<>(); + + String imgDeviceOnlineBaseUrl = Contans.IP + Contans.getImgDeviceOnlineBaseUrl; + for(DeviceOnlineStatusImgBean.DeviceOnlineStatusImg item : deviceOnlineStatusImgList){ + String fileName = item.getFileName(); + String imgFullUrl = imgDeviceOnlineBaseUrl+fileName; + onlinePhotoListTemp.add(imgFullUrl); + onlinePhotoList.add(imgFullUrl); + showLog(imgFullUrl); + } + showLog(String.valueOf(onlinePhotoListTemp.size())); + if(!onlinePhotoList.isEmpty()){ + //设置图片 + String mediaUrl = onlinePhotoList.get(0); + setDevicePhotoToImageView(mediaUrl); + binding.tvNoPhoto.setVisibility(View.GONE); + }else{ + Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon_device_place_big); + Drawable drawable = new BitmapDrawable(context.getResources(), bitmap); + binding.fivPhoto.setImageDrawable(drawable); + } + } + } + + @Override + public void onFailed(int what, com.yolanda.nohttp.rest.Response response) { + showLog("数据加载失败"); + } + }); + } + public void setDevicePhotoToImageView(String mediaUrl) { + Request request = NoHttp.createImageRequest(mediaUrl); + request.setCacheMode(CacheMode.NONE_CACHE_REQUEST_NETWORK); + + if (!TextUtils.isEmpty(mediaUrl)) { + Log.i("app", "fullPath is:" + mediaUrl); + if (!TextUtils.isEmpty(request.url())) { + String url = request.url(); + if (url.startsWith("https://219.131.195.3:7100") || url.startsWith("https://219.131.195.3:7011") || url.startsWith("https://219.131.195.3:7081") || url.startsWith("https://219.131.195.3:7082")) { + SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context); + if (socketFactory != null) { + request.setSSLSocketFactory(socketFactory); + request.setHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }); + } + } + } + queue.add(6, request, new OnResponseListener<>() { + @Override + public void onStart(int what) { + + } + + @Override + public void onSucceed(int what, Response response) { + showLog("--------bitmap-------"); + + Bitmap bitmap = response.get(); + showLog(String.valueOf(bitmap==null)); + Drawable drawable = new BitmapDrawable(context.getResources(), bitmap); + binding.fivPhoto.setImageDrawable(drawable); + } + + @Override + public void onFailed(int what, Response response) { +// Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon_device_place); +// Drawable drawable = new BitmapDrawable(context.getResources(), bitmap); +// binding.fiv.setImageDrawable(drawable); + } + + @Override + public void onFinish(int what) { + } + }); + } else { + Log.i("app", "path is null"); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringStatisticsFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringStatisticsFragment.java index 8c6b352..2f40b69 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringStatisticsFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/DeviceMonitoringStatisticsFragment.java @@ -145,7 +145,7 @@ public class DeviceMonitoringStatisticsFragment extends BaseViewBindingFragment< String url = Contans.IP + Contans.getRateLineChartDataUrl+deviceCode; Request request = NoHttp.createStringRequest(url, RequestMethod.GET); - NohttpUtils.getInstance().add(requireActivity(),0, request, new HttpListener() { + NohttpUtils.getInstance().addNoProgress(requireActivity(),0, request, new HttpListener() { @Override public void onSucceed(int what, com.yolanda.nohttp.rest.Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 76382a7..b44d7d7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -198,7 +198,7 @@ class HomeFragment : BaseViewBindingFragment() { private fun initLists() { val titles = arrayOf( // "来访管理", - "会议管理", +// "会议管理", "用餐管理", "车辆管理", // "办公领用", @@ -214,7 +214,7 @@ class HomeFragment : BaseViewBindingFragment() { ) val imgIds = intArrayOf( // R.drawable.icon_visit, - R.drawable.icon_meet, +// R.drawable.icon_meet, R.drawable.icon_dinner, R.drawable.icon_vehicle, // R.drawable.icon_office, @@ -258,12 +258,12 @@ class HomeFragment : BaseViewBindingFragment() { binding.gv.setAdapter(adapter) binding.gv.onItemClickListener = AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long -> - if (position == 2) { + if (position == 1) { if (resultList.contains("ApplyVehicle")) { val intent = Intent(getContext(), ApplyVehicleActivity::class.java) startActivity(intent) } - }else if (position == 8) { + }else if (position == 7) { val intent = Intent(getContext(), WeatherActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) startActivity(intent) @@ -284,16 +284,16 @@ class HomeFragment : BaseViewBindingFragment() { // 12 -> TAG = GridViewDialog.TAG_AF // } when (position) { - 0 -> TAG = GridViewDialog.TAG_MEET - 1 -> TAG = GridViewDialog.TAG_DINNER +// 0 -> TAG = GridViewDialog.TAG_MEET + 0 -> TAG = GridViewDialog.TAG_DINNER // 3 -> TAG = GridViewDialog.TAG_OFFICE // 4 -> TAG = GridViewDialog.TAG_TASK // 5 -> TAG = GridViewDialog.TAG_SCHEDULE - 3 -> TAG = GridViewDialog.TAG_CHECK - 4 -> TAG = GridViewDialog.TAG_PEIXUN - 5 -> TAG = GridViewDialog.TAG_PDANGJIAN - 6 -> TAG = GridViewDialog.TAG_JD - 7 -> TAG = GridViewDialog.TAG_AF + 2 -> TAG = GridViewDialog.TAG_CHECK + 3 -> TAG = GridViewDialog.TAG_PEIXUN + 4 -> TAG = GridViewDialog.TAG_PDANGJIAN + 5 -> TAG = GridViewDialog.TAG_JD + 6 -> TAG = GridViewDialog.TAG_AF } val dialog = GridViewDialog(context, TAG) dialog.show() diff --git a/app/src/main/res/drawable-xhdpi/icon_device_place_big.jpg b/app/src/main/res/drawable-xhdpi/icon_device_place_big.jpg new file mode 100644 index 0000000..8b09b5c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_device_place_big.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/icon_device_place_small.jpg b/app/src/main/res/drawable-xhdpi/icon_device_place_small.jpg new file mode 100644 index 0000000..f22a54b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_device_place_small.jpg differ diff --git a/app/src/main/res/layout/activity_device_manager_list.xml b/app/src/main/res/layout/activity_device_manager_list.xml index c17bad1..6d8c419 100644 --- a/app/src/main/res/layout/activity_device_manager_list.xml +++ b/app/src/main/res/layout/activity_device_manager_list.xml @@ -13,10 +13,10 @@ + android:layout_marginTop="5dp"> - - - - - - + android:text="在线状态：" /> @@ -123,28 +92,153 @@ style="@style/Widget.AppCompat.CompoundButton.RadioButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" + android:layout_marginStart="5dp" android:layout_marginEnd="10dp" android:textSize="16sp" android:text="离线" /> - + + -