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

编译

Browse Source
This commit is contained in:
itgaojian 2024-02-22 10:37:26 +08:00
parent c438354e3a
commit 05a844da2f
22 changed files with 83 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="17" />
</component>
</project>

17
.idea/deploymentTargetDropDown.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="10HC690BJT0005G" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-12-17T04:39:44.294612Z" />
</component>
</project>

3
.idea/misc.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
app/build.gradle
View File

@ -7,7 +7,7 @@ android {
compileSdk gCompileSdkVersion
defaultConfig {
applicationId "com.tenlionsoft.xzdisplay"
applicationId "com.tengshisoft.displaysystem"
minSdk gMinSdkVersion
targetSdk gTargetSdkVersion
versionCode gVersionCode

6
app/release/output-metadata.json
View File

@ -4,15 +4,15 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.tenlionsoft.xzdisplay",
"applicationId": "com.tengshisoft.displaysystem",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 27,
"versionName": "1.2.7",
"versionCode": 28,
"versionName": "1.2.8",
"outputFile": "app-release.apk"
}
],

1
app/src/main/AndroidManifest.xml
View File

@ -19,6 +19,7 @@
android:fullBackupContent="@xml/backup_rules"
android:icon="@drawable/app_logo"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_config"
android:roundIcon="@drawable/app_logo"
android:supportsRtl="true"
android:theme="@style/Theme.Xzdisplay"

2
app/src/main/assets/html/xz_screen/contact.html
View File

@ -102,7 +102,7 @@
date: '',
time: '',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/false/',
menuList: [],
floorList: [],
temperature: '',

2
app/src/main/assets/html/xz_screen/detail.html
View File

@ -84,7 +84,7 @@
date: '',
time: '',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/false/',
menuList: [],
floorList: [],
temperature: '',

2
app/src/main/assets/html/xz_screen/img-list.html
View File

@ -86,7 +86,7 @@
date: '',
time: '',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/false/',
menuList: [],
floorList: [],
temperature: '',

2
app/src/main/assets/html/xz_screen/list.html
View File

@ -87,7 +87,7 @@
date: '',
time: '',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/false/',
menuList: [],
floorList: [],
temperature: '',

4
app/src/main/assets/html/xz_screen/venue-guide.html
View File

@ -93,7 +93,7 @@
date: '2020-01-01',
time: '00:00:00',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/false/',
menuList: [],
floorList: [],
temperature: '',
@ -210,6 +210,8 @@
},
mounted: function () {
var self = this
<!-- self.url= 'https://www.xzszwhy.cn/show';-->
<!-- self.deviceCode='RKZ01H11';-->
self.url = localStorage.getItem('url')
self.deviceCode = localStorage.getItem('deviceCode')
setInterval(function () {

2
app/src/main/assets/html/xz_screen/venue-intro.html
View File

@ -77,7 +77,7 @@
date: '',
time: '',
url: '',
sourcePath: '/route/file/downloadfile/false/',
sourcePath: '/route/file/download/true/',
menuList: [],
venueIntro: {},
tab: '*',

2
app/src/main/assets/html/xz_screen49/img-mid.html
View File

@ -15,7 +15,7 @@
<div class="bd">
<ul>
<li v-for="img in imgList">
<img :src="url + '/route/file/downloadfile/false/' + img.dataItemFileId" alt="">
<img :src="url + '/route/file/download/false/' + img.dataItemFileId" alt="">
</li>
</ul>
</div>

6
app/src/main/assets/html/xz_screen49/index.html
View File

@ -39,7 +39,7 @@
playing: {},
toTop: 0,
sideList: [],
sourcePath: '/route/file/downloadfile/true/'
sourcePath: '/route/file/download/true/'
},
methods: {
changeVideo: function (idx) {
@ -93,8 +93,8 @@
var self = this
self.url = window.AppInterface.getBaseUrl()
self.deviceCode = window.AppInterface.getDeviceCode()
// self.url = 'https://www.wgink.ink/show'
// self.deviceCode = 'RKZ01H13'
// self.url = 'https://www.xzszwhy.cn/show'
// self.deviceCode = 'RKZ01H11'
localStorage.setItem('url', self.url)
localStorage.setItem('deviceCode', self.deviceCode)
self.getList()

46
app/src/main/java/com/tenlionsoft/xzdisplay/MainActivity.java
View File

@ -113,13 +113,13 @@ public class MainActivity extends Activity {
intentFilter.addAction(PathConfig.ACTION_APP_INSTALL);
registerReceiver(this.mBoradCast, intentFilter);
checkAppVersion();
// getWeather();
}
private void checkAppVersion() {
RetrofitManager.getInstance()
.create(BaseApiService.class)
.doCheckAppVersion("http://www.xzszwhy.cn/usercenter/app/appversion/getappversionnumber/e2f64ae0" +
"-69a5-454c-8471-483291a7bfb1")
.doCheckAppVersion(this.mBaseUrl + BaseUrlApi.APP_VERSION_URL)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<VersionBean>() {
@ -149,6 +149,7 @@ public class MainActivity extends Activity {
@Override
public void onError(@NonNull Throwable e) {
LogUtils.e("错误");
e.printStackTrace();
ExceptionHandler.handleException(e);
}
@ -308,6 +309,7 @@ public class MainActivity extends Activity {
public void onPageFinished(WebView webView, String str) {
super.onPageFinished(webView, str);
LogUtils.e(webView.getUrl() + "===" + str);
}
public boolean shouldOverrideUrlLoading(WebView webView, String str) {
@ -350,9 +352,7 @@ public class MainActivity extends Activity {
private void startDownloadApk() {
ToastUtils.show("开始下载");
Intent intent = new Intent((Context) this, DownloadService.class);
intent.putExtra("downloadUrl", "http://192.168.1.100:7001/usercenter/app/appversion/downloadapp/e2f64ae0-69a5" +
"-454c-8471" +
"-483291a7bfb1");
intent.putExtra("downloadUrl", this.mBaseUrl + "/app/appversion/download/e2f64ae0-69a5-454c-8471-483291a7bfb1");
startService(intent);
}
@ -742,4 +742,40 @@ public class MainActivity extends Activity {
});
}
public void getWeather(){
RetrofitManager.getInstance()
.create(ApiDisplay.class)
.getWeather("日喀则","")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Object>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Object o) {
}
@Override
public void onError(@NonNull Throwable e) {
}
@Override
public void onComplete() {
}
});
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mBoradCast != null) {
unregisterReceiver(mBoradCast);
}
}
}

5
app/src/main/java/com/tenlionsoft/xzdisplay/net/ApiDisplay.java
View File

@ -12,6 +12,7 @@ import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Headers;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.Url;
public interface ApiDisplay {
@ -38,4 +39,8 @@ public interface ApiDisplay {
@GET
@Headers({"base_url_name:displaysystem", "Content-Type:application/json", "Accept:application/json"})
Observable<ShowDataBean> getShowDataList(@Url String str);
@GET("http://apis.juhe.cn/simpleWeather/query")
@Headers({"Content-Type:application/x-www-form-urlencoded", "Accept:application/json"})
Observable<Object> getWeather(@Query("city") String city, @Query("key") String key);
}

2
app/src/main/res/values/strings.xml
View File

@ -1,3 +1,3 @@
<resources>
<string name="app_name">公共文化展览系统</string>
<string name="app_name">公共文化展览系统(触摸机)</string>
</resources>

10
app/src/main/res/xml/network_config.xml Executable file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true" />
<debug-overrides>
<trust-anchors>
<certificates src="user" />
<certificates src="system" />
</trust-anchors>
</debug-overrides>
</network-security-config>

2
baselib/build.gradle
View File

@ -89,7 +89,7 @@ dependencies {
api "io.github.razerdp:BasePopup:$rootProject.popup_version"
//选择器
api 'io.github.lucksiege:pictureselector:v2.7.3-rc08'
api 'me.rosuh:AndroidFilePicker:0.7.0-x'
api 'me.rosuh:AndroidFilePicker:0.8.3'
//toast
api 'com.github.getActivity:ToastUtils:9.5'

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

@ -10,7 +10,8 @@ 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 BASE_DISPLAY_SYSTEM = "http://192.168.0.104:8086/show/";
public static final String BASE_DISPLAY_SYSTEM = "https://www.xzszwhy.cn/xzszwhy";
public static final String SYS_USERCENTER = "usercenter/";
public static final String SYS_POPULATION = "population/";/*人口系统*/
public static final String SYS_CASE = "case/";/*事件部件*/
@ -56,6 +57,7 @@ public class BaseUrlApi {
public static final String SMART_CONSULT_URL = "https://www.cispirit.com/IntelligentConsulting";
public static final String APP_VERSION_URL = "/app/appversion/get-number/e2f64ae0-69a5-454c-8471-483291a7bfb1";
// 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下载码*/

2
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/RetrofitManager.java
View File

@ -68,7 +68,7 @@ public class RetrofitManager {
builder.addInterceptor(new AreaInterceptor());
//builder.addInterceptor(new CommInterceptor());
//多BaseUrl连接器
builder.addInterceptor(new BaseUrlInterceptor());
// builder.addInterceptor(new BaseUrlInterceptor());
return builder;
}

4
common.gradle
View File

@ -2,8 +2,8 @@ ext{
gCompileSdkVersion = 32
gMinSdkVersion = 21
gTargetSdkVersion = 30
gVersionCode = 27
gVersionName = '1.2.7'
gVersionCode = 28
gVersionName = '1.2.8'
gBuildToolsVersion = "29.0.2"
// gVersionCode=26
// gVersionName='1.3.0'