Skip to content

android / dayu

Go to a project
Commit ccd93317 by mReturn
Options

register api

parents 70880c49 4731b434
Inline Side-by-side
Showing with 622 additions and 103 deletions
.idea/compiler.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
.idea/copyright/profiles_settings.xml deleted 100755 → 0
<component name="CopyrightManager">
<settings default="" />
</component>
\ No newline at end of file
.idea/gradle.xml
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" /> <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
......
.idea/kotlinc.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="sourceMapEmbedSources" />
<option name="sourceMapPrefix" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
...@@ -5,45 +5,34 @@ ...@@ -5,45 +5,34 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="4"> <list size="7">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
</list> </list>
</value> </value>
</option> </option>
<option name="myNotNulls"> <option name="myNotNulls">
<value> <value>
<list size="4"> <list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
</list> </list>
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
<option name="id" value="Android" /> <option name="id" value="Android" />
</component> </component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project> </project>
\ No newline at end of file
.idea/modules.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" /> <module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" /> <module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu.iml" filepath="$PROJECT_DIR$/dayu.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" /> <module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" /> <module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" />
......
.idea/statistic.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Statistic">
<option name="excludedDirectories">
<list>
<option value="$PROJECT_DIR$/../AMapLocationDemo" />
<option value="$PROJECT_DIR$/../android-app" />
<option value="$PROJECT_DIR$/../AndroidDemos-master" />
<option value="$PROJECT_DIR$/../BaseL" />
<option value="$PROJECT_DIR$/../baseMVP" />
<option value="$PROJECT_DIR$/../baseMVP2" />
<option value="$PROJECT_DIR$/../BaseRecyclerViewAdapterHelper-master 2" />
<option value="$PROJECT_DIR$/../easeui" />
<option value="$PROJECT_DIR$/../emclient-android" />
<option value="$PROJECT_DIR$/../Fragmentation-master" />
<option value="$PROJECT_DIR$/../JsBridge-master" />
<option value="$PROJECT_DIR$/../L-MVP" />
<option value="$PROJECT_DIR$/../L-MVP副本" />
<option value="$PROJECT_DIR$/../LfApplication" />
<option value="$PROJECT_DIR$/../LuofDemo" />
<option value="$PROJECT_DIR$/../Material" />
<option value="$PROJECT_DIR$/../Meizhi-master" />
<option value="$PROJECT_DIR$/../MyApplication" />
<option value="$PROJECT_DIR$/../MyApplication2" />
<option value="$PROJECT_DIR$/../retrofit-download-file-master" />
<option value="$PROJECT_DIR$/../robsteel(v5)" />
<option value="$PROJECT_DIR$/../RxAndroidDemo-master" />
<option value="$PROJECT_DIR$/../RxBus-master" />
<option value="$PROJECT_DIR$/../SeeWeather-master" />
<option value="$PROJECT_DIR$/../Studio" />
<option value="$PROJECT_DIR$/../T-MVP-master" />
<option value="$PROJECT_DIR$/../T-MVP-new" />
<option value="$PROJECT_DIR$/../toolbar" />
<option value="$PROJECT_DIR$/../toolbar1" />
<option value="$PROJECT_DIR$/../umen" />
<option value="$PROJECT_DIR$/../WeatherAndNote-master" />
</list>
</option>
</component>
</project>
\ No newline at end of file
app/app_key.jks 0 → 100644
File added
app/build.gradle
...@@ -31,7 +31,7 @@ android { ...@@ -31,7 +31,7 @@ android {
release { release {
keyAlias 'keybigfish' keyAlias 'keybigfish'
keyPassword '123456789' keyPassword '123456789'
storeFile file('../../app_key.jks') storeFile file('app_key.jks')
storePassword '123456789' storePassword '123456789'
} }
} }
...@@ -74,6 +74,7 @@ android { ...@@ -74,6 +74,7 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
checkReleaseBuilds false
} }
dexOptions { dexOptions {
preDexLibraries = false preDexLibraries = false
......
app/build_help.txt 0 → 100644
windows系统下可能会报 Databinding错误
解决方法： 配置环境变量：变量名为: JAVA_TOOL_OPTIONS 变量值为：-Dfile.encoding=UTF-8
参考 https://blog.csdn.net/suzhanfeng/article/details/77715129
\ No newline at end of file
baseSDK/src/main/java/com/dayu/base/ui/presenter/SImplePresenter.java 0 → 100644
package com.dayu.base.ui.presenter;
import android.view.View;
/**
* Created by mReturn
* on 2019/12/21
**/
public class SImplePresenter extends BasePresenter<View> {
@Override
public void onAttached() {
}
}
baseSDK/src/main/java/com/dayu/utils/PictrueUtils.java
package com.dayu.utils; package com.dayu.utils;
import android.app.Activity;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.os.Environment;
import com.luck.picture.lib.PictureSelectionModel;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.umeng.analytics.MobclickAgent;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
...@@ -107,4 +115,37 @@ public class PictrueUtils { ...@@ -107,4 +115,37 @@ public class PictrueUtils {
} }
return inSampleSize; return inSampleSize;
} }
public static void showPicDialog(Activity activity,int maxImgCout) {
PictureSelectionModel selector = PictureSelector.create(activity)
.openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.maxSelectNum(maxImgCout)// 最大图片选择数量 int
.imageSpanCount(4)// 每行显示个数 int
.selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
.previewImage(true)// 是否可预览图片 true or false
.isCamera(true)// 是否显示拍照按钮 true or false
.isZoomAnim(true)// 图片列表点击 缩放效果 默认true
.sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
.setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
.compress(true)// 是否压缩 true or false
.glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
.hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
.compressSavePath(getPath())//压缩图片保存地址
.previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
.minimumCompressSize(100)// 小于100kb的图片不压缩
.synOrAsy(true)//同步true或异步false 压缩 默认同步、
.enableCrop(true)//是否裁剪
.withAspectRatio(1, 1)
.freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
private static String getPath() {
String path = Environment.getExternalStorageDirectory() + "/dayu/image/";
File file = new File(path);
if (file.mkdirs()) {
return path;
}
return path;
}
} }
baseSDK/src/main/res/drawable/bg_gray_react.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#bbbbbb"
/>
<corners android:radius="4dp"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/drawable/bg_red_react.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="@color/common_red"
/>
<corners android:radius="4dp"/>
<solid android:color="#dddddd"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/drawable/tab_gray_react.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="#e2e2e2"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/values/colors.xml
...@@ -39,4 +39,8 @@ ...@@ -39,4 +39,8 @@
<color name="view_color">#E6E6E6 </color> <color name="view_color">#E6E6E6 </color>
<color name="blue_register">#FF0e15fb</color>
</resources> </resources>
baseSDK/src/main/res/values/strings.xml
...@@ -744,5 +744,18 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -744,5 +744,18 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="skip">跳过</string> <string name="skip">跳过</string>
<string name="turn_on_flashlight">打开闪光灯</string> <string name="turn_on_flashlight">打开闪光灯</string>
<string name="turn_off_flashlight">关闭闪光灯</string> <string name="turn_off_flashlight">关闭闪光灯</string>
<!-- new -->
<string name="register_account">注册账号</string>
<string name="click_add_avatar">点击上传头像图片</string>
<string name="pls_input_name">请输入姓名</string>
<string name="pls_input_phone">请输入手机号</string>
<string name="pls_input_pwd">请输入8-18位(数字+字母)密码</string>
<string name="pls_confirm_pwd">请确认8-18位(数字+字母)密码</string>
<string name="str_name">姓名</string>
<string name="str_phone">手机号</string>
<string name="str_pwd">登录密码</string>
<string name="str_confirm_pwd">确认密码</string>
</resources> </resources>
gradle.properties
...@@ -10,4 +10,5 @@ isManagerModule=true ...@@ -10,4 +10,5 @@ isManagerModule=true
##maven依赖 ##maven依赖
mavenMode=false mavenMode=false
BASE_URL=http://47.94.101.239:3112 BASE_URL=http://47.94.101.239:3112
Android.useDeprecatedNdk=true Android.useDeprecatedNdk=true
\ No newline at end of file
gradle/wrapper/gradle-wrapper.properties
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
userCenter/src/main/java/com/dayu/usercenter/data/protocol/RegisterData.java 0 → 100644
package com.dayu.usercenter.data.protocol;
/**
* Created by mReturn
* on 2019\12\26 0026.
*/
public class RegisterData {
}
userCenter/src/main/java/com/dayu/usercenter/event/RegisterSuccessEvent.java 0 → 100644
package com.dayu.usercenter.event;
/**
* Created by mReturn
* on 2019\12\26 0026.
*/
public class RegisterSuccessEvent {
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity/PwLoginActivity.java
...@@ -64,6 +64,10 @@ public class PwLoginActivity extends BaseActivity<PwLoginPresenter, ActivityPwlo ...@@ -64,6 +64,10 @@ public class PwLoginActivity extends BaseActivity<PwLoginPresenter, ActivityPwlo
} }
}); });
mBind.next.setEnabled(false); mBind.next.setEnabled(false);
mBind.tvRegister.setOnClickListener(view -> {
startActivity(new Intent(mActivity,RegisterActivity.class));
});
} }
public void isMatch(String phone, String pwd) { public void isMatch(String phone, String pwd) {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/RegisterActivity.java 0 → 100644
package com.dayu.usercenter.ui.activity;
import android.content.Intent;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.BaseApplication;
import com.dayu.common.MyTextWatcher;
import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityRegisterBinding;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.PictrueUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UtilsUserAccountMatcher;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
import java.io.File;
import java.util.List;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/**
* Created by mReturn
* on 2019/12/21
**/
public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegisterBinding> implements View.OnClickListener {
private boolean isNameValid;
private boolean isPhoneValid;
private boolean isPwdValid;
private boolean isPwd2Valid;
private String avatarPath;
@Override
public int getLayoutId() {
return R.layout.activity_register;
}
@Override
public void setPresenter() {
}
@Override
public void initView() {
updateSubmitSatte();
mBind.edtName.addTextChangedListener(new MyTextWatcher() {
@Override
public void afterTextChanged(Editable s) {
isNameValid = !TextUtils.isEmpty(s.toString());
mBind.tvNameWarn.setVisibility(isNameValid ? View.INVISIBLE : View.VISIBLE);
updateSubmitSatte();
}
});
mBind.edtPhone.addTextChangedListener(new MyTextWatcher() {
@Override
public void afterTextChanged(Editable s) {
isPhoneValid = !TextUtils.isEmpty(s.toString()) && UtilsUserAccountMatcher.isPhoneNum(s.toString());
mBind.tvPhoneWarn.setVisibility(isPhoneValid ? View.INVISIBLE : View.VISIBLE);
updateSubmitSatte();
}
});
mBind.edtPwd.addTextChangedListener(new MyTextWatcher() {
@Override
public void afterTextChanged(Editable s) {
isPwdValid = !TextUtils.isEmpty(s.toString()) && UtilsUserAccountMatcher.isPassword(s.toString());
mBind.tvPwdWarn.setVisibility(isPwdValid ? View.INVISIBLE : View.VISIBLE);
updateSubmitSatte();
}
});
mBind.edtPwd2.addTextChangedListener(new MyTextWatcher() {
@Override
public void afterTextChanged(Editable s) {
isPwd2Valid = !TextUtils.isEmpty(s.toString())
&& UtilsUserAccountMatcher.isPassword(s.toString())
&& s.toString().equals(mBind.edtPwd.getText().toString());
mBind.tvPwd2Warn.setVisibility(isPwd2Valid ? View.INVISIBLE : View.VISIBLE);
updateSubmitSatte();
}
});
}
private void updateSubmitSatte() {
boolean canSubmit = isNameValid && isPhoneValid && isPwdValid && isPwd2Valid;
mBind.btnSubmit.setEnabled(canSubmit);
mBind.btnSubmit.setAlpha(canSubmit ? 1.0f : 0.35f);
}
@Override
public void onClick(View view) {
int vid = view.getId();
if (vid == R.id.ll_avatar) {
PictrueUtils.showPicDialog(this, 1);
MobclickAgent.onEvent(BaseApplication.getContext(), "check_header_pic_register");
} else if (vid == R.id.btn_cancel || vid == R.id.title_back) {
finish();
} else if (vid == R.id.btn_submit) {
ToastUtils.showShortToast("submit");
}
}
public void uploadAvatar() {
File file = new File(avatarPath);
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part body = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
BaseApiFactory.uploadPhoto(body).subscribe(mPresenter.baseObserver(list -> {
if (list != null && list.size() > 0) {
} else {
ToastUtils.showShortToast(R.string.modify_header_failed);
}
}));
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
if (mSelectList != null) {
avatarPath = mSelectList.get(0).getCutPath();
GlideImageLoader.loadDrawable(this, avatarPath, mBind.civAvatar);
}
break;
}
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
...@@ -86,5 +86,9 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin ...@@ -86,5 +86,9 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent, bundle); startActivity(intent, bundle);
}); });
mBind.tvRegister.setOnClickListener(view -> {
startActivity(new Intent(mActivity,RegisterActivity.class));
});
} }
} }
userCenter/src/main/release/AndroidManifest.xml
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
android:name=".ui.activity.PwLoginActivity" android:name=".ui.activity.PwLoginActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.RegisterActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.CertificationResultActivity" android:name=".ui.activity.CertificationResultActivity"
android:screenOrientation="portrait" /> <activity android:screenOrientation="portrait" /> <activity
android:name=".ui.activity.CommeWebViewActivity" android:name=".ui.activity.CommeWebViewActivity"
......
userCenter/src/main/res/layout/activity_pwlogin_layout.xml
...@@ -131,6 +131,18 @@ ...@@ -131,6 +131,18 @@
android:text="@string/forget_pwd" android:text="@string/forget_pwd"
android:textColor="@color/bg_button" android:textColor="@color/bg_button"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:text="@string/register_account"
android:layout_toRightOf="@+id/forget_pwd"
android:layout_alignBaseline="@+id/forget_pwd"
android:layout_marginLeft="35dp"
android:textColor="@color/blue_register" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
userCenter/src/main/res/layout/activity_register.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical"
android:visibility="visible">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@string/register_account" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
android:onClick="onClick" />
<ImageView
style="@style/card_line"
android:layout_alignParentBottom="true" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="50dp">
<LinearLayout
android:id="@+id/ll_avatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="40dp"
android:onClick="onClick"
android:orientation="horizontal">
<com.dayu.widgets.CircleImageView
android:id="@+id/civ_avatar"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@drawable/user"
/>
<TextView
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/click_add_avatar"
android:textColor="@color/bg_button" />
</LinearLayout>
<!-- name -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="80dp"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="*"
android:textColor="@color/common_red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/str_name"
android:textColor="@color/black" />
</LinearLayout>
<EditText
android:id="@+id/edt_name"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="15dp"
android:background="@drawable/bg_gray_react"
android:hint="@string/pls_input_name"
android:maxLength="13"
android:maxLines="1"
android:paddingLeft="10dp"
android:textSize="13sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_name_warn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="95dp"
android:text="@string/pls_input_name"
android:textColor="@color/common_red"
android:textSize="12sp" />
<!-- phone -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="80dp"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="*"
android:textColor="@color/common_red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/str_phone"
android:textColor="@color/black" />
</LinearLayout>
<EditText
android:id="@+id/edt_phone"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="15dp"
android:background="@drawable/bg_gray_react"
android:hint="@string/pls_input_phone"
android:inputType="phone"
android:maxLength="18"
android:maxLines="1"
android:paddingLeft="10dp"
android:textSize="13sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_phone_warn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="95dp"
android:text="@string/pls_input_phone"
android:textColor="@color/common_red"
android:textSize="12sp" />
<!-- pwd -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="80dp"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="*"
android:textColor="@color/common_red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/str_pwd"
android:textColor="@color/black" />
</LinearLayout>
<EditText
android:id="@+id/edt_pwd"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="15dp"
android:background="@drawable/bg_gray_react"
android:hint="@string/pls_input_pwd"
android:inputType="textPassword"
android:maxLength="18"
android:maxLines="1"
android:paddingLeft="10dp"
android:textSize="13sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_pwd_warn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="95dp"
android:text="@string/pls_input_pwd"
android:textColor="@color/common_red"
android:textSize="12sp" />
<!-- confirm pwd -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="80dp"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="*"
android:textColor="@color/common_red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/str_confirm_pwd"
android:textColor="@color/black" />
</LinearLayout>
<EditText
android:id="@+id/edt_pwd2"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="15dp"
android:background="@drawable/bg_gray_react"
android:hint="@string/pls_confirm_pwd"
android:maxLength="18"
android:maxLines="1"
android:paddingLeft="10dp"
android:inputType="textPassword"
android:textSize="13sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_pwd2_warn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="95dp"
android:text="@string/pls_confirm_pwd"
android:textColor="@color/common_red"
android:textSize="12sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="50dp"
android:orientation="horizontal">
<Button
android:id="@+id/btn_cancel"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="35dp"
android:layout_marginLeft="30dp"
android:background="@drawable/tab_gray_react"
android:onClick="onClick"
android:text="@string/cancle"
android:textColor="#8b8b8b" />
<Button
android:id="@+id/btn_submit"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="35dp"
android:layout_marginLeft="30dp"
android:background="@drawable/tab_blue_react"
android:onClick="onClick"
android:text="@string/submit"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
userCenter/src/main/res/layout/activity_sms_login.xml
...@@ -83,6 +83,17 @@ ...@@ -83,6 +83,17 @@
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:text="@string/use_account_login" android:text="@string/use_account_login"
android:textColor="@color/bg_button" /> android:textColor="@color/bg_button" />
<TextView
android:id="@+id/tv_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/next"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:text="@string/register_account"
android:layout_toRightOf="@id/use_account"
android:layout_marginLeft="25dp"
android:textColor="@color/blue_register" />
<LinearLayout <LinearLayout
android:id="@+id/ll_agreement" android:id="@+id/ll_agreement"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment