1.1.2发布

master
hwf453 1 year ago
parent 9493b4861b
commit 2f15a3456c

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa" applicationId "com.rehome.dywoa"
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionCode 12 versionCode 13
versionName "1.1.1" versionName "1.1.2"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//authorities //authorities

@ -78,6 +78,7 @@
tools:replace="android:allowBackup" tools:replace="android:allowBackup"
tools:targetApi="s"> tools:targetApi="s">
<activity <activity
android:name=".ui.activity.LoginActivity" android:name=".ui.activity.LoginActivity"
android:exported="true" android:exported="true"
@ -124,6 +125,10 @@
android:name=".ui.activity.SisBaseActivity" android:name=".ui.activity.SisBaseActivity"
android:exported="false" android:exported="false"
android:screenOrientation="landscape" /> android:screenOrientation="landscape" />
<activity
android:name=".ui.activity.WaitForToDoBaseActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.JiZhuActivity" android:name=".ui.activity.JiZhuActivity"
android:exported="false" android:exported="false"
@ -184,6 +189,18 @@
android:name=".ui.activity.RunLogListActivity" android:name=".ui.activity.RunLogListActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.UseCarActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.UseSealActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.WaitForToDoActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.sbxdjgl.SxcdjActivity" android:name=".ui.activity.sbxdjgl.SxcdjActivity"
android:exported="false" android:exported="false"
@ -263,7 +280,6 @@
android:exported="false" android:exported="false"
android:launchMode="singleInstance" /> android:launchMode="singleInstance" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider" android:authorities="${applicationId}.fileprovider"

@ -12,9 +12,9 @@ public class Contans {
// public static String IP_EXTRANET = "http://192.168.2.21:8601/"; // public static String IP_EXTRANET = "http://192.168.2.21:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; // public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String IP = "http://192.168.2.150:8601/"; // public static String IP = "http://192.168.2.91:8601/";
// public static String IP_INTRANET = "http://192.168.2.150:8601/"; // public static String IP_INTRANET = "http://192.168.2.91:8601/";
// public static String IP_EXTRANET = "http://192.168.2.150:8601/"; // public static String IP_EXTRANET = "http://192.168.2.91:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; // public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String IP = "http://192.168.2.76:8601/"; // public static String IP = "http://192.168.2.76:8601/";
@ -53,9 +53,16 @@ public class Contans {
public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//APP登录接口厂内服务器IP
// public static String IP = "https://app.dywzhny.com.cn/";
// //app内网
// public static String IP_INTRANET = "https://app.dywzhny.com.cn/";
// //app外网
// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
// //SIS系统厂内IP
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//泛微单点登录IP
public static String FW_SINGLE_LOGIN_IP = "http://10.25.187.8:8088/";
public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE"; public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE";
@ -114,6 +121,7 @@ public class Contans {
//点检数据下载 //点检数据下载
public static String DJJHXCJSSC = "DJGL/DJGL_XCJS.ashx";//ms:描述 fileps:文件 poinnum jhid public static String DJJHXCJSSC = "DJGL/DJGL_XCJS.ashx";//ms:描述 fileps:文件 poinnum jhid
public static String DJJHSC = "api/app/pointTask/uploadTaskList";//json字符串 public static String DJJHSC = "api/app/pointTask/uploadTaskList";//json字符串
public static String GET_WAIT_FOR_TO_DO = "api/app/pointTask/getToDoCount";
public static String DJJHQXGD = "DJGL/DJGL_QXGD.ashx";//json字符串 public static String DJJHQXGD = "DJGL/DJGL_QXGD.ashx";//json字符串
public final static int DLB = 1; public final static int DLB = 1;

@ -81,6 +81,7 @@ public abstract class BaseFragment extends Fragment {
mActivity = null; mActivity = null;
} }
public void showLog(String logText) { public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) { if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) { if (TextUtils.isEmpty(logText)) {

@ -855,4 +855,5 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
} }
}) })
} }
} }

@ -669,7 +669,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// finish() // finish()
} }
} else { } else {
Log.i("login", userInfo.statusMsg) showLog(userInfo.statusMsg)
toastviewbymyself.makeText( toastviewbymyself.makeText(
context, context,
userInfo.statusMsg, userInfo.statusMsg,
@ -678,13 +678,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
} }
} else { } else {
showToast("服务器请求失败") showToast("服务器请求失败")
Log.i("app", "to gson is null") showLog("to gson is null")
} }
} }
} }
override fun onFailed(what: Int, response: Response<String?>?) { override fun onFailed(what: Int, response: Response<String?>?) {
Log.i("login", "onError") showLog("onError")
} }
}, true, true, "登录中...") }, true, true, "登录中...")
} }

@ -147,7 +147,7 @@ public class RunLogActivity extends AppCompatActivity {
private void getSingleLogin() { private void getSingleLogin() {
// String url = Contans.FW_SINGLE_LOGIN_IP + urlToken + App.getInstance().getUserInfo().getManid(); // String url = Contans.FW_SINGLE_LOGIN_IP + urlToken + App.getInstance().getUserInfo().getManid();
String url = Contans.FW_SINGLE_LOGIN_IP + urlToken + "371543"; String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
Request request = NoHttp.createStringRequest(url, RequestMethod.GET); Request request = NoHttp.createStringRequest(url, RequestMethod.GET);
showLog(url); showLog(url);

@ -34,15 +34,8 @@ import com.yolanda.nohttp.rest.Response
class RunLogBaseActivity : BaseActivityOaToolbarViewBinding<ActivityRunLogBaseBinding>() { class RunLogBaseActivity : BaseActivityOaToolbarViewBinding<ActivityRunLogBaseBinding>() {
// private val urlToken = "api/singer/singerLogin?account=" // private val urlToken = "api/singer/singerLogin?account="
private val urlToken = "api/login/singleLogin?account=" private val urlToken = "api/app/login/singleLogin?account="
//RunLogListActivity
// private var sisMainPage = "opgview/direct2?filePath=mainmenu.zxml&showToolbar=false&view=view&token=";
//
// private var sisTokenBeanData: SisTokenBeanData? = null
// private var exitTime: Long = 0
private lateinit var startUrl:String private lateinit var startUrl:String
private var urlFinish: String? = null private var urlFinish: String? = null
@ -283,8 +276,9 @@ class RunLogBaseActivity : BaseActivityOaToolbarViewBinding<ActivityRunLogBaseBi
//startUrl = urlPage //startUrl = urlPage
//startUrl = "http://10.25.187.8:20600/papi/open/singleSignon?singleToken=42a10aa5364cc4c88f2a9d5f8d03a81d&oauthType=singlesign&redirect_uri=http://10.25.187.8:20600/mobile/ebdapp/view/957532619146813443/report/974990518684196940-8441205291343560814" //startUrl = "http://10.25.187.8:20600/papi/open/singleSignon?singleToken=42a10aa5364cc4c88f2a9d5f8d03a81d&oauthType=singlesign&redirect_uri=http://10.25.187.8:20600/mobile/ebdapp/view/957532619146813443/report/974990518684196940-8441205291343560814"
//var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken=$token&redirect_uri="
var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken=$token&redirect_uri=" var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken=$token&redirect_uri="
//startUrl = tempUrl + "http://10.25.187.8:20600/mobile/ebdapp/view/957532619146813443/report/974990518684196940-8441205291343560814"
startUrl = tempUrl + urlLog startUrl = tempUrl + urlLog

@ -0,0 +1,231 @@
package com.rehome.dywoa.ui.activity
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Bitmap
import android.graphics.Color
import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
import android.view.KeyEvent
import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.webkit.CookieManager
import android.webkit.WebChromeClient
import android.webkit.WebSettings
import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.widget.Toolbar
import com.rehome.dywoa.App
import com.rehome.dywoa.BuildConfig
import com.rehome.dywoa.Contans
import com.rehome.dywoa.R
import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding
import com.rehome.dywoa.base.BaseAgentWebActivity
import com.rehome.dywoa.bean.FwSingleLoginResult
import com.rehome.dywoa.bean.SisTokenBeanData
import com.rehome.dywoa.bean.UserInfoBean
import com.rehome.dywoa.databinding.ActivityRunLogBaseBinding
import com.rehome.dywoa.databinding.ActivityUseCarBinding
import com.rehome.dywoa.utils.GsonUtils
import com.rehome.dywoa.utils.HttpListener
import com.rehome.dywoa.utils.NoProgresshttpUtils
import com.rehome.dywoa.utils.NohttpUtils
import com.rehome.dywoa.utils.RSAUtils
import com.rehome.dywoa.utils.UiUtlis
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import com.yolanda.nohttp.rest.Response
class UseCarActivity : BaseAgentWebActivity() {
private val urlToken = "api/app/login/singleLogin?account="
private lateinit var startUrl:String
private lateinit var type:String
private lateinit var urlLog:String
private lateinit var mToolbar: Toolbar
private lateinit var mTitleTextView: TextView
private lateinit var context: Context
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_wait_for_to_do)
context = this;
type = intent.getStringExtra("type")!!
urlLog = intent.getStringExtra("urlLog")!!
if (TextUtils.isEmpty(type)) {
type = ""
}
mToolbar = this.findViewById(R.id.toolbar)
mToolbar.setTitleTextColor(Color.WHITE)
mToolbar.title = ""
mToolbar.setNavigationIcon(R.drawable.ac_back_icon)
mTitleTextView = this.findViewById(R.id.toolbar_title)
mTitleTextView.text = type
this.setSupportActionBar(mToolbar)
if (supportActionBar != null) {
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
}
mToolbar.setNavigationOnClickListener { finish() }
//支持缩放
mAgentWeb.webCreator.webView.settings.builtInZoomControls = true
mAgentWeb.webCreator.webView.settings.displayZoomControls = false
mAgentWeb.webCreator.webView.settings.setSupportZoom(true)
checkServerConnectStatus()
}
private fun getSingleLoginToken() {
val url = Contans.IP + urlToken + App.getInstance().userInfo.manid;
//url = Contans.IP + urlToken + "280846";
val request = NoHttp.createStringRequest(url, RequestMethod.GET)
showLog(url)
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
val jsonResult = response?.get()
showLog("-----login------")
showLog(jsonResult?:"")
val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult)
if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(context, R.string.data_error))
} else {
val loginResult: FwSingleLoginResult? = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult::class.java)
showLog(jsonDecode);
if (loginResult != null) {
if (loginResult.errmsg!=null&&loginResult.errmsg.equals("success")) {
if(!TextUtils.isEmpty(loginResult.token)){
loadSisPage(loginResult.token)
}
}else{
showToast(loginResult.errmsg)
}
}
}
if (jsonResult != null && jsonResult.startsWith("http")) {
//FwSingleLoginResult
loadSisPage(jsonResult)
}
}
override fun onFailed(what: Int, response: Response<String?>?) {
Log.i("login", "onError")
}
}, true, true, "登录中...")
}
private fun loadSisPage(token: String) {
val tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken=$token&redirect_uri="
startUrl = tempUrl + urlLog
showLog(startUrl)
//startUrl = "https://www.hao123.com";
mAgentWeb.urlLoader.loadUrl(startUrl)
}
//检查服务器连接状态
private fun checkServerConnectStatus() {
var param = HashMap<String,String>()
param["login"] = "dywoa";
val json = GsonUtils.GsonString(param)
val url = Contans.IP + Contans.check_server_connect
Log.i("app",url)
Log.i("app",json)
val request = NoHttp.createStringRequest(
url,
RequestMethod.POST
)
request.setDefineRequestBodyForJson(json)
NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
val result = response?.get()
if (result != null) {
showLog("-----onSucceed----")
showLog(result)
if(result == "1"){
showLog("connect server success")
getSingleLoginToken()
}else{
showToast("无法连接到服务器,请检查网络环境")
}
}
}
override fun onFailed(what: Int, response: Response<String?>?) {
showLog("connect server onFailed")
showToast("无法连接到服务器,请检查网络环境")
}
})
}
override fun getAgentWebParent(): ViewGroup {
return findViewById<View>(R.id.container) as ViewGroup
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) {
return true
}
return super.onKeyDown(keyCode, event)
}
override fun getIndicatorColor(): Int {
return Color.parseColor("#ff0000")
}
override fun setTitle(view: WebView?, title: String?) {
super.setTitle(view, title)
if (!TextUtils.isEmpty(title)) {
if (mTitleTextView != null) {
mTitleTextView.text = type
}
}
}
override fun getIndicatorHeight(): Int {
return 3
}
override fun getUrl(): String? {
return null
//return "https://www.baidu.com/";
}
private fun showLog(logText: String) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null")
} else {
Log.i("app", logText)
}
}
}
fun showToast(msg: String?) {
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
}
fun showToast(strId: Int) {
Toast.makeText(this, strId, Toast.LENGTH_SHORT).show()
}
}

@ -0,0 +1,221 @@
package com.rehome.dywoa.ui.activity
import android.content.Context
import android.graphics.Color
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
import android.view.KeyEvent
import android.view.View
import android.view.ViewGroup
import android.webkit.WebView
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.widget.Toolbar
import com.rehome.dywoa.App
import com.rehome.dywoa.BuildConfig
import com.rehome.dywoa.Contans
import com.rehome.dywoa.R
import com.rehome.dywoa.base.BaseAgentWebActivity
import com.rehome.dywoa.bean.FwSingleLoginResult
import com.rehome.dywoa.databinding.ActivityUseSealBinding
import com.rehome.dywoa.utils.GsonUtils
import com.rehome.dywoa.utils.HttpListener
import com.rehome.dywoa.utils.NoProgresshttpUtils
import com.rehome.dywoa.utils.NohttpUtils
import com.rehome.dywoa.utils.RSAUtils
import com.rehome.dywoa.utils.UiUtlis
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import com.yolanda.nohttp.rest.Response
class UseSealActivity : BaseAgentWebActivity() {
private val urlToken = "api/app/login/singleLogin?account="
private lateinit var startUrl:String
private lateinit var type:String
private lateinit var urlLog:String
private lateinit var mToolbar: Toolbar
private lateinit var mTitleTextView: TextView
private lateinit var context:Context
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_wait_for_to_do)
context = this;
type = intent.getStringExtra("type")!!
urlLog = intent.getStringExtra("urlLog")!!
if (TextUtils.isEmpty(type)) {
type = ""
}
mToolbar = this.findViewById(R.id.toolbar)
mToolbar.setTitleTextColor(Color.WHITE)
mToolbar.title = ""
mToolbar.setNavigationIcon(R.drawable.ac_back_icon)
mTitleTextView = this.findViewById(R.id.toolbar_title)
mTitleTextView.text = type
this.setSupportActionBar(mToolbar)
if (supportActionBar != null) {
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
}
mToolbar.setNavigationOnClickListener { finish() }
//支持缩放
mAgentWeb.webCreator.webView.settings.builtInZoomControls = true
mAgentWeb.webCreator.webView.settings.displayZoomControls = false
mAgentWeb.webCreator.webView.settings.setSupportZoom(true)
checkServerConnectStatus()
}
private fun getSingleLoginToken() {
val url = Contans.IP + urlToken + App.getInstance().userInfo.manid;
//url = Contans.IP + urlToken + "280846";
val request = NoHttp.createStringRequest(url, RequestMethod.GET)
showLog(url)
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
val jsonResult = response?.get()
showLog("-----login------")
showLog(jsonResult?:"")
val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult)
if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(context, R.string.data_error))
} else {
val loginResult: FwSingleLoginResult? = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult::class.java)
showLog(jsonDecode);
if (loginResult != null) {
if (loginResult.errmsg!=null&&loginResult.errmsg.equals("success")) {
if(!TextUtils.isEmpty(loginResult.token)){
loadSisPage(loginResult.token)
}
}else{
showToast(loginResult.errmsg)
}
}
}
if (jsonResult != null && jsonResult.startsWith("http")) {
//FwSingleLoginResult
loadSisPage(jsonResult)
}
}
override fun onFailed(what: Int, response: Response<String?>?) {
Log.i("login", "onError")
}
}, true, true, "登录中...")
}
private fun loadSisPage(token: String) {
val tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken=$token&redirect_uri="
startUrl = tempUrl + urlLog
showLog(startUrl)
//startUrl = "https://www.hao123.com";
mAgentWeb.urlLoader.loadUrl(startUrl)
}
//检查服务器连接状态
private fun checkServerConnectStatus() {
var param = HashMap<String,String>()
param["login"] = "dywoa";
val json = GsonUtils.GsonString(param)
val url = Contans.IP + Contans.check_server_connect
Log.i("app",url)
Log.i("app",json)
val request = NoHttp.createStringRequest(
url,
RequestMethod.POST
)
request.setDefineRequestBodyForJson(json)
NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
val result = response?.get()
if (result != null) {
showLog("-----onSucceed----")
showLog(result)
if(result == "1"){
showLog("connect server success")
getSingleLoginToken()
}else{
showToast("无法连接到服务器,请检查网络环境")
}
}
}
override fun onFailed(what: Int, response: Response<String?>?) {
showLog("connect server onFailed")
showToast("无法连接到服务器,请检查网络环境")
}
})
}
override fun getAgentWebParent(): ViewGroup {
return findViewById<View>(R.id.container) as ViewGroup
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) {
return true
}
return super.onKeyDown(keyCode, event)
}
override fun getIndicatorColor(): Int {
return Color.parseColor("#ff0000")
}
override fun setTitle(view: WebView?, title: String?) {
super.setTitle(view, title)
if (!TextUtils.isEmpty(title)) {
if (mTitleTextView != null) {
mTitleTextView.text = type
}
}
}
override fun getIndicatorHeight(): Int {
return 3
}
override fun getUrl(): String? {
return null
//return "https://www.baidu.com/";
}
private fun showLog(logText: String) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null")
} else {
Log.i("app", logText)
}
}
}
fun showToast(msg: String?) {
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
}
fun showToast(strId: Int) {
Toast.makeText(this, strId, Toast.LENGTH_SHORT).show()
}
}

@ -0,0 +1,277 @@
package com.rehome.dywoa.ui.activity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.ViewGroup;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.just.agentweb.AgentWeb;
import com.just.agentweb.DefaultWebClient;
import com.just.agentweb.WebChromeClient;
import com.just.agentweb.WebViewClient;
import com.rehome.dywoa.App;
import com.rehome.dywoa.BuildConfig;
import com.rehome.dywoa.Contans;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseAgentWebActivity;
import com.rehome.dywoa.bean.FwSingleLoginResult;
import com.rehome.dywoa.bean.SisTokenBeanData;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.NohttpUtils;
import com.rehome.dywoa.utils.RSAUtils;
import com.rehome.dywoa.utils.UiUtlis;
import com.rehome.dywoa.weiget.WebLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
public class WaitForToDoActivity extends BaseAgentWebActivity {
private Toolbar mToolbar;
private TextView mTitleTextView;
private String urlToken = "api/app/login/singleLogin?account=";
private String startUrl;
String type;
String urlLog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_wait_for_to_do);
type = getIntent().getStringExtra("type");
urlLog = getIntent().getStringExtra("urlLog");
if(TextUtils.isEmpty(type)){
type = "";
}
mToolbar = this.findViewById(R.id.toolbar);
mToolbar.setTitleTextColor(Color.WHITE);
mToolbar.setTitle("");
mToolbar.setNavigationIcon(R.drawable.ac_back_icon);
mTitleTextView = this.findViewById(R.id.toolbar_title);
mTitleTextView.setText(type);
this.setSupportActionBar(mToolbar);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
mToolbar.setNavigationOnClickListener(v -> WaitForToDoActivity.this.finish());
//支持缩放
mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true);
mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false);
mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true);
checkServerConnectStatus();
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onDestroy() {
super.onDestroy();
}
//检查服务器连接状态
private void checkServerConnectStatus() {
Map<String,String> param = new HashMap<>();
param.put("login","dywoa");
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.check_server_connect;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(this, 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
if(result.equals("1")){
showLog("connect server success");
//可以连接到服务器,请求数据
getSingleLoginToken();
}else{
showToast("无法连接到服务器,请检查网络环境");
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
showToast("无法连接到服务器,请检查网络环境");
}
});
}
private void getSingleLoginToken() {
String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
//url = Contans.IP + urlToken + "280846";
Request request = NoHttp.createStringRequest(url, RequestMethod.GET);
showLog(url);
// SSLSocketFactory socketFactory = NohttpUtils.getSisSSLSocketFactory(WaitForToDoActivity.this);
// if (socketFactory != null) {
// request.setSSLSocketFactory(socketFactory);
// request.setHostnameVerifier(new HostnameVerifier() {
// @Override
// public boolean verify(String s, SSLSession sslSession) {
// return true;
// }
// });
// }
NohttpUtils.getInstance().add(this,1,request,new HttpListener<String>(){
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String jsonResult = response.get();
showLog("-----login------");
showLog(jsonResult);
String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult);
if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(WaitForToDoActivity.this, R.string.data_error));
} else {
FwSingleLoginResult loginResult = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult.class);
showLog(jsonDecode);
if (loginResult != null) {
if (loginResult.getErrmsg()!=null&&loginResult.getErrmsg().equals("success")) {
if(!TextUtils.isEmpty(loginResult.getToken())){
loadSisPage(loginResult.getToken());
}
}else{
showToast(loginResult.getErrmsg());
}
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("getSisToken onFailed");
}
}, true, true, "请稍候...");
}
private void loadSisPage(String token) {
var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken="+ token +"&redirect_uri=";
startUrl = tempUrl + urlLog;
showLog(startUrl);
//startUrl = "https://www.hao123.com";
this.mAgentWeb.getUrlLoader().loadUrl(startUrl);
}
@NonNull
@Override
protected ViewGroup getAgentWebParent() {
return (ViewGroup) this.findViewById(R.id.container);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) {
return true;
}
return super.onKeyDown(keyCode, event);
}
@Override
protected int getIndicatorColor() {
return Color.parseColor("#ff0000");
}
@Override
protected void setTitle(WebView view, String title) {
super.setTitle(view, title);
if (!TextUtils.isEmpty(title)) {
if (mTitleTextView != null) {
mTitleTextView.setText(type);
}
}
}
@Override
protected int getIndicatorHeight() {
return 3;
}
@Nullable
@Override
protected String getUrl() {
return null;
//return "https://www.baidu.com/";
}
private void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null");
} else {
Log.i("app", logText);
}
}
}
public void showToast(String msg) {
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
}
public void showToast(int strId) {
Toast.makeText(this, strId, Toast.LENGTH_SHORT).show();
}
}

@ -0,0 +1,270 @@
package com.rehome.dywoa.ui.activity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.webkit.WebView;
import android.widget.TextView;
import android.widget.Toast;
import com.rehome.dywoa.App;
import com.rehome.dywoa.BuildConfig;
import com.rehome.dywoa.Contans;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseAgentWebActivity;
import com.rehome.dywoa.bean.FwSingleLoginResult;
import com.rehome.dywoa.bean.SisTokenBeanData;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.NohttpUtils;
import com.rehome.dywoa.utils.RSAUtils;
import com.rehome.dywoa.utils.UiUtlis;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
public class WaitForToDoBaseActivity extends BaseAgentWebActivity {
private Toolbar mToolbar;
private TextView mTitleTextView;
private String urlToken = "api/app/login/singleLogin?account=";
private String startUrl;
String type;
String urlLog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_wait_for_to_do_base);
type = getIntent().getStringExtra("type");
urlLog = getIntent().getStringExtra("urlLog");
if(TextUtils.isEmpty(type)){
type = "";
}
mToolbar = this.findViewById(R.id.toolbar);
mToolbar.setTitleTextColor(Color.WHITE);
mToolbar.setTitle("");
mToolbar.setNavigationIcon(R.drawable.ac_back_icon);
mTitleTextView = this.findViewById(R.id.toolbar_title);
mTitleTextView.setText(type);
this.setSupportActionBar(mToolbar);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
mToolbar.setNavigationOnClickListener(v -> WaitForToDoBaseActivity.this.finish());
//支持缩放
mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true);
mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false);
mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true);
checkServerConnectStatus();
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onDestroy() {
super.onDestroy();
}
//检查服务器连接状态
private void checkServerConnectStatus() {
Map<String,String> param = new HashMap<>();
param.put("login","dywoa");
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.check_server_connect;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(this, 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
if(result.equals("1")){
showLog("connect server success");
//可以连接到服务器,请求数据
getSingleLoginToken();
}else{
showToast("无法连接到服务器,请检查网络环境");
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
showToast("无法连接到服务器,请检查网络环境");
}
});
}
private void getSingleLoginToken() {
String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
url = Contans.IP + urlToken + "280846";
Request request = NoHttp.createStringRequest(url, RequestMethod.GET);
showLog(url);
// SSLSocketFactory socketFactory = NohttpUtils.getSisSSLSocketFactory(WaitForToDoActivity.this);
// if (socketFactory != null) {
// request.setSSLSocketFactory(socketFactory);
// request.setHostnameVerifier(new HostnameVerifier() {
// @Override
// public boolean verify(String s, SSLSession sslSession) {
// return true;
// }
// });
// }
NohttpUtils.getInstance().add(this,1,request,new HttpListener<String>(){
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String jsonResult = response.get();
showLog("-----login------");
showLog(jsonResult);
String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult);
if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(WaitForToDoBaseActivity.this, R.string.data_error));
} else {
FwSingleLoginResult loginResult = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult.class);
showLog(jsonDecode);
if (loginResult != null) {
if (loginResult.getErrmsg()!=null&&loginResult.getErrmsg().equals("success")) {
if(!TextUtils.isEmpty(loginResult.getToken())){
loadSisPage(loginResult.getToken());
}
}else{
showToast(loginResult.getErrmsg());
}
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("getSisToken onFailed");
}
}, true, true, "请稍候...");
}
private void loadSisPage(String token) {
var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken="+ token +"&redirect_uri=";
startUrl = tempUrl + urlLog;
showLog(startUrl);
//startUrl = "https://www.hao123.com";
this.mAgentWeb.getUrlLoader().loadUrl(startUrl);
}
@NonNull
@Override
protected ViewGroup getAgentWebParent() {
return (ViewGroup) this.findViewById(R.id.container);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) {
return true;
}
return super.onKeyDown(keyCode, event);
}
@Override
protected int getIndicatorColor() {
return Color.parseColor("#ff0000");
}
@Override
protected void setTitle(WebView view, String title) {
super.setTitle(view, title);
if (!TextUtils.isEmpty(title)) {
if (mTitleTextView != null) {
mTitleTextView.setText(type);
}
}
}
@Override
protected int getIndicatorHeight() {
return 3;
}
@Nullable
@Override
protected String getUrl() {
return null;
//return "https://www.baidu.com/";
}
private void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null");
} else {
Log.i("app", logText);
}
}
}
public void showToast(String msg) {
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
}
public void showToast(int strId) {
Toast.makeText(this, strId, Toast.LENGTH_SHORT).show();
}
}

@ -11,6 +11,7 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
import com.rehome.dywoa.DBModel.DjjhRwQy; import com.rehome.dywoa.DBModel.DjjhRwQy;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
@ -46,6 +47,7 @@ public class CJFragment extends BaseFragment {
Button btn_next; Button btn_next;
LinearLayout ll_bz; LinearLayout ll_bz;
ScrollView sv;
private boolean isEdit; private boolean isEdit;
@ -85,6 +87,22 @@ public class CJFragment extends BaseFragment {
} }
findView(); findView();
et_jg.setEnabled(isEdit); et_jg.setEnabled(isEdit);
et_jg.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
}
});
updata(info, index, zj); updata(info, index, zj);
} }
@ -112,6 +130,7 @@ public class CJFragment extends BaseFragment {
tv_bz = view.findViewById(R.id.tv_bz); tv_bz = view.findViewById(R.id.tv_bz);
btn_next = view.findViewById(R.id.btn_next); btn_next = view.findViewById(R.id.btn_next);
ll_bz = view.findViewById(R.id.ll_bz); ll_bz = view.findViewById(R.id.ll_bz);
sv = view.findViewById(R.id.sv);
btn_next.setOnClickListener(new View.OnClickListener() { btn_next.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -236,6 +255,13 @@ public class CJFragment extends BaseFragment {
llFxnr.setVisibility(View.GONE); llFxnr.setVisibility(View.GONE);
} }
} }
sv.post(new Runnable() {
@Override
public void run() {
sv.fullScroll(View.FOCUS_DOWN);
}
});
} }

@ -418,7 +418,7 @@ public class SdjgzActivity extends BaseActivity {
public void handleNfc(String result) { public void handleNfc(String result) {
//super.handleNfc(result); //super.handleNfc(result);
// tvNodata.setText(result); // tvNodata.setText(result);
// result = "041F51EA211990"; //result = "04D49CEAC21B90";
if (list.size() != 0) { if (list.size() != 0) {
showLog("--------"); showLog("--------");
showLog(GsonUtils.GsonString(list)); showLog(GsonUtils.GsonString(list));

@ -331,7 +331,14 @@ public class SbxjcjsbActivity extends BaseActivity {
if (i != 0) { if (i != 0) {
xsjjhDataBeanArrayList.get(item - 1).setChecked(true); xsjjhDataBeanArrayList.get(item - 1).setChecked(true);
xsjjhDataBeanArrayList.get(item - 1).setCJJG(xjcjFragment.getCJJG()); xsjjhDataBeanArrayList.get(item - 1).setCJJG(xjcjFragment.getCJJG());
//showToast("保存成功");
if(xsjjhDataBeanArrayList.get(item - 1).getQymc()!=null&&xsjjhDataBeanArrayList.get(item - 1).getSb()!=null){
showToast(xsjjhDataBeanArrayList.get(item - 1).getQymc()+ "区域" + "打卡保存成功");
}else{
showToast("保存成功"); showToast("保存成功");
}
//更新编辑的内容 //更新编辑的内容
updateItem(xjcjFragment.getCJJG(), item - 1); updateItem(xjcjFragment.getCJJG(), item - 1);
} }

@ -419,9 +419,9 @@ public class SxgzActivity extends BaseActivity {
public void handleNfc(String result) { public void handleNfc(String result) {
//result = "04D16FEA211990"; // result = "048B94EAC21B91";
//result = "041894EAC21B91"; //result = "041894EAC21B91";
//result = "043F9CEAC21B91"; //result = "04A953EA211990";
if(TextUtils.isEmpty(result)){ if(TextUtils.isEmpty(result)){
return; return;

@ -58,6 +58,7 @@ public class XJCJFragment extends BaseFragment {
private boolean isEdit; private boolean isEdit;
private XSJJHDataBean info; private XSJJHDataBean info;
private int zj; private int zj;
@ -278,6 +279,12 @@ public class XJCJFragment extends BaseFragment {
} }
} }
} }
sv.post(new Runnable() {
@Override
public void run() {
sv.fullScroll(View.FOCUS_DOWN);
}
});
} }

@ -290,6 +290,9 @@ public class XzxsjhFragment extends BaseFragment {
index = dataCount; index = dataCount;
} }
List<String> listDBH = new ArrayList<>();
for (int i = 0; i < xsjjhxzDataBeanList.size(); i++) { for (int i = 0; i < xsjjhxzDataBeanList.size(); i++) {
xsjjhxzDataBeanList.get(i).setSN(++index); xsjjhxzDataBeanList.get(i).setSN(++index);
@ -302,7 +305,12 @@ public class XzxsjhFragment extends BaseFragment {
showLog("------前----"); showLog("------前----");
showLog(GsonUtils.GsonString(getData)); showLog(GsonUtils.GsonString(getData));
for (int j = 0; j < getData.size(); j++) { for (int j = 0; j < getData.size(); j++) {
XSJJHDataBean bean = getData.get(j); XSJJHDataBean bean = getData.get(j);
listDBH.add(bean.getDbh());
bean.setUsername(username); bean.setUsername(username);
//bean.setZxid(zxid); //bean.setZxid(zxid);
bean.setNfcbm(xsjjhxzDataBeanList.get(i).getNfcbm()); bean.setNfcbm(xsjjhxzDataBeanList.get(i).getNfcbm());
@ -316,6 +324,9 @@ public class XzxsjhFragment extends BaseFragment {
DataSupport.saveAll(getData); DataSupport.saveAll(getData);
} }
DataSupport.saveAll(xsjjhxzDataBeanList); DataSupport.saveAll(xsjjhxzDataBeanList);
showLog(GsonUtils.GsonString(listDBH));
} else { } else {
showToast(UiUtlis.getString(context, R.string.data_error)); showToast(UiUtlis.getString(context, R.string.data_error));
} }

@ -1,25 +1,42 @@
package com.rehome.dywoa.ui.fragment; package com.rehome.dywoa.ui.fragment;
import static com.rehome.dywoa.utils.GsonUtils.GsonToBean;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.rehome.dywoa.App; import com.rehome.dywoa.App;
import com.rehome.dywoa.Contans; import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.Xjjh;
import com.rehome.dywoa.DBModel.XjjhList;
import com.rehome.dywoa.MainActivity; import com.rehome.dywoa.MainActivity;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
import com.rehome.dywoa.adapter.GridViewAdapter; import com.rehome.dywoa.adapter.GridViewAdapter;
import com.rehome.dywoa.base.BaseFragment; import com.rehome.dywoa.base.BaseFragment;
import com.rehome.dywoa.bean.GridItem; import com.rehome.dywoa.bean.GridItem;
import com.rehome.dywoa.bean.WaitForBean;
import com.rehome.dywoa.ui.activity.JiZhuActivity; import com.rehome.dywoa.ui.activity.JiZhuActivity;
import com.rehome.dywoa.ui.activity.KksSearchActivity; import com.rehome.dywoa.ui.activity.KksSearchActivity;
import com.rehome.dywoa.ui.activity.RunLogActivity; import com.rehome.dywoa.ui.activity.RunLogActivity;
import com.rehome.dywoa.ui.activity.RunLogBaseActivity; import com.rehome.dywoa.ui.activity.RunLogBaseActivity;
import com.rehome.dywoa.ui.activity.RunLogListActivity; import com.rehome.dywoa.ui.activity.RunLogListActivity;
import com.rehome.dywoa.ui.activity.SisBaseActivity; import com.rehome.dywoa.ui.activity.SisBaseActivity;
import com.rehome.dywoa.ui.activity.UseCarActivity;
import com.rehome.dywoa.ui.activity.UseSealActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoBaseActivity;
import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity; import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity;
import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity; import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener; import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.NohttpUtils; import com.rehome.dywoa.utils.NohttpUtils;
import com.rehome.dywoa.weiget.AutoGridView; import com.rehome.dywoa.weiget.AutoGridView;
import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.NoHttp;
@ -27,21 +44,28 @@ import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response; import com.yolanda.nohttp.rest.Response;
import org.litepal.crud.DataSupport;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
public class HomeFragment extends BaseFragment { public class HomeFragment extends BaseFragment {
private String username; private String username;
private String firstDeparment; private String firstDeparment;
public static final int REQUEST_CODE_ADD = 1; public static final int REQUEST_CODE_ADD = 1;
public static final int REQUEST_CODE_AUDIT = 2; public static final int REQUEST_CODE_AUDIT = 2;
private static HomeFragment instance = null; private static HomeFragment instance = null;
TextView tv_todo_count;
LinearLayout ll_account;
ImageView iv; ImageView iv;
AutoGridView gv; AutoGridView gv;
// XUILinearLayout mTestLayout; // XUILinearLayout mTestLayout;
@ -78,6 +102,20 @@ public class HomeFragment extends BaseFragment {
findView(); findView();
initLists(); initLists();
setAdapter(); setAdapter();
ll_account.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intentWaitFor = new Intent(mActivity, WaitForToDoActivity.class);
intentWaitFor.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
String typeWaitFor = "待办";
String urlWaitFor = "https://mis.dywzhny.com.cn/mobile/workflow/list/todo?cusMenuId=5116426542447237804&urlPageTitle=5b6F5Yqe5rWB56iL";
intentWaitFor.putExtra("type",typeWaitFor);
intentWaitFor.putExtra("urlLog",urlWaitFor);
startActivity(intentWaitFor);
}
});
} }
@Override @Override
@ -93,11 +131,14 @@ public class HomeFragment extends BaseFragment {
String yesterday = sp.format(d); String yesterday = sp.format(d);
String beforeyesterday = sp.format(d2); String beforeyesterday = sp.format(d2);
String today = formatter.format(cal0.getTime()); String today = formatter.format(cal0.getTime());
getWaitForToDo();
} }
private void findView() { private void findView() {
iv = view.findViewById(R.id.iv); iv = view.findViewById(R.id.iv);
gv = view.findViewById(R.id.gv); gv = view.findViewById(R.id.gv);
tv_todo_count = view.findViewById(R.id.tv_todo_count);
ll_account = view.findViewById(R.id.ll_account);
// mTestLayout = view.findViewById(R.id.layout_xui); // mTestLayout = view.findViewById(R.id.layout_xui);
// mTestLayout2 = view.findViewById(R.id.layout_xui2); // mTestLayout2 = view.findViewById(R.id.layout_xui2);
// recyclerView = view.findViewById(R.id.recycler_view); // recyclerView = view.findViewById(R.id.recycler_view);
@ -197,8 +238,44 @@ public class HomeFragment extends BaseFragment {
intentKks.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentKks.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intentKks); startActivity(intentKks);
break; break;
// case 7: case 7:
// TAG = GridViewDialog.TAG_CHECK; Intent intentUseCar = new Intent(mActivity, UseCarActivity.class);
intentUseCar.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
String type = "用车管理";
String urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/943525549724041323-8440288166160908898?cusMenuId=8440288166160908898&urlPageTitle=55So6L2m55Sz6K%203";
if(!TextUtils.isEmpty(username)){
if(username.equals("832019")||username.equals("371511")||username.equals("210343")){
}else {
urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/986612579987226628-8441291376201270243?cusMenuId=8441291376201270243&urlPageTitle=55So6L2m55Sz6K%2036KGo";
}
}
intentUseCar.putExtra("type",type);
intentUseCar.putExtra("urlLog",urlLog);
startActivity(intentUseCar);
break;
case 8:
Intent intentUseSeal = new Intent(mActivity, UseSealActivity.class);
intentUseSeal.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
String typeSeal = "用印管理";
String urlSeal = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/947273965253730306/SEARCH/986524868123164680-8441289344850462409?cusMenuId=8441289344850462409&urlPageTitle=55So5Y2w55Sz6K%203";
intentUseSeal.putExtra("type",typeSeal);
intentUseSeal.putExtra("urlLog",urlSeal);
startActivity(intentUseSeal);
break;
// case 9:
// Intent intentWaitFor = new Intent(mActivity, WaitForToDoActivity.class);
// intentWaitFor.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
//
// String typeWaitFor = "待办";
// String urlWaitFor = "https://mis.dywzhny.com.cn/mobile/workflow/list/todo?cusMenuId=5116426542447237804&urlPageTitle=5b6F5Yqe5rWB56iL";
// intentWaitFor.putExtra("type",typeWaitFor);
// intentWaitFor.putExtra("urlLog",urlWaitFor);
// startActivity(intentWaitFor);
// break; // break;
// case 8: // case 8:
// TAG = GridViewDialog.TAG_PEIXUN; // TAG = GridViewDialog.TAG_PEIXUN;
@ -228,8 +305,8 @@ public class HomeFragment extends BaseFragment {
// String[] titles = {"两票系统", "会议管理", "用餐管理", "车辆管理", "办公领用", "工作任务", "日程查看", "考勤", "来访管理", "培训", "党建", "安防"}; // String[] titles = {"两票系统", "会议管理", "用餐管理", "车辆管理", "办公领用", "工作任务", "日程查看", "考勤", "来访管理", "培训", "党建", "安防"};
// int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_meetting, R.drawable.icon_dinner_new, R.drawable.icon_vehicle_new, R.drawable.icon_office, R.drawable.icon_task, R.drawable.icon_date, R.drawable.icon_check, R.drawable.icon_px, R.drawable.icon_dj,R.drawable.icon_visit, R.drawable.icon1}; // int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_meetting, R.drawable.icon_dinner_new, R.drawable.icon_vehicle_new, R.drawable.icon_office, R.drawable.icon_task, R.drawable.icon_date, R.drawable.icon_check, R.drawable.icon_px, R.drawable.icon_dj,R.drawable.icon_visit, R.drawable.icon1};
// //
String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询"}; String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","用车","用印"};
int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks}; int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_use_car,R.drawable.icon_use_seal};
@ -261,4 +338,44 @@ public class HomeFragment extends BaseFragment {
super.onDetach(); super.onDetach();
instance = null; instance = null;
} }
private void getWaitForToDo() {
HashMap<String,String> param = new HashMap<>();
param.put("YHID",username);
String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO;
showLog(url);
final Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
request.setDefineRequestBodyForJson(GsonUtils.GsonString(param));
NoProgresshttpUtils.getInstance().addQj(requireActivity(), 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----------");
showLog(result);
WaitForBean waitForBean = GsonUtils.GsonToBean(result,WaitForBean.class);
if(waitForBean!=null){
if(!TextUtils.isEmpty(waitForBean.getTotal())){
tv_todo_count.setText(waitForBean.getTotal());
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
}
});
}
} }

@ -50,17 +50,28 @@ import com.rehome.dywoa.Contans;
import com.rehome.dywoa.Listener.GlideEngine; import com.rehome.dywoa.Listener.GlideEngine;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseLazyFragment; import com.rehome.dywoa.base.BaseLazyFragment;
import com.rehome.dywoa.bean.WaitForBean;
import com.rehome.dywoa.ui.activity.LoginActivity; import com.rehome.dywoa.ui.activity.LoginActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoActivity;
import com.rehome.dywoa.ui.activity.vpn.AuthSuccessActivity; import com.rehome.dywoa.ui.activity.vpn.AuthSuccessActivity;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.SPUtils; import com.rehome.dywoa.utils.SPUtils;
import com.rehome.dywoa.weiget.AuditDialog; import com.rehome.dywoa.weiget.AuditDialog;
import com.sangfor.sdk.SFUemSDK; import com.sangfor.sdk.SFUemSDK;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import android.widget.LinearLayout;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
@ -75,6 +86,7 @@ public class MineFragment extends BaseLazyFragment {
private static final int ALBUM = 1; private static final int ALBUM = 1;
private static final int CROP = 2; private static final int CROP = 2;
public static final int UPDATE_HEAD_PHOTO = 100; public static final int UPDATE_HEAD_PHOTO = 100;
private String username;
private ActivityResultLauncher launcherResultEmoji; private ActivityResultLauncher launcherResultEmoji;
@ -83,6 +95,10 @@ public class MineFragment extends BaseLazyFragment {
TextView tvAccount; TextView tvAccount;
TextView tvLoginOut; TextView tvLoginOut;
TextView tvVersionName; TextView tvVersionName;
TextView tv_count_to_do;
LinearLayout ll_count_to_do;
private String path = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "com.rehome.ydoa/images"; private String path = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "com.rehome.ydoa/images";
@ -120,6 +136,7 @@ public class MineFragment extends BaseLazyFragment {
@Override @Override
protected void initView() { protected void initView() {
findView(); findView();
username = App.getInstance().getUserInfo().getManid();
//android 10 以上 //android 10 以上
if (requireActivity().getExternalFilesDir(null) != null) { if (requireActivity().getExternalFilesDir(null) != null) {
@ -135,6 +152,8 @@ public class MineFragment extends BaseLazyFragment {
tvAccount = view.findViewById(R.id.tv_account); tvAccount = view.findViewById(R.id.tv_account);
tvLoginOut = view.findViewById(R.id.tv_login_out); tvLoginOut = view.findViewById(R.id.tv_login_out);
tvVersionName = view.findViewById(R.id.tv_versionName); tvVersionName = view.findViewById(R.id.tv_versionName);
ll_count_to_do = view.findViewById(R.id.ll_count_to_do);
tv_count_to_do = view.findViewById(R.id.tv_count_to_do);
@ -173,6 +192,20 @@ public class MineFragment extends BaseLazyFragment {
dialog1.show(); dialog1.show();
} }
}); });
//待办
ll_count_to_do.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intentWaitFor = new Intent(requireActivity(), WaitForToDoActivity.class);
intentWaitFor.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
String typeWaitFor = "待办";
String urlWaitFor = "https://mis.dywzhny.com.cn/mobile/workflow/list/todo?cusMenuId=5116426542447237804&urlPageTitle=5b6F5Yqe5rWB56iL";
intentWaitFor.putExtra("type",typeWaitFor);
intentWaitFor.putExtra("urlLog",urlWaitFor);
startActivity(intentWaitFor);
}
});
} }
@ -194,6 +227,7 @@ public class MineFragment extends BaseLazyFragment {
clearImageDiskCache(getActivity()); clearImageDiskCache(getActivity());
loadImage(); loadImage();
getWaitForToDo();
} }
@Override @Override
@ -758,4 +792,49 @@ public class MineFragment extends BaseLazyFragment {
intent.putExtra("noFaceDetection", true); // no face detection intent.putExtra("noFaceDetection", true); // no face detection
startActivityForResult(intent, flags); startActivityForResult(intent, flags);
} }
private void getWaitForToDo() {
HashMap<String,String> param = new HashMap<>();
param.put("YHID",username);
String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO;
showLog(url);
final Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
request.setDefineRequestBodyForJson(GsonUtils.GsonString(param));
NoProgresshttpUtils.getInstance().addQj(requireActivity(), 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----------");
showLog(result);
WaitForBean waitForBean = GsonUtils.GsonToBean(result,WaitForBean.class);
if(waitForBean!=null){
if(!TextUtils.isEmpty(waitForBean.getTotal())){
tv_count_to_do.setText(waitForBean.getTotal());
if(Integer.valueOf(waitForBean.getTotal()).intValue()==0){
tv_count_to_do.setVisibility(View.GONE);
}else{
tv_count_to_do.setVisibility(View.VISIBLE);
}
}else{
tv_count_to_do.setVisibility(View.GONE);
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
}
});
}
} }

@ -10,22 +10,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月07日"); Date date = sdFormat.parse("2024年08月31日");
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {
return true;
}
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
public static boolean checkCanLoginToken(){
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月04日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -42,7 +27,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月06日"); Date date = sdFormat.parse("2024年08月31日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -58,7 +43,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月03日"); Date date = sdFormat.parse("2024年08月31日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -73,7 +58,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月06日"); Date date = sdFormat.parse("2024年08月31日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {

@ -79,7 +79,7 @@ public class NohttpUtils {
*/ */
public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback, boolean canCanel, boolean isLoading, String msg) { public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback, boolean canCanel, boolean isLoading, String msg) {
if(App.getInstance().getUserInfo()!=null){ if(App.getInstance().getUserInfo()!=null){
if(DataPassUtils.checkCanLoginToken()){ if(DataPassUtils.checkCanLoginTokenLong()){
//showLog("之前"); //showLog("之前");
String token = App.getInstance().getUserInfo().getToken(); String token = App.getInstance().getUserInfo().getToken();
showLog(token); showLog(token);
@ -100,7 +100,7 @@ public class NohttpUtils {
public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback) { public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback) {
if(App.getInstance().getUserInfo()!=null){ if(App.getInstance().getUserInfo()!=null){
if(DataPassUtils.checkCanLoginToken()){ if(DataPassUtils.checkCanLoginTokenLong()){
//showLog("之前"); //showLog("之前");
String token = App.getInstance().getUserInfo().getToken(); String token = App.getInstance().getUserInfo().getToken();
showLog(token); showLog(token);
@ -120,7 +120,7 @@ public class NohttpUtils {
public <T> void addNoProgress(Context context, int what, Request<T> request, HttpListener<T> callback) { public <T> void addNoProgress(Context context, int what, Request<T> request, HttpListener<T> callback) {
if(App.getInstance().getUserInfo()!=null){ if(App.getInstance().getUserInfo()!=null){
if(DataPassUtils.checkCanLoginToken()){ if(DataPassUtils.checkCanLoginTokenLong()){
//showLog("之前"); //showLog("之前");
String token = App.getInstance().getUserInfo().getToken(); String token = App.getInstance().getUserInfo().getToken();
showLog(token); showLog(token);

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.UseCarActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="?attr/colorPrimary"
android:titleTextColor="@android:color/white"
app:theme="@style/Widget.AppCompat.Toolbar"
app:titleTextColor="@android:color/white">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="20sp"/>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.UseSealActivity">
<include
android:id="@+id/toolbarView"
android:visibility="visible"
layout="@layout/layout_base" />
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.WaitForToDoActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="?attr/colorPrimary"
android:titleTextColor="@android:color/white"
app:theme="@style/Widget.AppCompat.Toolbar"
app:titleTextColor="@android:color/white">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="20sp"/>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.WaitForToDoBaseActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="?attr/colorPrimary"
android:titleTextColor="@android:color/white"
app:theme="@style/Widget.AppCompat.Toolbar"
app:titleTextColor="@android:color/white">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="20sp"/>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

@ -299,6 +299,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="" android:text=""
android:layout_marginBottom="5dp"
android:textSize="@dimen/sbtextSize" /> android:textSize="@dimen/sbtextSize" />
</LinearLayout> </LinearLayout>

@ -27,6 +27,7 @@
android:textColor="#0E2E59" android:textColor="#0E2E59"
android:textSize="22sp" /> android:textSize="22sp" />
<LinearLayout <LinearLayout
android:id="@+id/ll_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/home_wait_to_do" android:background="@drawable/home_wait_to_do"
@ -56,7 +57,7 @@
android:text="0" android:text="0"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:textColor="#267AE4" android:textColor="#267AE4"
android:textSize="18sp" /> android:textSize="20sp" />
</LinearLayout> </LinearLayout>

@ -82,8 +82,58 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="30px" /> android:textSize="30px" />
<View
android:layout_width="match_parent"
android:layout_height="25px" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_wait_to_do"
android:layout_width="match_parent"
android:layout_height="100px"
android:drawableLeft="@drawable/icon_apply"
android:drawablePadding="40px"
android:gravity="center_vertical"
android:background="@drawable/login_edit"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:padding="20px"
android:text="待办"
android:textColor="@color/black"
android:textSize="30px" />
<LinearLayout
android:id="@+id/ll_count_to_do"
android:layout_width="match_parent"
android:layout_height="100px"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_count_to_do"
android:layout_width="wrap_content"
android:background="@drawable/text_red_circ"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="6px"
android:text=""
android:visibility="gone"
android:textColor="@color/black"
android:textSize="30px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginEnd="25dp"
android:layout_marginRight="60dp"
android:background="@drawable/packup"
android:textColor="@color/black"
android:textSize="30px" />
</LinearLayout>
</FrameLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

@ -4,10 +4,20 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.rehome.dywoa.weiget.NoscrollViewPager <com.rehome.dywoa.weiget.NoscrollViewPager
android:id="@+id/vp" android:id="@+id/vp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="700px" android:layout_height="650px"
android:layout_margin="@dimen/px_5"> android:layout_margin="@dimen/px_5">
</com.rehome.dywoa.weiget.NoscrollViewPager> </com.rehome.dywoa.weiget.NoscrollViewPager>
@ -67,12 +77,26 @@
android:gravity="center" android:gravity="center"
android:text="标准" android:text="标准"
android:textColor="#777777" /> android:textColor="#777777" />
<View <View
android:layout_width="1px" android:layout_width="1px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#99000000"> android:background="#99000000">
</View>
<Button
android:id="@+id/btn_submit_qx"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="5dp"
android:paddingRight="5dp"
android:textColor="#777777"
android:textSize="14sp"
android:text="提交缺陷" />
<View
android:layout_width="1px"
android:layout_height="match_parent"
android:background="#99000000">
</View> </View>
</com.rehome.dywoa.weiget.AutoRadioGroup> </com.rehome.dywoa.weiget.AutoRadioGroup>
@ -118,17 +142,6 @@
android:layout_width="@dimen/px_170" android:layout_width="@dimen/px_170"
android:text="退出" /> android:text="退出" />
</LinearLayout> </LinearLayout>
<LinearLayout </LinearLayout>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:orientation="horizontal">
<Button
android:id="@+id/btn_submit_qx"
style="@style/button_qx_submit"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/colorPrimary"
android:text="提交缺陷"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

@ -27,7 +27,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:maxHeight="120px" android:maxHeight="120px"
android:text="设备名称:" android:text="区域名称:"
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
<TextView <TextView
@ -36,7 +36,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|left" android:gravity="center_vertical|left"
android:maxHeight="120px" android:maxHeight="120px"
android:text="设备名称" android:text=""
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
</LinearLayout> </LinearLayout>
@ -52,7 +52,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:maxHeight="120px" android:maxHeight="120px"
android:text="部件名称:" android:text="系统名称:"
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
<TextView <TextView
@ -61,7 +61,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|left" android:gravity="center_vertical|left"
android:maxHeight="120px" android:maxHeight="120px"
android:text="部件名称" android:text=""
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -93,7 +93,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -117,7 +117,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -152,7 +152,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -176,7 +176,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -211,7 +211,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -235,7 +235,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -269,7 +269,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -303,7 +303,7 @@
android:textSize="@dimen/sbtextSize" android:textSize="@dimen/sbtextSize"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="dfkdf" android:text=""
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -433,7 +433,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|left" android:gravity="center_vertical|left"
android:maxHeight="350px" android:maxHeight="350px"
android:text="巡查内容" android:text=""
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

Loading…
Cancel
Save