clockworkpi/launcher
1
0
Fork 0
mirror of https://github.com/clockworkpi/launcher.git synced 2025-12-13 02:08:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix update read json

Browse Source
This commit is contained in:
cuu 2018-05-27 10:50:11 +08:00
parent b55e9282cd
commit 143c168070
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Menu/GameShell/10_Settings/Update/__init__.py
View File

@ -282,7 +282,7 @@ class UpdatePage(Page):
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
elif "gitversion" in json_: ### just use git to run update elif "gitversion" in json_: ### just use git to run update
if confirm.VERSION != json_["gitversion"]: if config.VERSION != json_["gitversion"]:
self._ConfirmPage._URL = None self._ConfirmPage._URL = None
self._ConfirmPage._MD5 = None self._ConfirmPage._MD5 = None
self._ConfirmPage._GIT = True self._ConfirmPage._GIT = True
@ -292,10 +292,16 @@ class UpdatePage(Page):
self._Screen.Draw() self._Screen.Draw()
self._ConfirmPage.SnapMsg("Update to %s ?" % json_["gitversion"] ) self._ConfirmPage.SnapMsg("Update to %s ?" % json_["gitversion"] )
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
else:
self._Screen.Draw()
self._Screen._MsgBox.SetText("Out of update")
self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow()
pygame.time.delay(600)
return True return True
except: except Exception, e:
print("r.json error") print("r.json() error %s" % str(e))
else: else:
print(" requests get error %d ", r.status_code) print(" requests get error %d ", r.status_code)

2
sys.py/config.py
View File

@ -10,7 +10,7 @@ Battery = "/sys/class/power_supply/axp20x-battery/uevent"
MPD_socket = "/tmp/mpd.socket" MPD_socket = "/tmp/mpd.socket"
UPDATE_URL="http://192.168.31.236:81/version.php" UPDATE_URL="https://raw.githubusercontent.com/clockworkpi/launcher/master/launcher_ver.json"
VERSION="1.0" VERSION="1.0"