save works before fixing bugs

This commit is contained in:
hyb1996
2017-07-05 15:52:41 +08:00
parent f627432b80
commit ee4c818007
10 changed files with 204 additions and 123 deletions

View File

@@ -92,9 +92,9 @@ dependencies {
compile 'com.jakewharton:butterknife:8.6.0' compile 'com.jakewharton:butterknife:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
// Android supports // Android supports
compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.0' compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:design:25.3.0' compile 'com.android.support:design:25.3.1'
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
// Personal libraries // Personal libraries
compile 'com.github.hyb1996:MutableTheme:0.2.2' compile 'com.github.hyb1996:MutableTheme:0.2.2'
@@ -116,6 +116,7 @@ dependencies {
compile 'io.mattcarroll.hover:hover:0.9.7' compile 'io.mattcarroll.hover:hover:0.9.7'
compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
compile 'com.yqritc:recyclerview-flexibledivider:1.4.0' compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.1'
// Tasker Plugin // Tasker Plugin
compile group: 'com.twofortyfouram', name: 'android-plugin-client-sdk-for-locale', version: '[4.0.2, 5.0[' compile group: 'com.twofortyfouram', name: 'android-plugin-client-sdk-for-locale', version: '[4.0.2, 5.0['
compile 'com.android.volley:volley:1.0.0' compile 'com.android.volley:volley:1.0.0'

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@@ -1,37 +1,115 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:padding="8dp"
android:gravity="bottom">
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:foreground="?selectableItemBackground"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:rotation="8"
app:cardBackgroundColor="#ffffff"
app:cardCornerRadius="4dp"
app:cardElevation="2dp"
app:cardUseCompatPadding="true"/>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:foreground="?selectableItemBackground"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:rotation="4"
app:cardBackgroundColor="#ffffff"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"/>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?selectableItemBackground"
android:paddingLeft="2dp"
android:paddingRight="2dp"
app:cardBackgroundColor="#ffffff"
app:cardCornerRadius="4dp"
app:cardElevation="6dp"
app:cardUseCompatPadding="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="40dp"
android:foreground="?android:selectableItemBackground"> android:ellipsize="end"
android:maxLines="1"
android:paddingBottom="10dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="10dp"
android:textColor="#99000000"
android:textSize="14sp"
tools:text="正在运行的服务"/>
<ImageView <LinearLayout
android:id="@+id/icon" android:layout_width="match_parent"
android:layout_width="40dp" android:layout_height="34dp"
android:layout_height="40dp" android:layout_marginBottom="2dp"
android:layout_alignParentLeft="true" android:layout_marginLeft="2dp"
android:layout_centerVertical="true" android:layout_marginRight="2dp"
android:layout_marginBottom="4dp" android:gravity="right"
android:layout_marginLeft="8dp" android:orientation="horizontal"
android:layout_marginTop="4dp" android:weightSum="4">
android:contentDescription="@string/_app_name"
android:scaleType="fitCenter" <ImageView
android:src="@drawable/ic_folder_yellow_100px"/> android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:src="@drawable/ic_rename_gray"
android:tint="#767886"/>
<ImageView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:src="@drawable/ic_more_vert_black_24dp"
android:tint="#767886"/>
<TextView </LinearLayout>
android:id="@+id/name" </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_marginRight="80dp"
android:layout_toRightOf="@id/icon"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@android:color/secondary_text_light"
android:textSize="16sp"
tools:text="示例脚本"/>
</RelativeLayout> </android.support.v7.widget.CardView>
</FrameLayout>

View File

@@ -1,99 +1,94 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/item" android:id="@+id/item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:foreground="?selectableItemBackground"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp"> android:paddingRight="2dp"
app:cardBackgroundColor="#ffffff"
app:cardCornerRadius="4dp"
app:cardElevation="1.5dp"
app:cardUseCompatPadding="true">
<LinearLayout
<android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:cardBackgroundColor="#ffffff" android:orientation="vertical">
app:cardCornerRadius="4dp"
app:cardElevation="1.5dp"
app:cardUseCompatPadding="true"> <TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingBottom="10dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="10dp"
android:textColor="#99000000"
android:textSize="14sp"
tools:text="正在运行的服务"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="34dp"
android:orientation="vertical"> android:layout_gravity="right"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:orientation="horizontal">
<TextView <ImageView
android:id="@+id/name" android:id="@+id/run"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:ellipsize="end" android:layout_weight="1"
android:maxLines="1" android:background="?selectableItemBackgroundBorderless"
android:paddingBottom="10dp" android:clickable="true"
android:paddingLeft="16dp" android:paddingBottom="8dp"
android:paddingTop="10dp" android:paddingTop="8dp"
android:textColor="#99000000" android:src="@drawable/ic_run_gray"
android:textSize="14sp" android:tint="#767886"/>
tools:text="正在运行的服务"/>
<LinearLayout <ImageView
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="34dp" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_weight="1"
android:layout_marginBottom="2dp" android:background="?selectableItemBackgroundBorderless"
android:layout_marginLeft="2dp" android:clickable="true"
android:layout_marginRight="2dp" android:paddingBottom="8dp"
android:orientation="horizontal"> android:paddingTop="8dp"
android:src="@drawable/ic_mode_edit_black_24dp"
android:tint="#767886"/>
<ImageView <ImageView
android:id="@+id/run" android:layout_width="0dp"
android:layout_width="0dp" android:layout_height="match_parent"
android:layout_height="match_parent" android:layout_weight="1"
android:layout_weight="1" android:background="?selectableItemBackgroundBorderless"
android:background="?selectableItemBackgroundBorderless" android:clickable="true"
android:clickable="true" android:paddingBottom="8dp"
android:paddingBottom="8dp" android:paddingTop="8dp"
android:paddingTop="8dp" android:src="@drawable/ic_share_black_24dp"
android:src="@drawable/ic_run_gray" android:tint="#767886"/>
android:tint="#767886"/>
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:src="@drawable/ic_mode_edit_black_24dp" android:src="@drawable/ic_more_vert_black_24dp"
android:tint="#767886"/> android:tint="#767886"/>
<ImageView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:src="@drawable/ic_share_black_24dp"
android:tint="#767886"/>
<ImageView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:src="@drawable/ic_more_vert_black_24dp"
android:tint="#767886"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

View File

@@ -32,13 +32,20 @@ import static org.junit.Assert.assertTrue;
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a> * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/ */
public class ExampleUnitTest { public class ExampleUnitTest {
// TODO: 2017/7/2 卡片式脚本 //// TODO: 2017/7/4 恢复项目 一天 7.6
// TODO: 2017/7/2 底部导航栏 // TODO: 2017/7/4 修复 一天 7.7
// TODO: 2017/7/4 修复Bug增加一点脚本发布2.0.13Beta2 半天 7.8
// TODO: 2017/7/2 底部导航栏 一天 7.9
//// TODO: 2017/7/4 教程,服务器界面 二至三天 7.12
// TODO: 2017/7/4 服务器初步开发 三天 7.15
// TODO: 2017/7/4 细节 三天 7.18
// TODO: 2017/7/4 写文档 两天 7.20
// TODO: 2017/7/4 发布 3.0.0 Beta 7.22
@Test @Test
public void test() { public void test() {
System.out.println("SOS".hashCode());
} }
@Test @Test

View File

@@ -33,6 +33,6 @@ dependencies {
}) })
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:appcompat-v7:25.3.1'
compile project(path: ':common') compile project(path: ':common')
} }

View File

@@ -26,5 +26,5 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:support-annotations:25.3.0' compile 'com.android.support:support-annotations:25.3.1'
} }