Skip to content

Commit

Permalink
Merge branch 'feature/unknown' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sollyu committed Dec 29, 2017
2 parents 2e24bec + 014d152 commit 86be223
Show file tree
Hide file tree
Showing 15 changed files with 298 additions and 12 deletions.
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
<activity android:name=".activitys.ActivityAbout" />
<activity android:name=".activitys.ActivityWeb" />
<activity android:name=".activitys.ActivityScanQR" />
<activity android:name=".activitys.ActivityLog"/>
<activity android:name=".activitys.ActivityLog" />
<activity android:name=".activitys.ActivityRegister"/>
<activity
android:name=".activitys.ActivityDetail"
android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ class ActivityDetail : ActivityBase() {
when (item.itemId) {
R.id.menuDeleteConfig -> { this.onItemClickDeleteConfig() }
R.id.menuUploadConfig -> { this.onItemClickUploadConfig() }
R.id.menuScanQRCode -> { this.onItemClickScanQRCode() }
R.id.menuSolutionSave -> { this.onItemClickSolutionSave() }
R.id.menuSolutionLoad -> { this.onItemClickSolutionLoad() }
R.id.menuSolutionDele -> { this.onItemClickSolutionDelete()}
Expand Down Expand Up @@ -618,7 +617,8 @@ class ActivityDetail : ActivityBase() {
/**
*
*/
private fun onItemClickScanQRCode() {
@Event(R.id.menu_scan_qr_code)
private fun onItemClickScanQRCode(view: View) {
ActivityScanQR.launch(activity, ActivityScanQR.FROM_DETAIL)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import android.content.Intent
import android.text.method.ScrollingMovementMethod
import android.view.Menu
import android.view.MenuItem
import com.elvishew.xlog.XLog
import com.sollyu.android.appenv.R
import com.sollyu.android.appenv.commons.Application
import kotlinx.android.synthetic.main.activity_log.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ class ActivityMain : ActivityBase(), NavigationView.OnNavigationItemSelectedList
}
R.id.nav_cloud -> {
ActivityWeb.launch(activity, "应用变量 后台", AppEnvConstants.URL_APPENV_SERVER)
// ActivityRegister.launch(activity)
//Snackbar.make(fab, "后台维护中……", Snackbar.LENGTH_LONG).show()
}
R.id.nav_about -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
* Copyright © 2017 Sollyu <https://www.sollyu.com/>
*
* Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
*
* This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
*/

package com.sollyu.android.appenv.activitys

import android.app.Activity
import android.content.Intent
import android.view.View
import com.afollestad.materialdialogs.MaterialDialog
import com.alibaba.fastjson.JSON
import com.sollyu.android.appenv.R
import com.sollyu.android.appenv.define.AppEnvConstants
import com.squareup.okhttp.*
import kotlinx.android.synthetic.main.activity_register.*
import kotlinx.android.synthetic.main.include_toolbar.*
import org.xutils.view.annotation.Event
import org.xutils.x
import java.io.IOException

class ActivityRegister : ActivityBase() {

companion object {
fun launch(activity: Activity) {
activity.startActivity(Intent(activity, ActivityRegister::class.java))
}
}

override fun getMobclickAgentTag(): String {
return "Register"
}

override fun onInitView() {
super.onInitView()
setContentView(R.layout.activity_register)
x.view().inject(activity)

setSupportActionBar(toolbar)
supportActionBar?.setTitle(R.string.register_title)
supportActionBar?.setHomeButtonEnabled(true)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}

@Suppress("unused")
@Event(R.id.btnLogin)
private fun onItemClickLogin(view: View) {

val postBody = FormEncodingBuilder()
.add("user_name" , etUserName.text.toString())
.add("user_password" , etPwd.text.toString())
.add("user_password_confirm", etPwdConfirm.text.toString())
.add("user_email" , etEMail.text.toString())
.build()

val materialDialog = MaterialDialog.Builder(activity).title(R.string.tip).content(R.string.register_processing).progress(true, 0).cancelable(false).show()
OkHttpClient().newCall(Request.Builder().url(AppEnvConstants.URL_APPENV_REGISTER).post(postBody).build()).enqueue(object : Callback{
override fun onFailure(request: Request, e: IOException) {
materialDialog.dismiss()
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.error).content(e.message?:"null").show() }
}

override fun onResponse(response: Response) {
materialDialog.dismiss()
val serverResult = response.body().string()
try {
val resultJsonObject = JSON.parseObject(serverResult)
if (resultJsonObject.getInteger("ret") == 200) {
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("注册成功").canceledOnTouchOutside(false).positiveText(android.R.string.ok).onPositive { _, _ -> activity.finish() }.show() }
} else {
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("注册失败:\n" + resultJsonObject.getString("msg")).positiveText(android.R.string.ok).show() }
}
} catch (e: Exception) {
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("注册失败,原因未知").positiveText(android.R.string.ok).show() }
}
}
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ class ActivityWeb : ActivityBase(), ChromeClientCallbackManager.ReceivedTitleCal

inner class JsInterfaceHolder{

@Suppress("unused")
@JavascriptInterface
fun register() {
ActivityRegister.launch(activity)
}

@Suppress("unused")
@JavascriptInterface
fun downloadConfig(configId: String, packageName: String, configName: String, packageLabel: String) {
Expand Down Expand Up @@ -132,7 +138,7 @@ class ActivityWeb : ActivityBase(), ChromeClientCallbackManager.ReceivedTitleCal
EventBus.getDefault().postSticky(EventSample(EventSample.TYPE.MAIN_REFRESH))
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("下载并应用成功").positiveText(android.R.string.ok).show() }
} else {
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("上传出现错误\n" + resultJsonObject.getString("msg")).positiveText(android.R.string.ok).show() }
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("下载出现错误\n" + resultJsonObject.getString("msg")).positiveText(android.R.string.ok).show() }
}
} catch (e: Exception) {
activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("下载出现错误:\n请确定您已经正确的登陆").positiveText(android.R.string.ok).show() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@ import android.support.v7.app.AppCompatDelegate
import com.elvishew.xlog.LogConfiguration
import com.elvishew.xlog.LogLevel
import com.elvishew.xlog.XLog
import com.elvishew.xlog.XLog.logLevel
import com.elvishew.xlog.flattener.DefaultFlattener
import com.elvishew.xlog.flattener.Flattener
import com.elvishew.xlog.printer.AndroidPrinter
import com.elvishew.xlog.printer.file.FilePrinter
import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
import com.sollyu.android.appenv.BuildConfig
import com.sollyu.android.not.proguard.NotProguard
import com.umeng.analytics.MobclickAgent
import com.umeng.commonsdk.UMConfigure
import org.apache.commons.io.FileUtils
import org.apache.commons.io.IOUtils
import org.apache.commons.text.CharacterPredicates
import org.apache.commons.text.RandomStringGenerator
import java.text.SimpleDateFormat
import java.util.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import android.net.wifi.WifiInfo
import android.net.wifi.WifiManager
import android.os.Build
import android.preference.PreferenceManager
import android.provider.Settings
import android.telephony.TelephonyManager
import com.alibaba.fastjson.JSON
import com.elvishew.xlog.XLog
Expand All @@ -33,7 +34,7 @@ class PhoneReport {
var Instance = PhoneReport()
}

@SuppressLint("WifiManagerLeak")
@SuppressLint("WifiManagerLeak", "HardwareIds")
fun start() {
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(Application.Instance)
if (sharedPreferences.getBoolean("report_phone", false)) {
Expand All @@ -57,6 +58,7 @@ class PhoneReport {
postBody.add("android.os.Build.ro.product.fingerprint" , Build.FINGERPRINT)
postBody.add("android.os.Build.ro.serialno" , Build.SERIAL)
postBody.add("android.os.Build.VERSION.RELEASE" , Build.VERSION.RELEASE)
postBody.add("android.os.SystemProperties.android_id" , Settings.Secure.getString(Application.Instance.contentResolver, Settings.Secure.ANDROID_ID))

arrayListOf("getLine1Number", "getDeviceId", "getSubscriberId", "getSimOperator", "getSimCountryIso", "getSimOperatorName", "getSimSerialNumber", "getSimState").forEach {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ public class AppEnvConstants {
public static final String URL_APPENV_DOWNLOAD_PACKAGE = URL_APPENV_SERVER + "/api/download/package";
public static final String URL_APPENV_SHARE_START = URL_APPENV_HOST + "/share";
public static final String URL_APPENV_REPORT_PHONE = URL_APPENV_HOST + "/api/phone/report";
public static final String URL_APPENV_REGISTER = URL_APPENV_HOST + "/api/register";
}
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_scan.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!--
~ Copyright © 2017 Sollyu <https://www.sollyu.com/>
~
~ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
~
~ This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
-->

<vector android:height="24dp" android:viewportHeight="1024.0"
android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff" android:pathData="M813.9,128.3l-199.5,0 0,40.9 199.5,0c10.8,0 21.1,4.3 28.9,12.1 7.8,7.8 12.1,18 12.1,28.9l0,199.5 40.9,0 0,-199.5C895.7,165.1 858.9,128.3 813.9,128.3z"/>
<path android:fillColor="#ffffff" android:pathData="M854.8,813.9c0,10.8 -4.3,21.1 -12.1,28.9 -7.8,7.8 -18,12.1 -28.9,12.1l-199.5,0 0,40.9 199.5,0c45,0 81.9,-36.8 81.9,-81.9l0,-199.5 -40.9,0L854.8,813.9z"/>
<path android:fillColor="#ffffff" android:pathData="M181.3,842.7c-7.8,-7.8 -12.1,-18 -12.1,-28.9l0,-199.5 -40.9,0 0,199.5c0,45 36.8,81.9 81.9,81.9l199.5,0 0,-40.9 -199.5,0C199.3,854.8 189,850.5 181.3,842.7z"/>
<path android:fillColor="#ffffff" android:pathData="M128.3,210.1l0,199.5 40.9,0 0,-199.5c0,-10.8 4.3,-21.1 12.1,-28.9 7.8,-7.8 18,-12.1 28.9,-12.1l199.5,0 0,-40.9 -199.5,0C165.1,128.3 128.3,165.1 128.3,210.1z"/>
<path android:fillColor="#ffffff" android:pathData="M148.7,491.5l726.5,0 0,40.9 -726.5,0 0,-40.9Z"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/layout/activity_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
app:menu_labels_singleLine="true"
app:srcCompat="@android:drawable/ic_dialog_email">

<com.github.clans.fab.FloatingActionButton
android:id="@+id/menu_scan_qr_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scan"
app:fab_colorNormal="#663366"
app:fab_label="@string/scan_qr"
app:fab_size="mini" />


<com.github.clans.fab.FloatingActionButton
android:id="@+id/menu_random_all"
android:layout_width="wrap_content"
Expand Down
Loading

0 comments on commit 86be223

Please sign in to comment.