Home Explore Help
Register Sign In
郑嘉明 Moon
Repositories Public Activity

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

  • 2c386379d2 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/ApiService.java # app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceFragment.java
  • ac4d1bb224 7.4 BUG调整
  • f17c9cd0ad 摄像头播放
  • 8c69d9398e Merge remote-tracking branch 'origin/master' # Conflicts: # app/app.iml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/silence/commonframe/activity/device/activity/NewDeviceFragment.java # app/src/main/java/com/silence/commonframe/activity/home/activity/AdddeviceActivity.java # app/src/main/java/com/silence/commonframe/utils/WetChatService.java # app/src/main/java/com/silence/commonframe/zxing/zxing/ScanListener.java # app/src/main/java/com/silence/commonframe/zxing/zxing/ScanManager.java # app/src/main/java/com/silence/commonframe/zxing/zxing/decode/DecodeFormatManager.java # app/src/main/java/com/silence/commonframe/zxing/zxing/encode/EncodingHandler.java # app/src/main/res/layout/activity_camera_detail.xml
  • ad97d0774c 2.0-版
  • View comparison for these 5 commits »

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

  • 25bd91fea2 7.2 二维码页面的布局和功能重写

6 years ago

Moon pushed to master at app/hsh_android

  • a5814e1aa6 7.1.3 整理
  • bcc9c72d1d Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/activity/AdddeviceActivity1.java # app/src/main/java/com/silence/commonframe/activity/CameraCommonActivity.java # app/src/main/java/com/silence/commonframe/activity/CameraDetailActivity.java # app/src/main/java/com/silence/commonframe/activity/CameraSavemanagementActivity.java # app/src/main/java/com/silence/commonframe/activity/DeviceContextManagementActivity.java # app/src/main/java/com/silence/commonframe/activity/QuickSetupActivity.java # app/src/main/java/com/silence/commonframe/activity/RouterActivity.java # app/src/main/java/com/silence/commonframe/activity/mine/activity/MineFragment.java # app/src/main/java/com/silence/commonframe/adapter/DeviceContextAdapter.java # app/src/main/java/com/silence/commonframe/adapter/DeviceContextAdapterCamera.java # app/src/main/java/com/silence/commonframe/utils/Data.java # app/src/main/res/layout/activity_adddevice3.xml # app/src/main/res/layout/activity_navigation.xml
  • d427a004d0 7.1.2
  • 5cd3cfec95 瘦身版App
  • 17001362f6 7.1.1 小调整以及清理无用activity
  • View comparison for these 5 commits »

6 years ago

Moon pushed to master at app/hsh_android

  • 79e1642114 6.29.3 微信公众号推送调整
  • a9c1f68021 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/App.java # app/src/main/java/com/silence/commonframe/activity/NewContextManagementActivity.java # app/src/main/java/com/silence/commonframe/activity/login/LoginActivity.java # app/src/main/java/com/silence/commonframe/activity/login/WelcomeActivity.java # app/src/main/res/values/styles.xml
  • a3eece63ac 登录模块，适配API20以下
  • e0ecb7bdb8 6.29.2 空气卫士 设备列表重写 添加防止快速点击方法
  • 81980b9eea 6.29 合并版
  • View comparison for these 8 commits »

6 years ago

Moon pushed to master at app/hsh_android

  • 15fa2c9fc5 6.28.1 空气卫士loading 添加场所后添加联系人修改 欢迎界面 复核详情音乐播放后返回闪退bug修改 推送设置等页面调整 微信公众号推送重写 添加联系人页面修改，弹窗修改 摄像头相关修改，部分页面重写 关联管理界面修改

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

  • db110f042d 6.26.2 添加设备相关页面重写 扫一扫页面重写 消息界面加接口 我的调整 场所列表bug

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

  • 82911a1234 6.24.4 合并版
  • 8a7397fc92 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/activity/SiteManagement.java # app/src/main/java/com/silence/commonframe/activity/message/activity/NewSubmitActivity.java # app/src/main/java/com/silence/commonframe/activity/message/activity/NewsdetailActivity.java # app/src/main/java/com/silence/commonframe/activity/setup/activity/SetupActivity.java # app/src/main/java/com/silence/commonframe/fragment/MineFragment.java # app/src/main/java/com/silence/commonframe/wxapi/WXEntryActivity.java # app/src/main/java/com/silence/tech/ui/moni/activity/MoniFragment.java # app/src/main/java/com/silence/tech/ui/my/activity/MineTechFragment.java
  • bba593ba8a 登录，关联设备，loading等
  • 41d58bf51c 6.24.3 消息详情和复核页面修改 搜索页面重写 我的页面修改标题 标题调整间距 监控页面和异常页面调整没有消息时显示 添加各分辨率的部分切图：监控页面，主界面标签，返回箭头，设置，搜索相关切图 修改主界面Tab
  • b1272a041d 6.24.2 处理详情重写
  • View comparison for these 8 commits »

6 years ago

Moon pushed to master at app/hsh_android

  • c41a1a4bc7 6.22.3 场所详情 联系人列表和添加联系人调整
  • ba68bc0604 6.22.2 火警通知和场所管理加载更多调整 企业版监控页面加载更多调整 设置中6个相关页面调整
  • 8b33c01e24 6.22.1 空气卫士调整 火警通知页面调整 复核详情页面调整 场所管理界面调整 接口修改 企业版监控页面调整 档案页面异常信息增加点击进入复核详情
  • View comparison for these 3 commits »

6 years ago

Moon pushed to master at app/hsh_android

  • 3c26746789 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/activity/NewSubmitActivity.java # app/src/main/java/com/silence/commonframe/activity/presenter/AirGuardWordTimePresenter.java # app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java
  • 72bbd6eab7 档案页编写
  • 30c50fd35f 6.21.3 我的页面重写
  • e8288ac54c 6.21.2 空气卫士合并
  • 8d79943e03 6.21.1
  • View comparison for these 5 commits »

6 years ago

Moon pushed to master at app/hsh_android

  • 4431860645 6.20.4
  • c2c51c3600 Merge remote-tracking branch 'origin/master'
  • e5014b63e7 6.20.3
  • e0a838b0a4 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/com/silence/commonframe/activity/AirGuardActivity.java # app/src/main/java/com/silence/commonframe/activity/AirGuardDetailActivity.java # app/src/main/java/com/silence/commonframe/activity/AirGuardNewTimeActivity.java # app/src/main/java/com/silence/commonframe/activity/AirGuardTimeClockActivity.java # app/src/main/java/com/silence/commonframe/activity/AirGuardWordTimeActivity.java # app/src/main/java/com/silence/commonframe/activity/Interface/AirGuardListener.java # app/src/main/java/com/silence/commonframe/activity/Interface/AirGuardWordTimeListener.java # app/src/main/java/com/silence/commonframe/activity/presenter/AirGuardPresenter.java # app/src/main/java/com/silence/commonframe/activity/presenter/AirGuardWordTimePresenter.java # app/src/main/java/com/silence/commonframe/adapter/AirGuardWorKTimeAdapter.java # app/src/main/java/com/silence/commonframe/base/basemvp/BaseFragment.java # app/src/main/java/com/silence/commonframe/common/constant/UrlConstants.java # app/src/main/java/com/silence/commonframe/fragment/DeviceFragment.java
  • 4a55192c0b 重写设备页，详情页
  • View comparison for these 12 commits »

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

6 years ago

Moon pushed to master at app/hsh_android

6 years ago