设备热点连接和恢复出厂设置更新

This commit is contained in:
Long-PC\Long
2018-09-02 17:49:16 +08:00
parent 6125959f1e
commit 472ea2df38
1596 changed files with 106100 additions and 68749 deletions
@@ -419,7 +419,7 @@
<string name="umeng_comm_loading">加载中</string>
<string name="umeng_comm_login">登录</string>
<string name="umeng_comm_login_empty">请输入您的账号</string>
<string name="umeng_comm_login_failed">登录失败,请重试…</string>
<string name="umeng_comm_login_failed"/>
<string name="umeng_comm_login_failed_register">当前网络忙,请稍后重试</string>
<string name="umeng_comm_login_illpassword">密码须为6~18位字母或数字</string>
<string name="umeng_comm_login_illuid">此邮箱无效,请正确输入邮箱</string>
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\ifish\umeng_community_library\assets"/><source path="C:\ifish\umeng_community_library\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\ifish\umeng_community_library\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\umeng_community_library\assets"/><source path="C:\beifen\ifish\ifish\umeng_community_library\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\debug\assets"/></dataSet></merger>
@@ -419,7 +419,7 @@
<string name="umeng_comm_loading">加载中</string>
<string name="umeng_comm_login">登录</string>
<string name="umeng_comm_login_empty">请输入您的账号</string>
<string name="umeng_comm_login_failed">登录失败,请重试…</string>
<string name="umeng_comm_login_failed"/>
<string name="umeng_comm_login_failed_register">当前网络忙,请稍后重试</string>
<string name="umeng_comm_login_illpassword">密码须为6~18位字母或数字</string>
<string name="umeng_comm_login_illuid">此邮箱无效,请正确输入邮箱</string>
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\ifish\umeng_community_library\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\ifish\umeng_community_library\src\debug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\debug\shaders"/></dataSet></merger>
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\ifish\umeng_community_library\assets"/><source path="C:\ifish\umeng_community_library\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\ifish\umeng_community_library\src\release\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\umeng_community_library\assets"/><source path="C:\beifen\ifish\ifish\umeng_community_library\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\release\assets"/></dataSet></merger>
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\ifish\umeng_community_library\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\ifish\umeng_community_library\src\release\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\umeng_community_library\src\release\shaders"/></dataSet></merger>
@@ -414,7 +414,7 @@
<string name="umeng_comm_loading">加载中</string>
<string name="umeng_comm_login">登录</string>
<string name="umeng_comm_login_empty">请输入您的账号</string>
<string name="umeng_comm_login_failed">登录失败,请重试…</string>
<string name="umeng_comm_login_failed"/>
<string name="umeng_comm_login_failed_register">当前网络忙,请稍后重试</string>
<string name="umeng_comm_login_illpassword">密码须为6~18位字母或数字</string>
<string name="umeng_comm_login_illuid">此邮箱无效,请正确输入邮箱</string>
File diff suppressed because one or more lines are too long
@@ -414,7 +414,7 @@
<string name="umeng_comm_loading">加载中</string>
<string name="umeng_comm_login">登录</string>
<string name="umeng_comm_login_empty">请输入您的账号</string>
<string name="umeng_comm_login_failed">登录失败,请重试…</string>
<string name="umeng_comm_login_failed"/>
<string name="umeng_comm_login_failed_register">当前网络忙,请稍后重试</string>
<string name="umeng_comm_login_illpassword">密码须为6~18位字母或数字</string>
<string name="umeng_comm_login_illuid">此邮箱无效,请正确输入邮箱</string>
File diff suppressed because one or more lines are too long