From 46f08fce3fe6eff39180a23b27fbd349c004ba6f Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Fri, 29 Jun 2018 17:30:25 +0800
Subject: [PATCH] 提交
---
app/src/main/res/mipmap-xxxhdpi/bg.png | 0
app/src/main/res/mipmap-xxxhdpi/button1.png | 0
app/src/main/res/layout/base_list_layout.xml | 2
app/src/main/AndroidManifest.xml | 2
app/src/main/java/com/moral/screen/base/BaseActivity.java | 2
app/src/main/res/mipmap-xxxhdpi/button2.png | 0
app/src/main/java/com/moral/screen/MainActivity.java | 1
app/src/main/res/values/colors.xml | 2
.idea/vcs.xml | 6 ++
app/src/main/res/layout/ac_login_layout.xml | 63 +++++++++++++++++++++
.idea/modules.xml | 10 +++
app/src/main/res/mipmap-xxxhdpi/login_top.png | 0
build.gradle | 1
andbrickslib/build.gradle | 2
app/src/main/java/com/moral/screen/activity/LoginActivity.java | 48 ++++++++++++++++
app/build.gradle | 6 +
16 files changed, 136 insertions(+), 9 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..2501eca
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/andbrickslib/andbrickslib.iml" filepath="$PROJECT_DIR$/andbrickslib/andbrickslib.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/screen_android.iml" filepath="$PROJECT_DIR$/screen_android.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/andbrickslib/build.gradle b/andbrickslib/build.gradle
index 299e495..599ee90 100644
--- a/andbrickslib/build.gradle
+++ b/andbrickslib/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 25
+ compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
diff --git a/app/build.gradle b/app/build.gradle
index b06e97a..a6cf203 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
+ compileSdkVersion 26
defaultConfig {
applicationId "com.moral.screen"
minSdkVersion 15
@@ -32,6 +32,8 @@
compile 'com.lzy.net:okgo:2.1.4'
compile 'com.lzy.net:okserver:1.1.3'
compile 'org.greenrobot:eventbus:3.0.0'
- compile 'com.jaeger.statusbarutil:library:1.4.0'
compile project(':andbrickslib')
+ compile('com.github.niorgai:StatusBarCompat:2.1.4', {
+ exclude group: 'com.android.support'
+ })
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 19c5045..f7ac9c1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
android:supportsRtl="true"
tools:replace="android:icon"
android:theme="@style/AppTheme">
- <activity android:name=".MainActivity">
+ <activity android:name=".activity.LoginActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/moral/screen/MainActivity.java b/app/src/main/java/com/moral/screen/MainActivity.java
index 9ccd7c8..f04eee8 100644
--- a/app/src/main/java/com/moral/screen/MainActivity.java
+++ b/app/src/main/java/com/moral/screen/MainActivity.java
@@ -4,7 +4,6 @@
import android.os.Bundle;
public class MainActivity extends AppCompatActivity {
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/moral/screen/activity/LoginActivity.java b/app/src/main/java/com/moral/screen/activity/LoginActivity.java
new file mode 100644
index 0000000..744600e
--- /dev/null
+++ b/app/src/main/java/com/moral/screen/activity/LoginActivity.java
@@ -0,0 +1,48 @@
+package com.moral.screen.activity;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.moral.screen.R;
+import com.moral.screen.base.BaseActivity;
+
+/**
+ * ������������
+ * Created by hjzhang on 2018/6/29.
+ */
+
+public class LoginActivity extends BaseActivity {
+ @Override
+ protected void getBundleExtras(Bundle extras) {
+
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.ac_login_layout;
+ }
+
+ @Override
+ protected void initViews() {
+ }
+
+ @Override
+ protected void initListener() {
+
+ }
+
+ @Override
+ protected void initData() {
+
+ }
+
+ @Override
+ protected void processClick(View view) {
+
+ }
+
+ @Override
+ protected void onErrorPageClick() {
+
+ }
+}
diff --git a/app/src/main/java/com/moral/screen/base/BaseActivity.java b/app/src/main/java/com/moral/screen/base/BaseActivity.java
index 4282f73..40ed4bc 100644
--- a/app/src/main/java/com/moral/screen/base/BaseActivity.java
+++ b/app/src/main/java/com/moral/screen/base/BaseActivity.java
@@ -9,7 +9,6 @@
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
-import com.jaeger.library.StatusBarUtil;
import com.moral.andbrickslib.utils.ActivityManager;
import com.moral.andbrickslib.utils.ToastUtils;
import com.moral.andbrickslib.utils.dialog.SweetDialogUtils;
@@ -62,7 +61,6 @@
initViews();
initData();
initListener();
- StatusBarUtil.setColor(BaseActivity.this, getResources().getColor(R.color.white), 0);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
diff --git a/app/src/main/res/layout/ac_login_layout.xml b/app/src/main/res/layout/ac_login_layout.xml
new file mode 100644
index 0000000..242e533
--- /dev/null
+++ b/app/src/main/res/layout/ac_login_layout.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:fitsSystemWindows="true"
+ android:background="@mipmap/bg">
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x180"
+ android:layout_marginLeft="@dimen/x20"
+ android:layout_marginRight="@dimen/x20"
+ android:scaleType="fitCenter"
+ android:layout_marginTop="@dimen/x30"
+ android:src="@mipmap/login_top"/>
+ <EditText
+ android:id="@+id/et_phone"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x36"
+ android:layout_marginRight="@dimen/x36"
+ android:inputType="number"
+ android:textSize="16sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/white"
+ android:hint="������������������������"
+ android:gravity="center"
+ android:background="@mipmap/button1"/>
+ <EditText
+ android:id="@+id/et_pwd"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x36"
+ android:layout_marginRight="@dimen/x36"
+ android:layout_marginTop="@dimen/x30"
+ android:inputType="textPassword"
+ android:textSize="16sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/white"
+ android:hint="���������������������"
+ android:gravity="center"
+ android:background="@mipmap/button1"/>
+ <Button
+ android:id="@+id/bt_sure"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x36"
+ android:layout_marginRight="@dimen/x36"
+ android:layout_marginTop="@dimen/x30"
+ android:textSize="16sp"
+ android:textColor="@color/white"
+ android:text="������"
+ android:gravity="center"
+ android:background="@mipmap/button2"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:textColor="@color/blue_txt"
+ android:text="������������"
+ android:gravity="center"
+ android:layout_marginTop="@dimen/x60"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/base_list_layout.xml b/app/src/main/res/layout/base_list_layout.xml
index 7ab5bb3..160c7c0 100644
--- a/app/src/main/res/layout/base_list_layout.xml
+++ b/app/src/main/res/layout/base_list_layout.xml
@@ -5,7 +5,7 @@
android:fitsSystemWindows="true"
android:background="@color/ac_bg"
android:orientation="vertical">
- <include layout="@layout/top_bar_layout_txt" />
+ <include layout="@layout/top_bar_layout" />
<LinearLayout
android:id="@+id/ll_top_content"
android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/bg.png b/app/src/main/res/mipmap-xxxhdpi/bg.png
new file mode 100644
index 0000000..6c808cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/bg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/button1.png b/app/src/main/res/mipmap-xxxhdpi/button1.png
new file mode 100644
index 0000000..dcc075f
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/button1.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/button2.png b/app/src/main/res/mipmap-xxxhdpi/button2.png
new file mode 100644
index 0000000..d1bc8e2
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/button2.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/login_top.png b/app/src/main/res/mipmap-xxxhdpi/login_top.png
new file mode 100644
index 0000000..2dc8ace
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/login_top.png
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8555d87..3c336cd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,7 +14,7 @@
<color name="ac_bg">#f0f0f0</color>
<color name="trans_white">#CCffffff</color>
<color name="trans">#00ffffff</color>
- <color name="red_txt">#FE4E00</color>
+ <color name="blue_txt">#009dff</color>
<color name="circle_blue">#3A6CFF</color>
<color name="light_blue">#24A8E8</color>
<color name="circle_red">#FE7A30</color>
diff --git a/build.gradle b/build.gradle
index 41abcce..df416f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@
repositories {
google()
jcenter()
+ maven { url "https://jitpack.io" }
}
}
--
Gitblit v1.8.0