From 89357dad649e953bc82b136ae7acf84df432cf94 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 24 Mar 2023 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=AD=A3=E5=BC=8F=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +-- app/release/output-metadata.json | 20 +++++++++++++ .../com/tenlion/xztouch/MainActivity.java | 22 +++++++------- .../xztouch/beans/DeviceParamsBean.java | 11 +++++++ .../tenlion/xztouch/push/ServerClient.java | 1 + .../baselib/constant/PathConfig.java | 2 +- .../update/utils/NotificationHelper.java | 2 +- .../baselib/core/retrofit_net/BaseUrlApi.java | 15 +++++----- .../main/res/drawable-xhdpi/ic_volume_off.png | Bin 0 -> 1398 bytes .../main/res/drawable-xhdpi/ic_volume_on.png | Bin 0 -> 899 bytes .../drawable/switch_volume_track_selector.xml | 5 ++++ .../main/res/layout/dialog_bottom_setting.xml | 27 +++++++++++------- baselib/src/main/res/values/strings.xml | 6 ++-- common.gradle | 4 +-- 14 files changed, 82 insertions(+), 37 deletions(-) create mode 100644 app/release/output-metadata.json create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_volume_off.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_volume_on.png create mode 100755 baselib/src/main/res/drawable/switch_volume_track_selector.xml diff --git a/app/build.gradle b/app/build.gradle index daa8bf6..7f7f5c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { compileSdk gCompileSdkVersion defaultConfig { - applicationId "com.tenlion.xztouch" + applicationId "com.tengshisoft.hanging" minSdk gMinSdkVersion targetSdk gTargetSdkVersion versionCode gVersionCode @@ -44,5 +44,5 @@ dependencies { implementation project(":baselib") implementation project(":moduleijkplayer") implementation files("libs/sdkapi.jar") - implementation 'com.koushikdutta.async:androidasync:2.+' + implementation 'com.koushikdutta.async:androidasync:2.2.1' } \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..e6247bb --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.tengshisoft.hanging", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 11, + "versionName": "1.1.1", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/java/com/tenlion/xztouch/MainActivity.java b/app/src/main/java/com/tenlion/xztouch/MainActivity.java index 789ba37..5f8f2d9 100644 --- a/app/src/main/java/com/tenlion/xztouch/MainActivity.java +++ b/app/src/main/java/com/tenlion/xztouch/MainActivity.java @@ -407,7 +407,8 @@ public class MainActivity extends Activity { if (showTemplateAreaAppDTOListBean.getDataTypesettingRotation() != 0) { i = showTemplateAreaAppDTOListBean.getDataTypesettingRotation(); } - List showDeviceTemplateAreaDataAppDTOList = showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList(); + List showDeviceTemplateAreaDataAppDTOList = + showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList(); this.mCurrentWeb2Pos = 0; webView.setWebChromeClient(new WebChromeClient() { public boolean onConsoleMessage(ConsoleMessage consoleMessage) { @@ -636,7 +637,8 @@ public class MainActivity extends Activity { if (showTemplateAreaAppDTOListBean.getDataTypesettingRotation() != 0) { i = showTemplateAreaAppDTOListBean.getDataTypesettingRotation(); } - List showDeviceTemplateAreaDataAppDTOList = showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList(); + List showDeviceTemplateAreaDataAppDTOList = + showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList(); this.mCurrentWebPos = 0; webView.setWebChromeClient(new WebChromeClient() { public boolean onConsoleMessage(ConsoleMessage consoleMessage) { @@ -771,8 +773,8 @@ public class MainActivity extends Activity { MainActivity.this.runOnUiThread(() -> { MainActivity.this.mVideoView.release(); MainActivity.this.mVideoTextView.setText(MainActivity.this.mVideoList.get(MainActivity.this.mCurrentVideoPosition).getDataItemContent()); - VideoView access$600 = MainActivity.this.mVideoView; - access$600.setUrl(MainActivity.this.mBaseUrl + BaseUrlApi.BASE_IMG_U + MainActivity.this.mVideoList.get(MainActivity.this.mCurrentVideoPosition).getDataItemFileId()); + VideoView videoView = MainActivity.this.mVideoView; + videoView.setUrl(MainActivity.this.mBaseUrl + BaseUrlApi.BASE_IMG_U + MainActivity.this.mVideoList.get(MainActivity.this.mCurrentVideoPosition).getDataItemFileId()); MainActivity.this.mVideoView.start(); }); } @@ -871,11 +873,11 @@ public class MainActivity extends Activity { deviceParamsBean.setDeviceIp(str2); deviceParamsBean.setDeviceDirection(str7); deviceParamsBean.setDeviceResolvingPower(str6); + LogUtils.e(deviceParamsBean); + RequestBody body = RequestBody.create(new Gson().toJson(deviceParamsBean), MediaType.parse("application/json;charset=utf-8")); RetrofitManager.getInstance() .create(NetApi.class) - .doSaveParams(str + "/app/showdevice/updateshowdevicebycoderelease/" + str3, - RequestBody.create(MediaType.parse("application/json; " + - "charset=utf-8"), new Gson().toJson(deviceParamsBean))) + .doSaveParams(str + "/app/showdevice/updateshowdevicebycoderelease/" + str3, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -981,8 +983,7 @@ public class MainActivity extends Activity { public void checkAppVersion() { RetrofitManager.getInstance() .create(BaseApiService.class) - .doCheckAppVersion("http://192.168.1.100:7001/usercenter/app/appversion/getappversionnumber/99506245" + - "-ed25-4dc9-bd0e-f3767d8fc96b") + .doCheckAppVersion(this.mBaseUrl+BaseUrlApi.APP_VERSION_URL) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -1056,6 +1057,7 @@ public class MainActivity extends Activity { MainActivity.this.mDeviceCode = SPUtils.getInstance().getString("deviceCode"); MainActivity.this.getShowData(); } else if (PathConfig.ACTION_SHUT_DOWN.equals(action)) { + LogUtils.e("关机" + intent.getStringExtra("openTime")); MainActivity.this.shutDownDevice(intent.getStringExtra("openTime")); } else if (PathConfig.ACTION_DO_UPDATE_APP.equals(action)) { MainActivity.this.checkAppVersion(); @@ -1140,7 +1142,7 @@ public class MainActivity extends Activity { public void startDownloadApk() { ToastUtils.show((CharSequence) "开始下载,请在通知栏查看下载进度"); Intent intent = new Intent(this, DownloadService.class); - intent.putExtra("downloadUrl", BaseUrlApi.APP_DOWNLOAD_URL); + intent.putExtra("downloadUrl", this.mBaseUrl+BaseUrlApi.APP_DOWNLOAD_URL); startService(intent); } } \ No newline at end of file diff --git a/app/src/main/java/com/tenlion/xztouch/beans/DeviceParamsBean.java b/app/src/main/java/com/tenlion/xztouch/beans/DeviceParamsBean.java index 7de057c..0ff83b6 100644 --- a/app/src/main/java/com/tenlion/xztouch/beans/DeviceParamsBean.java +++ b/app/src/main/java/com/tenlion/xztouch/beans/DeviceParamsBean.java @@ -46,4 +46,15 @@ public class DeviceParamsBean { public void setDeviceResolvingPower(String str) { this.deviceResolvingPower = str; } + + @Override + public String toString() { + return "DeviceParamsBean{" + + "deviceDirection='" + deviceDirection + '\'' + + ", deviceHeight='" + deviceHeight + '\'' + + ", deviceIp='" + deviceIp + '\'' + + ", deviceResolvingPower='" + deviceResolvingPower + '\'' + + ", deviceWidth='" + deviceWidth + '\'' + + '}'; + } } diff --git a/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java b/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java index f701cff..e508a16 100755 --- a/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java +++ b/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java @@ -247,6 +247,7 @@ public class ServerClient extends Service { sendBroadcast(intent); response.code(200); response.send("成功"); + LogUtils.e("发送关机成功"); } catch (Exception e) { e.printStackTrace(); response.code(500); diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 3fe1bc6..600b1d3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -83,7 +83,7 @@ public class PathConfig { public static final String SECRET = "CMXX_TOKEN_INFOS";//秘钥 public static final String SOCKET_MSG_SECRET = "SocKEtsEcReT_KeY";//消息秘钥 public static final String PROJECT_NAME = "city-governance";/* ===项目名称==*/ - public static final String PROJECT_NAME_CH = "市域治理"; + public static final String PROJECT_NAME_CH = "展览系统"; public static final String USER_TYPE_LEADER = "b01dac8e-c516-4974-b513-f1352ca40202"; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java index 202a26b..7e8eddd 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java @@ -74,7 +74,7 @@ public class NotificationHelper { private NotificationCompat.Builder getNofity(String text) { return new NotificationCompat.Builder(mContext.getApplicationContext(), CHANNEL_ID) .setTicker(mContext.getString(R.string.android_auto_update_notify_ticker)) - .setContentTitle("市域治理") + .setContentTitle("展览系统") .setContentText(text) .setSmallIcon(R.drawable.app_logo_smal) .setAutoCancel(true) diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 86e4d2f..e5b73dd 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -7,10 +7,9 @@ package com.tenlionsoft.baselib.core.retrofit_net; */ public class BaseUrlApi { - // public static final String IP = "http://192.168.0.155:7011/";/* 测试IP */ -// public static final String IP = "http://10.25.242.183:80/";/* 测试IP */ - public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ - public static final String BASE_DISPLAY_SYSTEM = "http://192.168.0.104:8086/show/"; + public static final String IP = "http://192.168.0.120:8081/";/* 测试IP */ + // public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ + public static final String BASE_DISPLAY_SYSTEM = "http://192.168.0.120:8081/xzszwhy/"; public static final String SYS_USERCENTER = "usercenter/"; public static final String SYS_POPULATION = "population/";/*人口系统*/ public static final String SYS_CASE = "case/";/*事件部件*/ @@ -59,13 +58,15 @@ public class BaseUrlApi { // public static final String APP_VERSION_ID = "2f384d5c-419d-47a2-94cb-4a05b6f00936";/*测试App下载码*/ // public static final String APP_VERSION_ID = "c16826e7-8cfb-4db1-8844-09d2be697bc7";/* 155 测试App下载码*/ - public static final String APP_VERSION_ID = "e2f64ae0-69a5-454c-8471-483291a7bfb1";/*正式App下载码*/ - public static final String BASE_IMG_U = "/route/file/downloadfile/true/"; + public static final String APP_VERSION_ID = "99506245-ed25-4dc9-bd0e-f3767d8fc96b";/*正式App下载码*/ + public static final String BASE_IMG_U = "/route/file/download/true/"; /*======百度定位city-code=======*/ public static final String CITY_BAIDU_CODE = "168";//乌兰察布市 // public static final String CITY_BAIDU_CODE = "321";//呼和浩特市 - public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + APP_VERSION_ID; + public static final String APP_DOWNLOAD_URL = "/app/appversion/download/" + APP_VERSION_ID; + // intent.putExtra("downloadUrl", this.mBaseUrl + "/app/appversion/download/e2f64ae0-69a5-454c-8471-483291a7bfb1"); + public static final String APP_VERSION_URL = "/app/appversion/get-number/99506245-ed25-4dc9-bd0e-f3767d8fc96b"; /*========融合通信========*/ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_volume_off.png b/baselib/src/main/res/drawable-xhdpi/ic_volume_off.png new file mode 100644 index 0000000000000000000000000000000000000000..fb96883abf1099270798c5f9bf999952f48b7e98 GIT binary patch literal 1398 zcmV-+1&R8JP)Px)FiAu~RA@u(nO%rmMHI)+xyeS8rKM`I6k8~MLMs7kYL)vApe9ZNQ7jgR z>-GBU0I<4Uh(rOnu6s8k&RCZ9qm=TsPPx)i#yAi{2oC@zOkz6&v0C2U5^Quo2fDqz40Jtt-ClbO4zyzXHDqX1{q?Fg1K(qn47XaP~ z+NjlPTPG(cKM8(r3}6Bwgt!b5-;`1=s$OxckPzY_08omynw0XZY&Lu6=;-L#(0#xk zv>gC8giLsvh(=5x3WdUkR4Vlb01PEb;^vqz2t@Q4V-y9TD#xR3COvElF*P-{K9k8D z0)X30%BZS5sZ?sGl=4zU9Ak`qti}l;)CRc7Vau|%PfSd_-?ZBbAt8h`h+Sida=E;= zTCFOGJ356B=lmB$yxi}1bbfw*$Z?!Xu~=MPuh)+Nz*U-!mx)Mikc}1>K#ehm@I3Eg zDWy_&YY;+D;*iqGh^Xj?>@$e?qBi~n5v}V6AQpt$l?Mg}W~G$dbO;?l2=NpEyrO;o zYbKK!8XFrsRVtO%*J`z&03g?L8gaN8W=Rxi+A&t5TrRJwR;#lBpo&DJ1l+CYUx_klQ%XMIsXH_ADG5&)DM zYukYYkJCvZdZvKxY(Aggm`bG-!~;E(beeN+tK0y9R1hTUWiA5Z2O`?k z*Bppi=|Z8f#V@zFYJDOd@{?BmI;21CpF05MkmES#XR}!qQtEZ@n3VGKPQUhep0`Iz zsW#Ws?fUmMgiNYYw|$lYx?RC;$1f|;?Fx1~e#tBF58hWIURf1$!vFvP07*qoM6N<$ Ef@TDFrvLx| literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_volume_on.png b/baselib/src/main/res/drawable-xhdpi/ic_volume_on.png new file mode 100644 index 0000000000000000000000000000000000000000..685e1e2191fc04626981e0d2ed8bbda0d30d57fa GIT binary patch literal 899 zcmV-}1AP36P)Px&JxN4CRA@u(nM-IBQ51&%bFENpX5ykC3YBCMMC_t2EJ(Z1c2Y%9H=+v_1sAnT zm5R&OZ9zp5L`xA@MO}&;^Kv1GqC!qZ0eVEeBZ>x)KcIz@j%4m+Mx+CO2GP3la&h)R^+Du+6_8_jiepzjAy?t22nLY zRB;D1u)gxmi%ntyAPb<$q~{3)9Z_Sccq#o=0fc?>9&j$^-AlQ-T!4_*Jw(K37wY0M z(SShLyUe8dUBv(que6^j7xQbDOU`lubUk53x&zR`1v-g`)p(}2CIAt|eSqh}X7zH$ z>+h`q=;I@be42ra3v@H}s>#%_QC{%C-*C7Bz+aA0R>oKbn1gVu3=Wy*nIsm0?&OcL zygUaG@;0p_TJ^<>QC7w-1`t-{0YUUuBaExD)C;rDu;T6m_?k(6Sxux*6#)blc~AfY zR*bSTwiJMA&fj44mufjeUilUgjv3~goSmL&+x2m3LYL({Ur`JrSSO$xM$-`Ep22rtaDf z5cSD^jWJ%dy3GB7WadI%7TqK@Ycuq%$Vn9bfV7bhQ)L>iarCtyZ#9J#`OMx^lJp Z?hm|!PEV= + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/dialog_bottom_setting.xml b/baselib/src/main/res/layout/dialog_bottom_setting.xml index 9971355..ee5e209 100755 --- a/baselib/src/main/res/layout/dialog_bottom_setting.xml +++ b/baselib/src/main/res/layout/dialog_bottom_setting.xml @@ -283,23 +283,28 @@ + android:layout_marginLeft="20dp" + android:background="@drawable/switch_volume_track_selector" + android:gravity="center_vertical" + android:switchMinWidth="40dp" + android:switchPadding="0dp" + android:textOff="" + android:textOn="" + app:showText="false" + app:splitTrack="false" + app:theme="@style/scstyle" + app:thumbTint="#00000000" + app:trackTint="#00000000" /> diff --git a/baselib/src/main/res/values/strings.xml b/baselib/src/main/res/values/strings.xml index 0fefd08..6394e9d 100755 --- a/baselib/src/main/res/values/strings.xml +++ b/baselib/src/main/res/values/strings.xml @@ -30,7 +30,7 @@ 正在下载:%1$d%% 正在检查版本 - 市域治理 + 展览系统 未录入 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789 @@ -50,8 +50,8 @@ 权限被禁止，无法选择本地图片 - 触摸机 - 壁挂机 + 竖屏显示 + 横屏显示 App diff --git a/common.gradle b/common.gradle index 92470bc..3ffa43e 100644 --- a/common.gradle +++ b/common.gradle @@ -2,8 +2,8 @@ ext{ gCompileSdkVersion = 32 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 3 - gVersionName = '1.0.2' + gVersionCode = 11 + gVersionName = '1.1.1' gBuildToolsVersion = "30.0.3" // gVersionCode=26 // gVersionName='1.3.0'