-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
949c7f5
commit f30bc81
Showing
23 changed files
with
3,381 additions
and
3,414 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2245,"versionName":"2.245","enabled":true,"outputFile":"GeometricWeather 2.245.apk","fullName":"release","baseName":"release"},"path":"GeometricWeather 2.245.apk","properties":{}}] | ||
| [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2249,"versionName":"2.249","enabled":true,"outputFile":"GeometricWeather 2.249.apk","fullName":"release","baseName":"release"},"path":"GeometricWeather 2.249.apk","properties":{}}] |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
app/src/main/java/wangdaye/com/geometricweather/basic/model/CNCity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package wangdaye.com.geometricweather.basic.model; | ||
|
|
||
| import wangdaye.com.geometricweather.GeometricWeather; | ||
| import wangdaye.com.geometricweather.db.entity.CNCityEntity; | ||
|
|
||
| /** | ||
| * CN city. | ||
| * */ | ||
|
|
||
| public class CNCity { | ||
|
|
||
| /** | ||
| * cityId : 101010100 | ||
| * province : 北京 | ||
| * city : 北京 | ||
| * district : 北京 | ||
| * latitude : 39.904987 | ||
| * longitude : 116.40529 | ||
| */ | ||
|
|
||
| private String cityId; | ||
| private String province; | ||
| private String city; | ||
| private String district; | ||
| private String latitude; | ||
| private String longitude; | ||
|
|
||
| public CNCityEntity toCNCityEntity() { | ||
| CNCityEntity entity = new CNCityEntity(); | ||
| entity.province = getProvince(); | ||
| entity.city = getCity(); | ||
| entity.district = getDistrict(); | ||
| entity.lat = getLatitude(); | ||
| entity.lon = getLongitude(); | ||
| entity.requestKey = getCityId(); | ||
| return entity; | ||
| } | ||
|
|
||
| public Location toLocation() { | ||
| String source = GeometricWeather.getInstance().getChineseSource(); | ||
| if (source.equals("accu")) { | ||
| source = "cn"; | ||
| } | ||
| return new Location( | ||
| getCityId(), getDistrict().equals("无") ? "" : getDistrict(), | ||
| getCity(), getProvince(), "中国", | ||
| getLatitude(), getLongitude(), source, | ||
| null, null, false, true); | ||
| } | ||
|
|
||
| public String getCityId() { | ||
| return cityId; | ||
| } | ||
|
|
||
| public void setCityId(String cityId) { | ||
| this.cityId = cityId; | ||
| } | ||
|
|
||
| public String getProvince() { | ||
| return province; | ||
| } | ||
|
|
||
| public void setProvince(String province) { | ||
| this.province = province; | ||
| } | ||
|
|
||
| public String getCity() { | ||
| return city; | ||
| } | ||
|
|
||
| public void setCity(String city) { | ||
| this.city = city; | ||
| } | ||
|
|
||
| public String getDistrict() { | ||
| return district; | ||
| } | ||
|
|
||
| public void setDistrict(String district) { | ||
| this.district = district; | ||
| } | ||
|
|
||
| public String getLatitude() { | ||
| return latitude; | ||
| } | ||
|
|
||
| public void setLatitude(String latitude) { | ||
| this.latitude = latitude; | ||
| } | ||
|
|
||
| public String getLongitude() { | ||
| return longitude; | ||
| } | ||
|
|
||
| public void setLongitude(String longitude) { | ||
| this.longitude = longitude; | ||
| } | ||
| } |
112 changes: 0 additions & 112 deletions
112
app/src/main/java/wangdaye/com/geometricweather/basic/model/CNCityList.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.