gaojian/xz_cultural
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:45:44 +08:00
parent c6f9e513b6
commit 0a0fbc06a1
12 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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="2023-02-20T02:01:43.345089Z" />
</component>
</project>

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

@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.tengshisoft.cultural",
"variantName": "cityRelease",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 13,
"versionName": "1.1.3",
"outputFile": "app-city-release.apk"
}
],
"elementType": "File"
}

1
app/src/main/java/com/tengshisoft/BaseMyApplication.java
View File

@ -55,6 +55,7 @@ public class BaseMyApplication extends Application {
UserLgUtils.setCurrentCityCode(this.getResources().getString(R.string.CITY_CODE));
UserLgUtils.setCurrentCity(this.getResources().getString(R.string.CITY_NAME));
UserLgUtils.setCurrentCityId(this.getResources().getString(R.string.CITY_ID));
UserLgUtils.setAppPathCode(this.getResources().getString(R.string.APP_PATH_CODE));
}
private void initShare() {

4
build.gradle
View File

@ -56,8 +56,8 @@ ext {
gCompileSdkVersion = 31
gMinSdkVersion = 16
gTargetSdkVersion = 29
gVersionCode = 12
gVersionName = '1.1.2'
gVersionCode = 13
gVersionName = '1.1.3'
gBuildToolsVersion = "30.0.2"
// gVersionCode=26
// gVersionName='1.3.0'

5
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -43,7 +43,7 @@ public class PathConfig {
public static final String USER_TYPE_N = "bc405346-8714-4ded-89ac-9cc4d755f66a";
public static final String USER_TYPE_X = "25affe67-134c-4a32-ba41-64b0cfedc782";
// public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4";
public static final String APP_VERSION_ID = "10e53e1e-2c21-4b5d-b81f-b514abece994";//测试
// public static final String APP_VERSION_ID = "10e53e1e-2c21-4b5d-b81f-b514abece994";//测试
public static final String NEWS_ID = "f497904b-7727-4832-891c-604c36ae4167";//文化动态ID
public static final String NEWS_SHOW_ID = "f1d5d313-f728-4dda-9843-1116d97e17b0";//展览展示ID
@ -55,8 +55,9 @@ public class PathConfig {
public static final String PLACE_TYPE_ID = "df8b758c-f6d8-465a-9aa8-c451fde47076";//场馆类型字典
public static final String CITY_DEFAULT_CODE = "640675";
public static final String CITY_DEFAULT_CODE = "540200000000";
public static final String CITY_DEFAULT_NAME = "日喀则市";
public static final String CITY_DEFAULT_ID = "640675";
public static final int CITY_DEFAULT_LEVEL = 3;
public static final String DID_CITY_CODE = "640675";//日喀则市编码

4
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -13,7 +13,7 @@ public class BaseUrlApi {
public static final String IP_URL = "https://www.xzszwhy.cn/";/* 测试IP */
// public static final String IP_URL = "http://192.168.0.120:8081/";/* 测试IP */
// public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/
// public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/
// public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/";/*正式IP*/
public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/xzszwhy/";/*正式IP*/
@ -75,7 +75,7 @@ public class BaseUrlApi {
// public static final String BASE_NEWS_DETAIL = "http://192.168.0.120:80/";//新闻
// public static final String BASE_IMG_URL = BASE_IP + "route/file/download/true/";
// GET /app/appversion/downloadapp/{appVersionId}
public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID;
public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/";
public static final String BASE_ACTIVITY_IMG_URL = BASE_ACTIVIY_IP + "route/file/download/true/";
public static final String BASE_VOLUNTEER_IMG_URL = BASE_VOLUNTEER_IP + "route/file/download/true/";

13
cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java
View File

@ -222,4 +222,17 @@ public class UserLgUtils {
public static void setShopCar(String data) {
SPUtils.getInstance(SP_USER_INFO).put("shopCar", data);
}
public static String getAppPathCode() {
return SPUtils.getInstance(SP_USER_INFO).getString("appVersionPathCode");
}
public static void setAppPathCode(String data) {
SPUtils.getInstance(SP_USER_INFO).put("appVersionPathCode", data);
}
}

1
common.gradle
View File

@ -11,6 +11,7 @@ project.ext {
resValue("string", "CITY_CODE", "540200000000")
resValue("string", "CITY_ID", "640675")
resValue("string", "CITY_NAME", "日喀则市")
resValue("string","APP_PATH_CODE","f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4")
manifestPlaceholders = [CHANNEL_VALUE: "cultural",
APP_LOGO : "@drawable/app_logo",
CITY_ID : "640675",

14
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java
View File

@ -30,6 +30,7 @@ import com.tengshisoft.mudulemain.cultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.cultural.beans.SearchBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@ -232,17 +233,18 @@ public class ChooseCityActivity extends BaseActivity {
}
mArea4Adapter.notifyDataSetChanged();
}
mCurrentCityCode = UserLgUtils.getCurrentCityId();
mCurrentCityId = UserLgUtils.getCurrentCityCode();
mCurrentCityCode =PathConfig.CITY_DEFAULT_CODE;
mCurrentCityId = PathConfig.CITY_DEFAULT_ID;
mCurrentCityName = PathConfig.CITY_DEFAULT_NAME;
//日喀则市
} else {
if (!TextUtils.isEmpty(UserLgUtils.getCurrentCity())) {
mCurrentCityName = UserLgUtils.getCurrentCity();
} else {
mCurrentCityName = PathConfig.CITY_DEFAULT_NAME;
}
mCurrentCityCode = UserLgUtils.getCurrentCityId();
mCurrentCityId = UserLgUtils.getCurrentCityCode();
mCurrentCityCode = UserLgUtils.getCurrentCityCode();
mCurrentCityId = UserLgUtils.getCurrentCityId();
}
mTvCurrentArea.setText(mCurrentCityName);
}
@ -308,8 +310,8 @@ public class ChooseCityActivity extends BaseActivity {
UserLgUtils.setCityLevel(Integer.parseInt(bean.getAreaLevel()) + 1);
}
mCurrentCityName = bean.getAreaName();
mCurrentCityCode = bean.getAreaId();
mCurrentCityId = bean.getAreaCode();
mCurrentCityCode = bean.getAreaCode();
mCurrentCityId = bean.getAreaId();
mTvCurrentArea.setText(mCurrentCityName);
}

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java
View File

@ -220,7 +220,7 @@ public class LoginActivity extends BaseActivity {
String verifyCode = mEtVerifyCode.getText().toString().trim();
LoginUser info = new LoginUser();
info.setAppVersion(AppUtils.getAppVersionCode());
info.setAppId(PathConfig.APP_VERSION_ID);
info.setAppId(UserLgUtils.getAppPathCode());
info.setUsername(phone);
info.setDeviceNo("deviceId");
info.setVerificationCode(verifyCode);

10
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java
View File

@ -259,10 +259,10 @@ public class MainActivity extends BaseActivity {
String chooseCityCode = data.getStringExtra("chooseCityCode");
String cityId = data.getStringExtra("chooseCityId");
UserLgUtils.setCurrentCityCode(cityId);
UserLgUtils.setCurrentCityId(chooseCityCode);
UserLgUtils.setCurrentCityCode(chooseCityCode);
UserLgUtils.setCurrentCityId(cityId);
UserLgUtils.setCurrentCity(chooseCity);
LogUtils.e(chooseCityCode + "===" + cityId + "===" + chooseCity);
mTvAppBack.setText(chooseCity);
refreshData();
}
@ -324,7 +324,7 @@ public class MainActivity extends BaseActivity {
private void checkAppVersion() {
RetrofitManager.getInstance()
.create(BaseApiService.class)
.doCheckAppVersion(PathConfig.APP_VERSION_ID)
.doCheckAppVersion(UserLgUtils.getAppPathCode())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<VersionBean>() {
@ -371,7 +371,7 @@ public class MainActivity extends BaseActivity {
private void startDownloadApk() {
ToastUtils.showShort("开始下载,请在通知栏查看下载进度");
Intent intent = new Intent(mActivity, DownloadService.class);
intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL);
intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL + UserLgUtils.getAppPathCode());
startService(intent);
}

4
modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java
View File

@ -107,7 +107,7 @@ public class SettingActivity extends BaseActivity {
dialog.show();
RetrofitManager.getInstance()
.create(BaseApiService.class)
.doCheckAppVersion(PathConfig.APP_VERSION_ID)
.doCheckAppVersion(UserLgUtils.getAppPathCode())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<VersionBean>() {
@ -158,7 +158,7 @@ public class SettingActivity extends BaseActivity {
private void startDownloadApk() {
ToastUtils.showShort("开始下载,请在通知栏查看下载进度");
Intent intent = new Intent(mActivity, DownloadService.class);
intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL);
intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL + UserLgUtils.getAppPathCode());
startService(intent);
}