73
+            android:src="@drawable/about_contract"
74
+            />
75
+
76
+        <TextView
77
+            android:layout_width="0dp"
78
+            android:layout_weight="1"
79
+            android:layout_height="wrap_content"
80
+            android:text="@string/contract"
81
+            android:textSize="16sp"
82
+            android:textColor="@color/dark_grey"
83
+            android:layout_marginLeft="10dp"/>
84
+
85
+        <ImageView
86
+            android:layout_width="wrap_content"
87
+            android:layout_height="wrap_content"
88
+            android:layout_marginRight="12dp"
89
+            android:layout_gravity="right|center_vertical"
90
+            android:src="@drawable/arrow_right"/>
91
+    </LinearLayout>
92
+
93
+
94
+    <LinearLayout
95
+        android:layout_width="match_parent"
96
+        android:layout_height="match_parent"
97
+        android:gravity="center|bottom"
98
+        android:paddingBottom="8dp"
99
+        android:orientation="vertical">
100
+
101
+        <TextView
102
+            android:layout_width="wrap_content"
103
+            android:layout_height="wrap_content"
104
+            android:textColor="@color/grey"
105
+            android:textSize="14sp"
106
+            android:text="@string/copyright"/>
107
+
108
+        <TextView
109
+            android:layout_width="wrap_content"
110
+            android:layout_height="wrap_content"
111
+            android:padding="4dp"
112
+            android:textColor="@color/grey"
113
+            android:textSize="14sp"
114
+            android:text="@string/company_name"/>
115
+
116
+    </LinearLayout>
117
+</LinearLayout>

+ 41 - 0
app/src/main/res/layout/activity_feedback.xml

@@ -0,0 +1,41 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    android:layout_width="match_parent"
4
+    android:layout_height="match_parent"
5
+    android:background="@color/background_light_grey_color"
6
+    android:orientation="vertical">
7
+
8
+    <RelativeLayout
9
+        android:id="@+id/title_layout"
10
+        android:layout_width="match_parent"
11
+        android:layout_height="wrap_content"
12
+        android:background="@color/colorPrimaryDark">
13
+        <include layout="@layout/title_bar_with_back_and_option" />
14
+    </RelativeLayout>
15
+
16
+    <EditText
17
+        android:id="@+id/et_feedback_content"
18
+        android:layout_width="match_parent"
19
+        android:textSize="14sp"
20
+        android:textColorHint="@color/grey"
21
+        android:background="@color/white"
22
+        android:textColor="@color/dark_grey"
23
+        android:hint="@string/feedback_hint"
24
+        android:paddingTop="10dp"
25
+        android:paddingLeft="12dp"
26
+        android:gravity="top"
27
+        android:layout_height="120dp" />
28
+
29
+    <Button
30
+        android:id="@+id/btn_feedback_send"
31
+        android:layout_width="match_parent"
32
+        android:layout_height="48dp"
33
+        android:layout_marginTop="30dp"
34
+        android:textColor="@color/white"
35
+        android:textSize="20sp"
36
+        android:enabled="false"
37
+        android:background="@drawable/send_btn_bg_selector"
38
+        android:text="@string/send"/>
39
+
40
+
41
+</LinearLayout>

+ 31 - 0
app/src/main/res/layout/activity_webview.xml

@@ -0,0 +1,31 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    android:layout_width="match_parent"
4
+    android:layout_height="match_parent"
5
+    xmlns:progress="http://schemas.android.com/apk/res-auto"
6
+    android:background="@color/background_light_grey_color">
7
+
8
+    <RelativeLayout
9
+        android:id="@+id/title_layout"
10
+        android:layout_width="match_parent"
11
+        android:layout_height="wrap_content"
12
+        android:background="@color/colorPrimaryDark">
13
+        <include layout="@layout/title_bar_with_back_and_option" />
14
+    </RelativeLayout>
15
+
16
+    <WebView
17
+        android:id="@+id/webview_contract"
18
+        android:layout_width="match_parent"
19
+        android:layout_height="match_parent"
20
+        android:layout_below="@id/title_layout"/>
21
+
22
+    <com.android.views.progressbar.ProgressWheel
23
+        android:id="@+id/wheel_wait_http"
24
+        android:layout_width="80dp"
25
+        android:layout_height="80dp"
26
+        android:layout_centerInParent="true"
27
+        android:visibility="gone"
28
+        progress:textColor="@color/white"
29
+        progress:barColor="@color/colorPrimary"/>
30
+
31
+</RelativeLayout>

+ 51 - 0
app/src/main/res/layout/title_bar_with_back_and_option.xml

@@ -0,0 +1,51 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    android:id="@+id/title_bar_with_back_btn"
4
+    android:layout_width="match_parent"
5
+    android:layout_height="@dimen/action_bar_height"
6
+    android:orientation="horizontal"
7
+    android:background="@color/colorPrimary">
8
+
9
+    <LinearLayout
10
+        android:id="@+id/title_bar_back_layout"
11
+        android:layout_width="70dp"
12
+        android:layout_height="match_parent"
13
+        android:gravity="center_vertical"
14
+        android:orientation="horizontal"
15
+        android:paddingLeft="12dp">
16
+
17
+        <ImageView
18
+            android:layout_width="32dp"
19
+            android:layout_height="32dp"
20
+            android:src="@drawable/back_selector" />
21
+
22
+    </LinearLayout>
23
+
24
+    <TextView
25
+        android:id="@+id/title_bar_middle_txt"
26
+        android:layout_width="0dp"
27
+        android:layout_height="match_parent"
28
+        android:layout_weight="1"
29
+        android:singleLine="true"
30
+        android:gravity="center"
31
+        android:paddingLeft="10dp"
32
+        android:paddingRight="10dp"
33
+        android:textColor="@color/white"
34
+        android:textSize="@dimen/action_bar_title_large_text_size" />
35
+
36
+    <LinearLayout
37
+        android:id="@+id/title_bar_option_layout"
38
+        android:layout_width="70dp"
39
+        android:layout_height="match_parent"
40
+        android:gravity="center_vertical|right"
41
+        android:orientation="horizontal"
42
+        android:paddingRight="12dp">
43
+
44
+        <ImageView
45
+            android:layout_width="32dp"
46
+            android:layout_height="32dp"
47
+            android:src="@drawable/option" />
48
+
49
+    </LinearLayout>
50
+
51
+</LinearLayout>

+ 1 - 0
app/src/main/res/values/colors.xml

@@ -4,6 +4,7 @@
4 4
     <color name="colorPrimaryDark">#2E78E5</color>
5 5
     <color name="colorAccent">#0BBE06</color>
6 6
 
7
+    <color name="silver">#C0C0C0</color>
7 8
     <color name="light_blue">#1E90FF</color>
8 9
     <color name="white">#ffffffff</color>
9 10
     <color name="transparent">#00000000</color>

+ 16 - 3
app/src/main/res/values/strings.xml

@@ -1,6 +1,11 @@
1 1
 <resources>
2 2
     <string name="app_name">拍爱</string>
3 3
     <string name="bar_app_name">拍爱摄影师版</string>
4
+
5
+    <string name="version_text">拍爱 V1.0</string>
6
+    <string name="copyright">Copyright © 2016 </string>
7
+    <string name="company_name">北京佳艺徕经贸有限责任公司</string>
8
+
4 9
     <string name="bt_connected">已连接</string>
5 10
     <string name="bt_disconnected">已断开</string>
6 11
     <string name="briefs">简报</string>
@@ -118,13 +123,21 @@
118 123
     <string name="price_manage">价格管理</string>
119 124
 
120 125
     <string name="platform_price_rule">分成及结算规则</string>
121
-    
126
+
122 127
     <string name="feedback">意见反馈</string>
123
-    
128
+
124 129
     <string name="contact_us">联系我们</string>
125
-    
130
+
126 131
     <string name="about_us">关于我们</string>
127 132
 
128 133
     <string name="box_set_ip">BOX IP设置</string>
129 134
 
135
+    <string name="send">发送</string>
136
+    <string name="feedback_hint">您的建议是我们前进的动力</string>
137
+    <string name="thank_feedback">已发送,感谢您的宝贵意见</string>
138
+    <string name="check_update">检查更新</string>
139
+    <string name="contract">用户协议</string>
140
+
141
+    <string name="check_update_processing">正在检查更新</string>
142
+
130 143
 </resources>

依赖统一管理 · 43a26ef178 - Gogs: Go Git Service

依赖统一管理

chengzhenyu 8 年之前
父节点
当前提交
43a26ef178
共有 5 个文件被更改,包括 27 次插入17 次删除
  1. 5 5
      app/build.gradle
  2. 二进制
      app/src/main/res/drawable-xhdpi/icon_no_data.png
  3. 4 4
      common/build.gradle
  4. 11 1
      gradle.properties
  5. 7 7
      views/build.gradle

+ 5 - 5
app/build.gradle

@@ -1,8 +1,8 @@
1 1
 apply plugin: 'com.android.application'
2 2
 
3 3
 android {
4
-    compileSdkVersion 24
5
-    buildToolsVersion "25.0.2"
4
+    compileSdkVersion COMPILE_SDK_VERSION as int
5
+    buildToolsVersion BUILD_TOOLS_VERSION as String
6 6
 
7 7
     compileOptions {
8 8
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -11,8 +11,8 @@ android {
11 11
 
12 12
     defaultConfig {
13 13
         applicationId "ai.pai.client"
14
-        minSdkVersion 14
15
-        targetSdkVersion 22
14
+        minSdkVersion MIN_SDK_VERSION as int
15
+        targetSdkVersion TARGET_SDK_VERSION as int
16 16
         versionCode 1023
17 17
         versionName "1.0.23"
18 18
         buildConfigField "boolean","isDevMode","true"
@@ -74,7 +74,7 @@ android {
74 74
 dependencies {
75 75
     compile fileTree(include: ['*.jar'], dir: 'libs')
76 76
     compile project(path: ':common')
77
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
77
+    compile 'com.nostra13.universalimageloader:universal-image-loader:latest.integration'
78 78
     compile project(path: ':views')
79 79
     compile 'com.umeng.analytics:analytics:latest.integration'
80 80
 }

二进制
app/src/main/res/drawable-xhdpi/icon_no_data.png


+ 4 - 4
common/build.gradle

@@ -1,12 +1,12 @@
1 1
 apply plugin: 'com.android.library'
2 2
 
3 3
 android {
4
-    compileSdkVersion 24
5
-    buildToolsVersion "25.0.2"
4
+    compileSdkVersion COMPILE_SDK_VERSION as int
5
+    buildToolsVersion BUILD_TOOLS_VERSION as String
6 6
 
7 7
     defaultConfig {
8
-        minSdkVersion 14
9
-        targetSdkVersion 22
8
+        minSdkVersion MIN_SDK_VERSION as int
9
+        targetSdkVersion TARGET_SDK_VERSION as int
10 10
         versionCode 1
11 11
         versionName "1.0"
12 12
     }

+ 11 - 1
gradle.properties

@@ -15,4 +15,14 @@
15 15
 # When configured, Gradle will run in incubating parallel mode.
16 16
 # This option should only be used with decoupled projects. More details, visit
17 17
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18
-# org.gradle.parallel=true
18
+# org.gradle.parallel=true
19
+org.gradle.daemon=true
20
+org.gradle.jvmargs=-Xmx5120M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
21
+org.gradle.parallel=true
22
+android.useDeprecatedNdk=true
23
+org.gradle.configureondemand=true
24
+
25
+COMPILE_SDK_VERSION=24
26
+BUILD_TOOLS_VERSION=25.0.2
27
+MIN_SDK_VERSION=15
28
+TARGET_SDK_VERSION=21

+ 7 - 7
views/build.gradle

@@ -1,12 +1,12 @@
1 1
 apply plugin: 'com.android.library'
2 2
 
3 3
 android {
4
-    compileSdkVersion 24
5
-    buildToolsVersion "25.0.2"
4
+    compileSdkVersion COMPILE_SDK_VERSION as int
5
+    buildToolsVersion BUILD_TOOLS_VERSION as String
6 6
 
7 7
     defaultConfig {
8
-        minSdkVersion 14
9
-        targetSdkVersion 22
8
+        minSdkVersion MIN_SDK_VERSION as int
9
+        targetSdkVersion TARGET_SDK_VERSION as int
10 10
         versionCode 1
11 11
         versionName "1.0"
12 12
     }
@@ -14,7 +14,7 @@ android {
14 14
 
15 15
 dependencies {
16 16
     compile fileTree(include: ['*.jar'], dir: 'libs')
17
-    compile 'com.android.support:design:24.2.1'
18
-    compile 'com.android.support:support-v4:24.2.1'
19
-    compile 'com.android.support:recyclerview-v7:24.2.1'
17
+    compile 'com.android.support:design:latest.integration'
18
+    compile 'com.android.support:support-v4:latest.integration'
19
+    compile 'com.android.support:recyclerview-v7:latest.integration'
20 20
 }