Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
90660f7d
提交
90660f7d
authored
2月 27, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.注册登录界面
上级
c54b16f1
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
204 行增加
和
86 行删除
+204
-86
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+28
-1
RegisterFirstActivity.java
...ava/com/wd/workoffice/ui/login/RegisterFirstActivity.java
+1
-5
UserRegisterOneActivity.java
...a/com/wd/workoffice/ui/login/UserRegisterOneActivity.java
+50
-24
UserRegisterThreeActivity.java
...com/wd/workoffice/ui/login/UserRegisterThreeActivity.java
+53
-25
UserRegisterTwoActivity.java
...a/com/wd/workoffice/ui/login/UserRegisterTwoActivity.java
+47
-22
activity_erp_activation_two.xml
app/src/main/res/layout/activity_erp_activation_two.xml
+25
-9
activity_user_register_one.xml
app/src/main/res/layout/activity_user_register_one.xml
+0
-0
activity_user_register_three.xml
app/src/main/res/layout/activity_user_register_three.xml
+0
-0
activity_user_register_two.xml
app/src/main/res/layout/activity_user_register_two.xml
+0
-0
arrow_left.png
app/src/main/res/mipmap-xhdpi/arrow_left.png
+0
-0
arrow_right.png
app/src/main/res/mipmap-xhdpi/arrow_right.png
+0
-0
btn_main_bg.png
app/src/main/res/mipmap-xhdpi/btn_main_bg.png
+0
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
90660f7d
...
...
@@ -10,7 +10,8 @@
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:theme=
"@style/FlexibleTheme.Base"
>
<activity
android:name=
".ui.login.LoginActivity"
<activity
android:name=
".ui.login.LoginActivity"
android:configChanges=
"keyboardHidden|orientation"
android:launchMode=
"singleTask"
android:theme=
"@style/Work.Base"
...
...
@@ -45,6 +46,32 @@
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.login.UserRegisterOneActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
" "
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.login.UserRegisterTwoActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
" "
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.login.UserRegisterThreeActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"完善资料"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<provider
android:name=
"androidx.core.content.FileProvider"
android:authorities=
"com.wd.workoffice.fileprovider"
...
...
app/src/main/java/com/wd/workoffice/ui/login/RegisterFirstActivity.java
浏览文件 @
90660f7d
...
...
@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.login;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.wd.workoffice.R
;
...
...
@@ -24,10 +23,6 @@ public class RegisterFirstActivity extends WorkToolBarActivity {
Button
btnErp
;
@BindView
(
R
.
id
.
tv_go_login
)
TextView
tvGoLogin
;
private
TextView
mRegisterclick
;
private
Button
mRegisterNewUser
;
private
Button
mErtUser
;
private
RelativeLayout
mChaDiao
;
@Override
protected
void
initView
()
{
...
...
@@ -54,6 +49,7 @@ public class RegisterFirstActivity extends WorkToolBarActivity {
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
btn_new_user
:
startActivity
(
UserRegisterOneActivity
.
class
);
break
;
case
R
.
id
.
btn_erp
:
startActivity
(
ErpActivationOneActivity
.
class
);
...
...
app/src/main/java/com/wd/workoffice/ui/login/UserRegisterOneActivity.java
浏览文件 @
90660f7d
...
...
@@ -4,38 +4,64 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
/*
* 注册bat
* */
public
class
UserRegisterOneActivity
extends
AppCompat
Activity
{
* 注册bat
* */
public
class
UserRegisterOneActivity
extends
WorkToolBar
Activity
{
private
Button
mRegister
;
private
RelativeLayout
mBeanck
;
@BindView
(
R
.
id
.
et_phone
)
EditText
etPhone
;
@BindView
(
R
.
id
.
et_code
)
EditText
etCode
;
@BindView
(
R
.
id
.
tv_code
)
TextView
tvCode
;
@BindView
(
R
.
id
.
btn_register
)
Button
btnRegister
;
@BindView
(
R
.
id
.
tv_go_protocol
)
TextView
tvGoProtocol
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
}
@Override
protected
void
initData
()
{
}
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_user_register_one
);
mRegister
=
(
Button
)
findViewById
(
R
.
id
.
login_Next_register
);
//注册
mBeanck
=
(
RelativeLayout
)
findViewById
(
R
.
id
.
cuangku_im_bank_register
);
//返回
//注册
mRegister
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
startActivity
(
new
Intent
(
UserRegisterOneActivity
.
this
,
UserRegisterTwoActivity
.
class
));
}
});
mBeanck
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
finish
();
}
});
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_user_register_one
;
}
@OnClick
({
R
.
id
.
tv_code
,
R
.
id
.
btn_register
,
R
.
id
.
tv_go_protocol
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
tv_code
:
break
;
case
R
.
id
.
btn_register
:
startActivity
(
UserRegisterTwoActivity
.
class
);
break
;
case
R
.
id
.
tv_go_protocol
:
break
;
}
}
}
app/src/main/java/com/wd/workoffice/ui/login/UserRegisterThreeActivity.java
浏览文件 @
90660f7d
...
...
@@ -4,39 +4,67 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.
ui.activity.Main
Activity
;
import
com.wd.workoffice.
app.WorkToolBar
Activity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
/*
* 完善信息
* */
public
class
UserRegisterThreeActivity
extends
AppCompat
Activity
{
* 完善信息
* */
public
class
UserRegisterThreeActivity
extends
WorkToolBar
Activity
{
private
Button
mSubmissionLogin
;
private
RelativeLayout
mBeank
;
@BindView
(
R
.
id
.
et_code
)
EditText
etCode
;
@BindView
(
R
.
id
.
et_name
)
EditText
etName
;
@BindView
(
R
.
id
.
tv_phone
)
TextView
tvPhone
;
@BindView
(
R
.
id
.
tv_product_content
)
TextView
tvProductContent
;
@BindView
(
R
.
id
.
ll_product
)
LinearLayout
llProduct
;
@BindView
(
R
.
id
.
et_email
)
EditText
etEmail
;
@BindView
(
R
.
id
.
btn_submit
)
Button
btnSubmit
;
@Override
protected
void
initView
()
{
}
@Override
protected
void
initData
()
{
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_user_register_three
);
mSubmissionLogin
=
(
Button
)
findViewById
(
R
.
id
.
Submission_login
);
mBeank
=
(
RelativeLayout
)
findViewById
(
R
.
id
.
beank
);
//返回
//跳转登录
mSubmissionLogin
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
startActivity
(
new
Intent
(
UserRegisterThreeActivity
.
this
,
MainActivity
.
class
));
}
});
mBeank
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
finish
();
}
});
protected
int
layoutId
()
{
return
R
.
layout
.
activity_user_register_three
;
}
@OnClick
({
R
.
id
.
ll_product
,
R
.
id
.
btn_submit
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_product
:
break
;
case
R
.
id
.
btn_submit
:
break
;
}
}
}
app/src/main/java/com/wd/workoffice/ui/login/UserRegisterTwoActivity.java
浏览文件 @
90660f7d
...
...
@@ -4,38 +4,63 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
/*
* 账号密码确认密码
* */
public
class
UserRegisterTwoActivity
extends
AppCompat
Activity
{
* 账号密码确认密码
* */
public
class
UserRegisterTwoActivity
extends
WorkToolBar
Activity
{
@BindView
(
R
.
id
.
et_name
)
EditText
etName
;
@BindView
(
R
.
id
.
et_pwd
)
EditText
etPwd
;
@BindView
(
R
.
id
.
et_confirm_pwd
)
EditText
etConfirmPwd
;
@BindView
(
R
.
id
.
btn_next
)
Button
btnNext
;
@BindView
(
R
.
id
.
tv_go_protocol
)
TextView
tvGoProtocol
;
private
Button
mNextStep
;
private
RelativeLayout
mSheZhiPassword
;
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_register__account__password
);
mNextStep
=
(
Button
)
findViewById
(
R
.
id
.
password_and_Next_step2_bnt
);
//《设置密码确认按钮下一步》
mSheZhiPassword
=
(
RelativeLayout
)
findViewById
(
R
.
id
.
cuangku_im_bank_shezhi
);
//设置密码
//下一步
mNextStep
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
startActivity
(
new
Intent
(
UserRegisterTwoActivity
.
this
,
UserRegisterThreeActivity
.
class
));
}
});
mSheZhiPassword
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
finish
();
}
});
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
}
@Override
protected
void
initData
()
{
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_user_register_two
;
}
@OnClick
({
R
.
id
.
btn_next
,
R
.
id
.
tv_go_protocol
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
btn_next
:
startActivity
(
UserRegisterThreeActivity
.
class
);
break
;
case
R
.
id
.
tv_go_protocol
:
break
;
}
}
}
app/src/main/res/layout/activity_erp_activation_two.xml
浏览文件 @
90660f7d
...
...
@@ -125,15 +125,30 @@
android:textSize=
"20sp"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"bottom"
android:layout_gravity=
"center_horizontal|bottom"
android:layout_marginBottom=
"30mm"
android:text=
"注册即代表同意《正望BAT协议》"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"13sp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_marginTop=
"20mm"
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"注册即代表同意"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_go_protocol"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"《正望BAT协议》"
android:textColor=
"#1766DF"
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_user_register_one.xml
浏览文件 @
90660f7d
差异被折叠。
点击展开。
app/src/main/res/layout/activity_user_register_three.xml
浏览文件 @
90660f7d
差异被折叠。
点击展开。
app/src/main/res/layout/activity_user_register_two.xml
浏览文件 @
90660f7d
差异被折叠。
点击展开。
app/src/main/res/mipmap-xhdpi/arrow_left.png
0 → 100644
浏览文件 @
90660f7d
971 Bytes
app/src/main/res/mipmap-xhdpi/arrow_right.png
0 → 100644
浏览文件 @
90660f7d
533 Bytes
app/src/main/res/mipmap-
m
dpi/btn_main_bg.png
→
app/src/main/res/mipmap-
xh
dpi/btn_main_bg.png
浏览文件 @
90660f7d
File moved
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论