Merge pull request #132 from cuu/master

update soundpage
This commit is contained in:
GNU 2018-12-18 19:26:19 +08:00 committed by GitHub
commit accbd7524e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 26 deletions

View File

@ -113,7 +113,6 @@ class SoundPage(Page):
self._Height = self._Screen._Height self._Height = self._Screen._Height
self._MySlider = SoundSlider() self._MySlider = SoundSlider()
self._MySlider._Parent = self self._MySlider._Parent = self
self._MySlider.SetCanvasHWND(self._CanvasHWND) self._MySlider.SetCanvasHWND(self._CanvasHWND)
@ -123,19 +122,19 @@ class SoundPage(Page):
self._MySlider.Init() self._MySlider.Init()
try: try:
m = alsaaudio.Mixer() m = alsaaudio.Mixer()
self._MySlider.SetValue(m.getvolume()[0]) self._MySlider.SetValue(m.getvolume()[0])
except Exception,e: except Exception,e:
print(str(e)) print(str(e))
self._MySlider.SetValue(0) self._MySlider.SetValue(0)
def OnLoadCb(self): def OnLoadCb(self):
try: try:
m = alsaaudio.Mixer() m = alsaaudio.Mixer()
self._MySlider.SetValue(m.getvolume()[0]) self._MySlider.SetValue(m.getvolume()[0])
except Exception,e: except Exception,e:
print(str(e)) print(str(e))
def WhenSliderDrag(self,value): ##value 0-100 def WhenSliderDrag(self,value): ##value 0-100
if value < 0 or value > 100: if value < 0 or value > 100:

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import platform
import dbus import dbus
import dbus.service import dbus.service
import sys import sys
@ -178,7 +178,6 @@ def RestoreLastBackLightBrightness(main_screen):
f.truncate() f.truncate()
f.close() f.close()
if main_screen._CounterScreen._Counting==True: if main_screen._CounterScreen._Counting==True:
main_screen._CounterScreen.StopCounter() main_screen._CounterScreen.StopCounter()
main_screen.Draw() main_screen.Draw()
@ -536,6 +535,27 @@ def big_loop():
gobject_loop() gobject_loop()
def PreparationInAdv():
if "arm" not in platform.machine():
return
if FileExists(".powerlevel") == False:
os.system("touch .powerlevel")
with open(".powerlevel","r") as f:
powerlevel = f.read()
powerlevel = powerlevel.strip()
if powerlevel != "":
config.PowerLevel = powerlevel
if powerlevel != "supersaving":
os.system("sudo iw wlan0 set power_save off >/dev/null")
else:
os.system("sudo iw wlan0 set power_save on > /dev/null")
else:
os.system("sudo iw wlan0 set power_save off >/dev/null")
###MAIN()### ###MAIN()###
if __name__ == '__main__': if __name__ == '__main__':
@ -568,22 +588,8 @@ if __name__ == '__main__':
print("This pygame does not support PNG") print("This pygame does not support PNG")
exit() exit()
if FileExists(".powerlevel") == False:
os.system("touch .powerlevel")
with open(".powerlevel","r") as f: PreparationInAdv()
powerlevel = f.read()
powerlevel = powerlevel.strip()
if powerlevel != "":
config.PowerLevel = powerlevel
if powerlevel != "supersaving":
os.system("sudo iw wlan0 set power_save off >/dev/null")
else:
os.system("sudo iw wlan0 set power_save on > /dev/null")
else:
os.system("sudo iw wlan0 set power_save off >/dev/null")
crt_screen = CreateByScreen() crt_screen = CreateByScreen()
crt_screen.Init() crt_screen.Init()