diff --git a/.gitignore b/.gitignore
index aa724b7..603b140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@
/captures
.externalNativeBuild
.cxx
-local.properties
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 59f6372..4bc4fc6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bfe044..adba28b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
@@ -18,13 +17,13 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@drawable/app_logo"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
- android:supportsRtl="true"
+ android:allowNativeHeapPointerTagging="false"
android:networkSecurityConfig="@xml/network_config"
- android:theme="@style/Theme.Xztouch"
- >
+ android:roundIcon="@drawable/app_logo"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.Xztouch">
{
int i = mCurrentAudioPos + 1;
mCurrentAudioPos = i;
@@ -778,20 +768,14 @@ public class MainActivity extends Activity {
if (MainActivity.this.mCurrentVideoPosition >= MainActivity.this.mVideoList.size()) {
int unused = MainActivity.this.mCurrentVideoPosition = 0;
}
- MainActivity.this.runOnUiThread(new Runnable() {
- public final void run() {
-//TODO MainActivity.AnonymousClass6.this.lambda$onPlayStateChanged$0$MainActivity$6();
- }
+ 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());
+ MainActivity.this.mVideoView.start();
});
}
-
- public /* synthetic */ void lambda$onPlayStateChanged$0$MainActivity$6() {
- MainActivity.this.mVideoView.release();
- MainActivity.this.mVideoTextView.setText(((TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean) MainActivity.this.mVideoList.get(MainActivity.this.mCurrentVideoPosition)).getDataItemContent());
- VideoView access$600 = MainActivity.this.mVideoView;
- access$600.setUrl(MainActivity.this.mBaseUrl + BaseUrlApi.BASE_IMG_U + ((TempViewBean.ShowDeviceTemplateAppDTOBean.ShowTemplateAreaAppDTOListBean.DataBean) MainActivity.this.mVideoList.get(MainActivity.this.mCurrentVideoPosition)).getDataItemFileId());
- MainActivity.this.mVideoView.start();
- }
});
this.mCurrentVideoPosition = 0;
this.mVideoList = showTemplateAreaAppDTOListBean.getShowDeviceTemplateAreaDataAppDTOList();
@@ -887,31 +871,36 @@ public class MainActivity extends Activity {
deviceParamsBean.setDeviceIp(str2);
deviceParamsBean.setDeviceDirection(str7);
deviceParamsBean.setDeviceResolvingPower(str6);
- ((NetApi) RetrofitManager.getInstance().create(NetApi.class)).doSaveParams(str + "/app/showdevice" +
- "/updateshowdevicebycoderelease/" + str3, RequestBody.create(MediaType.parse("application/json; " +
- "charset=utf-8"), new Gson().toJson((Object) deviceParamsBean))).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() {
- public void onComplete() {
- }
+ RetrofitManager.getInstance()
+ .create(NetApi.class)
+ .doSaveParams(str + "/app/showdevice/updateshowdevicebycoderelease/" + str3,
+ RequestBody.create(MediaType.parse("application/json; " +
+ "charset=utf-8"), new Gson().toJson(deviceParamsBean)))
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ public void onComplete() {
+ }
- public void onSubscribe(Disposable disposable) {
- }
+ public void onSubscribe(Disposable disposable) {
+ }
- public void onNext(BaseUserInfo baseUserInfo) {
- initDialog.dismiss();
- MainActivity.this.mSettingDialog.dismiss();
- String unused = MainActivity.this.mBaseUrl = str;
- String unused2 = MainActivity.this.mDeviceCode = str3;
- SPUtils.getInstance().put("baseUrl", MainActivity.this.mBaseUrl);
- SPUtils.getInstance().put("deviceCode", MainActivity.this.mDeviceCode);
- ToastUtils.show("保存成功");
- MainActivity.this.getShowData();
- }
+ public void onNext(BaseUserInfo baseUserInfo) {
+ initDialog.dismiss();
+ MainActivity.this.mSettingDialog.dismiss();
+ String unused = MainActivity.this.mBaseUrl = str;
+ String unused2 = MainActivity.this.mDeviceCode = str3;
+ SPUtils.getInstance().put("baseUrl", MainActivity.this.mBaseUrl);
+ SPUtils.getInstance().put("deviceCode", MainActivity.this.mDeviceCode);
+ ToastUtils.show("保存成功");
+ MainActivity.this.getShowData();
+ }
- public void onError(Throwable th) {
- initDialog.dismiss();
- ExceptionHandler.handleException(th);
- }
- });
+ public void onError(Throwable th) {
+ initDialog.dismiss();
+ ExceptionHandler.handleException(th);
+ }
+ });
}
/* access modifiers changed from: private */
@@ -1063,8 +1052,8 @@ public class MainActivity extends Activity {
MainActivity.this.mVideoView.setMute(intent.getBooleanExtra("playSound", false));
}
} else if (PathConfig.ACTION_SETAPPCONFIG_INFO.equals(action)) {
- String unused = MainActivity.this.mBaseUrl = SPUtils.getInstance().getString("baseUrl");
- String unused2 = MainActivity.this.mDeviceCode = SPUtils.getInstance().getString("deviceCode");
+ MainActivity.this.mBaseUrl = SPUtils.getInstance().getString("baseUrl");
+ MainActivity.this.mDeviceCode = SPUtils.getInstance().getString("deviceCode");
MainActivity.this.getShowData();
} else if (PathConfig.ACTION_SHUT_DOWN.equals(action)) {
MainActivity.this.shutDownDevice(intent.getStringExtra("openTime"));
diff --git a/app/src/main/java/com/tenlion/xztouch/beans/TempViewBean.java b/app/src/main/java/com/tenlion/xztouch/beans/TempViewBean.java
index a3954fd..0190652 100644
--- a/app/src/main/java/com/tenlion/xztouch/beans/TempViewBean.java
+++ b/app/src/main/java/com/tenlion/xztouch/beans/TempViewBean.java
@@ -113,6 +113,20 @@ public class TempViewBean {
private int showTemplateWidth;
private String templateId;
+ @Override
+ public String toString() {
+ return "ShowDeviceTemplateAppDTOBean{" +
+ "showDeviceTemplateId='" + showDeviceTemplateId + '\'' +
+ ", showTemplateAreaAppDTOList=" + showTemplateAreaAppDTOList +
+ ", showTemplateBackground='" + showTemplateBackground + '\'' +
+ ", showTemplateDirection='" + showTemplateDirection + '\'' +
+ ", showTemplateHeight=" + showTemplateHeight +
+ ", showTemplateTitle='" + showTemplateTitle + '\'' +
+ ", showTemplateWidth=" + showTemplateWidth +
+ ", templateId='" + templateId + '\'' +
+ '}';
+ }
+
public String getShowDeviceTemplateId() {
return this.showDeviceTemplateId;
}
@@ -192,6 +206,25 @@ public class TempViewBean {
private String templateAreaType;
private double templateAreaWidth;
+ @Override
+ public String toString() {
+ return "ShowTemplateAreaAppDTOListBean{" +
+ "dataTypesettingCode='" + dataTypesettingCode + '\'' +
+ ", dataTypesettingColor='" + dataTypesettingColor + '\'' +
+ ", dataTypesettingRotation=" + dataTypesettingRotation +
+ ", dataTypesettingSize=" + dataTypesettingSize +
+ ", showDeviceTemplateAreaDataAppDTOList=" + showDeviceTemplateAreaDataAppDTOList +
+ ", showTemplateAreaId='" + showTemplateAreaId + '\'' +
+ ", templateAreaDown=" + templateAreaDown +
+ ", templateAreaHeight=" + templateAreaHeight +
+ ", templateAreaLeft=" + templateAreaLeft +
+ ", templateAreaRight=" + templateAreaRight +
+ ", templateAreaTop=" + templateAreaTop +
+ ", templateAreaType='" + templateAreaType + '\'' +
+ ", templateAreaWidth=" + templateAreaWidth +
+ '}';
+ }
+
public int getDataTypesettingSize() {
return this.dataTypesettingSize;
}
@@ -305,6 +338,19 @@ public class TempViewBean {
private String showDeviceTemplateAreaDataId;
private int syncDataNumber;
+ @Override
+ public String toString() {
+ return "DataBean{" +
+ "dataItemContent='" + dataItemContent + '\'' +
+ ", dataItemFileId='" + dataItemFileId + '\'' +
+ ", dataItemFileType='" + dataItemFileType + '\'' +
+ ", dataItemOrder='" + dataItemOrder + '\'' +
+ ", dataItemPhotoId='" + dataItemPhotoId + '\'' +
+ ", showDeviceTemplateAreaDataId='" + showDeviceTemplateAreaDataId + '\'' +
+ ", syncDataNumber=" + syncDataNumber +
+ '}';
+ }
+
public String getShowDeviceTemplateAreaDataId() {
return this.showDeviceTemplateAreaDataId;
}
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 52cd4aa..f701cff 100755
--- a/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
+++ b/app/src/main/java/com/tenlion/xztouch/push/ServerClient.java
@@ -168,11 +168,14 @@ public class ServerClient extends Service {
configBean.setBaseUrl(SPUtils.getInstance().getString("baseUrl"));
configBean.setDeviceCode(SPUtils.getInstance().getString("deviceCode"));
configBean.setDeviceIp(NetworkUtils.getIPAddress(true));
+ configBean.setHeight(SPUtils.getInstance().getString("width"));
+ configBean.setWidth(SPUtils.getInstance().getString("height"));
configBean.setScreenDirection(SPUtils.getInstance().getString("appType"));
+ configBean.setResolution(SPUtils.getInstance().getString("res"));
configBean.setPlaySound(SPUtils.getInstance().getBoolean("playSound"));
configBean.setPwd(TextUtils.isEmpty(SPUtils.getInstance().getString("pwd")) ? BaseUrlApi.SETTING_PWD :
SPUtils.getInstance().getString("pwd"));
- String json = new Gson().toJson((Object) configBean);
+ String json = new Gson().toJson(configBean);
asyncHttpServerResponse.code(200);
asyncHttpServerResponse.send(json);
} catch (Exception e) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fb2f34..ea374ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- xztouch
+ 展览系统
\ No newline at end of file
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BottomSettingView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BottomSettingView.java
index cba6188..4c6f111 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BottomSettingView.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BottomSettingView.java
@@ -9,7 +9,6 @@ import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
@@ -69,10 +68,10 @@ public class BottomSettingView extends Dialog {
/* access modifiers changed from: protected */
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
- View inflate = LayoutInflater.from(this.context).inflate(R.layout.dialog_bottom_setting, (ViewGroup) null);
+ View inflate = LayoutInflater.from(this.context).inflate(R.layout.dialog_bottom_setting, null);
this.view = inflate;
setContentView(inflate);
- this.mSpAppType = (AppCompatSpinner) this.view.findViewById(R.id.sp_system_platform);
+ this.mSpAppType = this.view.findViewById(R.id.sp_system_platform);
final String[] stringArray = this.context.getResources().getStringArray(R.array.actionArray);
this.mSpAppType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
public void onNothingSelected(AdapterView adapterView) {
@@ -88,42 +87,22 @@ public class BottomSettingView extends Dialog {
}
});
boolean playSound = UserLgUtils.getPlaySound();
- SwitchCompat switchCompat = (SwitchCompat) this.view.findViewById(R.id.sc_sound);
+ SwitchCompat switchCompat = this.view.findViewById(R.id.sc_sound);
switchCompat.setChecked(playSound);
-// TODO switchCompat.setOnCheckedChangeListener($$Lambda$BottomSettingView$o6qnBhdEHyy6ciES43egOFSbzOI.INSTANCE);
- this.view.findViewById(R.id.tv_cancel).setOnClickListener(new View.OnClickListener() {
- public final void onClick(View view) {
- BottomSettingView.this.lambda$onCreate$1$BottomSettingView(view);
- }
- });
- this.view.findViewById(R.id.tv_confirm).setOnClickListener(new View.OnClickListener() {
- public final void onClick(View view) {
- BottomSettingView.this.lambda$onCreate$2$BottomSettingView(view);
- }
- });
- this.view.findViewById(R.id.iv_system_setting).setOnClickListener(new View.OnClickListener() {
- public final void onClick(View view) {
- BottomSettingView.this.lambda$onCreate$3$BottomSettingView(view);
- }
- });
- this.view.findViewById(R.id.tv_close).setOnClickListener(new View.OnClickListener() {
- public final void onClick(View view) {
- BottomSettingView.this.lambda$onCreate$4$BottomSettingView(view);
- }
- });
- this.view.findViewById(R.id.iv_update).setOnClickListener(new View.OnClickListener() {
- public final void onClick(View view) {
- BottomSettingView.this.lambda$onCreate$5$BottomSettingView(view);
- }
- });
- this.mEtIp = (EditText) this.view.findViewById(R.id.et_device_ip);
- this.mEtWidth = (EditText) this.view.findViewById(R.id.et_width);
- this.mEtHeight = (EditText) this.view.findViewById(R.id.et_height);
- this.mEtResul = (EditText) this.view.findViewById(R.id.et_resul);
+ switchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> UserLgUtils.setIsPlaySound(isChecked));
+ this.view.findViewById(R.id.tv_cancel).setOnClickListener(BottomSettingView.this::lambda$onCreate$1$BottomSettingView);
+ this.view.findViewById(R.id.tv_confirm).setOnClickListener(BottomSettingView.this::lambda$onCreate$2$BottomSettingView);
+ this.view.findViewById(R.id.iv_system_setting).setOnClickListener(BottomSettingView.this::lambda$onCreate$3$BottomSettingView);
+ this.view.findViewById(R.id.tv_close).setOnClickListener(BottomSettingView.this::lambda$onCreate$4$BottomSettingView);
+ this.view.findViewById(R.id.iv_update).setOnClickListener(BottomSettingView.this::lambda$onCreate$5$BottomSettingView);
+ this.mEtIp = this.view.findViewById(R.id.et_device_ip);
+ this.mEtWidth = this.view.findViewById(R.id.et_width);
+ this.mEtHeight = this.view.findViewById(R.id.et_height);
+ this.mEtResul = this.view.findViewById(R.id.et_resul);
setCancelable(false);
setCanceledOnTouchOutside(false);
- this.mEtDeviceCode = (EditText) this.view.findViewById(R.id.et_device_code);
- this.mEtUrl = (EditText) this.view.findViewById(R.id.et_service_url);
+ this.mEtDeviceCode = this.view.findViewById(R.id.et_device_code);
+ this.mEtUrl = this.view.findViewById(R.id.et_service_url);
String string = SPUtils.getInstance().getString("baseUrl");
String string2 = SPUtils.getInstance().getString("deviceCode");
if (!TextUtils.isEmpty(string2)) {
@@ -131,6 +110,8 @@ public class BottomSettingView extends Dialog {
}
if (!TextUtils.isEmpty(string)) {
this.mEtUrl.setText(string);
+ } else {
+ mEtUrl.setText("http://192.168.0.1/projcet");
}
Window window = getWindow();
window.setGravity(80);
@@ -169,7 +150,8 @@ public class BottomSettingView extends Dialog {
editText.setFocusable(true);
editText.setFocusableInTouchMode(true);
editText.requestFocus();
- ((InputMethodManager) this.context.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(editText, 0);
+ ((InputMethodManager) this.context.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(editText
+ , 0);
}
}
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeFaceTextView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeFaceTextView.java
index d260a42..7a11669 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeFaceTextView.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeFaceTextView.java
@@ -5,10 +5,10 @@ import android.content.res.TypedArray;
import android.graphics.Typeface;
import android.util.AttributeSet;
-import com.tenlionsoft.baselib.R;
-
import androidx.annotation.Nullable;
+import com.tenlionsoft.baselib.R;
+
/**
* 作者: adam
* 日期: 2020/6/3 - 4:58 PM
@@ -34,10 +34,12 @@ public class TypeFaceTextView extends androidx.appcompat.widget.AppCompatTextVie
if (type == 1) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
setTextSize(16);
- } else if(type==2) {
+ } else if (type == 2) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
setTextSize(18);
- }else{
+ } else if (type == 3) {
+ mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
+ } else {
mTypeface = Typeface.DEFAULT;
}
setTypeface(mTypeface);
@@ -47,10 +49,10 @@ public class TypeFaceTextView extends androidx.appcompat.widget.AppCompatTextVie
if (type == 1) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
setTextSize(16);
- } else if(type==2) {
+ } else if (type == 2) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
setTextSize(18);
- }else{
+ } else {
mTypeface = Typeface.DEFAULT;
}
setTypeface(mTypeface);
diff --git a/baselib/src/main/res/layout/dialog_bottom_setting.xml b/baselib/src/main/res/layout/dialog_bottom_setting.xml
index 2b74d37..9971355 100755
--- a/baselib/src/main/res/layout/dialog_bottom_setting.xml
+++ b/baselib/src/main/res/layout/dialog_bottom_setting.xml
@@ -32,7 +32,8 @@
android:focusable="true"
android:text="关闭应用"
android:textColor="@color/app_title_9f_no"
- android:textSize="18sp" />
+ android:textSize="18sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
@@ -308,7 +314,8 @@
android:layout_height="wrap_content"
android:text="设 备 号:"
android:textColor="@color/app_title_9f_no"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
+ android:textSize="16sp"
+ app:text_type_cus="3" />
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..d5eb49c
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Oct 03 09:08:48 CST 2022
+sdk.dir=/Users/adam/Library/Android/sdk