fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

修复监视界面12

tags/old_version_1
fyf 1 year ago
parent
219bf072c7
commit
368714aa44
5 changed files with 67 additions and 95 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java
  2. +5
    -1
      app/src/main/res/layout/activity_file.xml
  3. +2
    -37
      app/src/main/res/layout/fragment_home1.xml
  4. +8
    -5
      app/src/main/res/layout/fragment_system_internet.xml
  5. +52
    -51
      app/src/main/res/layout/item/layout/item_file_picker_show.xml

+ 0
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java View File

@@ -123,7 +123,6 @@ public class Home1Fragment extends BaseFragment {
protected View onCreateView() {
View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_home1, null);
ButterKnife.bind(this, root);

return root;
}



+ 5
- 1
app/src/main/res/layout/activity_file.xml View File

@@ -5,7 +5,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".modules.home.fragment.from.FileActivity">
tools:context=".modules.home.fragment.from.FileActivity"
android:background="@color/app_color_blue"
app:qmui_skin_background="?attr/app_skin_common_background">
<com.qmuiteam.qmui.widget.QMUITopBar
android:id="@+id/topbar"
android:layout_width="match_parent"
@@ -38,10 +40,12 @@
android:text="@string/file_all"/>
</LinearLayout>
<FrameLayout

android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/qmui_config_color_white"
/>
<LinearLayout
android:layout_width="match_parent"


+ 2
- 37
app/src/main/res/layout/fragment_home1.xml View File

@@ -27,19 +27,6 @@ android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="wrap_content">

<!-- <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton-->
<!-- android:id="@+id/button"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:clickable="true"-->
<!-- android:gravity="center"-->
<!-- android:padding="10dp"-->
<!-- android:text="fragment1"-->
<!-- android:textColor="@color/qmui_s_link_color"-->
<!-- app:qmui_borderColor="@color/qmui_s_link_color"-->
<!-- app:qmui_borderWidth="1px"/>-->

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -111,18 +98,6 @@ android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="预计剩余时间：300s"/>
<!-- <com.qmuiteam.qmui.widget.QMUIProgressBar-->
<!-- android:id="@+id/jingdu"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="24dp"-->
<!-- android:textColor="@color/qmui_config_color_white"-->
<!-- android:textSize="16sp"-->
<!-- app:qmui_background_color="@color/qmui_config_color_gray_8"-->
<!-- app:qmui_progress_color="@color/app_color_blue_2"-->
<!-- app:qmui_type="type_rect"-->
<!-- app:qmui_max_value="100"-->
<!-- app:qmui_value="20"/>-->
<com.capton.colorfulprogressbar.ColorfulProgressbar
android:id="@+id/jingdu"
app:style="@string/style_colorful"
@@ -212,16 +187,6 @@ android:orientation="vertical">
android:layout_weight="1"
android:layout_height="match_parent">


<!-- <com.bonait.bnframework.common.myprogress.MyProgress-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:circleProgressRadus="50dp"-->
<!-- app:horizonalProgressHeight="10dp"-->
<!-- app:textProgressSize="12sp"-->
<!-- app:colorProgress="#fd9112"-->
<!-- app:colorSecondProgress="#1592ff"-->
<!-- />-->
<com.litao.slider.NiftySlider
android:id="@+id/nifty_slider2"
android:layout_width="match_parent"
@@ -242,8 +207,8 @@ android:orientation="vertical">
app:thumbTextBold="true"
android:stepSize="1"
app:thumbWithinTrackBounds="true"
app:enableDrawHalo="false"/>
app:enableDrawHalo="false"
/>

</RelativeLayout>



+ 8
- 5
app/src/main/res/layout/fragment_system_internet.xml View File

@@ -4,15 +4,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/qmui_config_color_white"
tools:context=".modules.home.fragment.from.fragment.systeminternetfragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/main_background">
android:orientation="vertical">

<!-- 本地已存在资源 -->
<LinearLayout
android:background="@color/qmui_config_color_white"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@@ -22,13 +23,14 @@
android:paddingRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10">
<RelativeLayout
android:background="@color/qmui_config_color_white"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.qmuiteam.qmui.widget.textview.QMUILinkTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已有图片列表"/>
android:text="已有图片列表"
android:textSize="@dimen/text_size_16"
/>
</RelativeLayout>

<RelativeLayout
@@ -50,6 +52,7 @@

<!-- 选择资源 -->
<LinearLayout
android:background="@color/qmui_config_color_white"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@@ -57,12 +60,12 @@
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10">
<RelativeLayout
android:background="@color/qmui_config_color_white"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.qmuiteam.qmui.widget.textview.QMUILinkTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_16"
android:text="选择图片列表"/>
</RelativeLayout>



+ 52
- 51
app/src/main/res/layout/item/layout/item_file_picker_show.xml View File

@@ -1,60 +1,61 @@
<?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:layout_width="match_parent"
android:layout_height="80dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@color/white"
android:layout_marginTop="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
>

<ImageView
android:id="@+id/iv_type"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
/>

xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="80dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/layout_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/iv_type"
android:layout_weight="1"
android:orientation="vertical"
android:padding="10dp">
android:layout_marginTop="10dp"
android:background="@color/activity_background"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/file_picker_title"
tools:text="文件名"/>
<ImageView
android:id="@+id/iv_type"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="10dp" />

<TextView
android:id="@+id/tv_detail"
android:layout_width="match_parent"
android:layout_height="0dp"
<LinearLayout
android:id="@+id/layout_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/iv_type"
android:layout_weight="1"
android:textColor="@color/file_picker_des"
android:textSize="14sp"
android:text="类型：txt 大小：1024KB"/>
android:orientation="vertical"
android:padding="10dp">

<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/file_picker_title"
tools:text="文件名" />

<TextView
android:id="@+id/tv_detail"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:text="类型：txt 大小：1024KB"
android:textColor="@color/file_picker_des"
android:textSize="14sp" />
/>
</LinearLayout>
</LinearLayout>

<ImageView
android:id="@+id/iv_delete"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/file_picker_delete"
android:layout_marginRight="10dp"
android:visibility="gone"
/>
<ImageView
android:id="@+id/iv_delete"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="10dp"
android:src="@mipmap/file_picker_delete"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>

Write Preview
Loading…
Cancel
Save