gaojian/xz_touch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布正式版

Browse Source
This commit is contained in:
itgaojian 2023-03-24 17:09:51 +08:00
parent a78137b703
commit 89357dad64
14 changed files with 82 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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'
}

20
app/release/output-metadata.json Normal file
View File

@ -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"
}

22
app/src/main/java/com/tenlion/xztouch/MainActivity.java
View File

@ -407,7 +407,8 @@ public class MainActivity extends Activity {
if (showTemplateAreaAppDTOListBean.getDataTypesettingRotation() != 0) {
i = showTemplateAreaAppDTOListBean.getDataTypesettingRotation();
}
List<TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean> showDeviceTemplateAreaDataAppDTOList = showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList();
List<TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean> 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<TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean> showDeviceTemplateAreaDataAppDTOList = showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList();
List<TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean> 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<BaseUserInfo>() {
@ -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<VersionBean>() {
@ -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);
}
}

11
app/src/main/java/com/tenlion/xztouch/beans/DeviceParamsBean.java
View File

@ -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 + '\'' +
'}';
}
}

1
app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
View File

@ -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);

2
baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
View File

@ -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";

2
baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java
View File

@ -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)

15
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
View File

@ -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";
/*========融合通信========*/

BIN
baselib/src/main/res/drawable-xhdpi/ic_volume_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
baselib/src/main/res/drawable-xhdpi/ic_volume_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 899 B

5
baselib/src/main/res/drawable/switch_volume_track_selector.xml Executable file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_volume_on" android:state_checked="true" />
<item android:drawable="@drawable/ic_volume_off" android:state_checked="false" />
</selector>

27
baselib/src/main/res/layout/dialog_bottom_setting.xml
View File

@ -283,23 +283,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_bottom_line"
android:gravity="right"
android:gravity="left"
android:minHeight="25dp">
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/sc_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="25dp"
android:layout_height="22dp"
android:layout_gravity="center_vertical"
android:gravity="center"
android:longClickable="false"
android:textColor="@color/black"
android:textOff="On"
android:textOn="Off"
app:showText="true"
app:switchPadding="5dp"
app:switchTextAppearance="@style/Text" />
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" />
</LinearLayout>
</LinearLayout>

6
baselib/src/main/res/values/strings.xml
View File

@ -30,7 +30,7 @@
<string name="android_auto_update_download_progress">正在下载:%1$d%%</string>
<string name="android_auto_update_dialog_checking">正在检查版本</string>
<string name="default_channel">市域治理</string>
<string name="default_channel">展览系统</string>
<string name="uninput">未录入</string>
<string name="limit_id_card">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
<string name="limit_phone">0123456789</string>
@ -50,8 +50,8 @@
<string name="cloudLink_permission_prohibited">权限被禁止，无法选择本地图片</string>
<array name="actionArray">
<item>触摸机</item>
<item>壁挂机</item>
<item>竖屏显示</item>
<item>横屏显示</item>
</array>
<array name="readTypeArray">
<item>App</item>

4
common.gradle
View File

@ -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'