-        checkBoxUpgradeInfoInteractor = new CheckBoxUpgradeInfoInteractor(lensmanId,this);

         uploadServiceConnection = new ServiceConnection() {

             @Override

             public void onServiceConnected(ComponentName componentName, IBinder iBinder) {

@@ -105,14 +100,10 @@ class MainPresenter implements MainContract.Presenter,SyncTimeInteractor.SyncTim

             view.showBoxDisconnectedView();

         }

         view.setNewSessionBtnEnabled(false);

-        view.showTimeSyncView();

         if(!isTimeSync){

             syncTimeInteractor.startJob();

         }

         boxStatusInteractor.startJob();

-        if(!isBoxUpdateChecked){

-            checkBoxUpgradeInfoInteractor.startJob();

-        }

         registerWifiChangeReceiver();

         App.getAppContext().startService(new Intent(App.getAppContext(), OrderDealService.class));

         App.getAppContext().bindService(new Intent(App.getAppContext(),OrderDealService.class),

@@ -126,9 +117,6 @@ class MainPresenter implements MainContract.Presenter,SyncTimeInteractor.SyncTim

     }

     private void onDataReady(){

-        if(!isTimeSync){

-            return;

-        }

         view.setNewSessionBtnEnabled(true);

         if(sessionList.size()==0){

             view.showEmptyView();

@@ -142,8 +130,7 @@ class MainPresenter implements MainContract.Presenter,SyncTimeInteractor.SyncTim

     @Override

     public void stop() {

         boxStatusInteractor.cancelJob();

-        syncTimeInteractor.cancelJob();

-        checkBoxUpgradeInfoInteractor.cancelJob();

+//        syncTimeInteractor.cancelJob();

         App.getAppContext().unbindService(uploadServiceConnection);

         App.getAppContext().unbindService(orderServiceConnection);

         App.getAppContext().unregisterReceiver(wifiReceiver);

@@ -162,13 +149,6 @@ class MainPresenter implements MainContract.Presenter,SyncTimeInteractor.SyncTim

         return sessionBean;

     }

-    @Override

-    public void resyncTime() {

-        if(syncTimeInteractor!=null){

-            syncTimeInteractor.cancelJob();

-            syncTimeInteractor.startJob();

-        }

-    }

     private long getSessionDateInLongFormat(){

         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");

@@ -255,21 +235,6 @@ class MainPresenter implements MainContract.Presenter,SyncTimeInteractor.SyncTim

     @Override

     public void onTimeSync(boolean result, @StringRes int strId) {

         isTimeSync = result;

-        if(result){

-            onDataReady();

-        }else{

-            if(strId!=0){

-                view.showRetrySyncView(strId);

-            }

-        }

-    }

-

-    @Override

-    public void onUpgradeInfoFetched(boolean result, String bpversion_str,int versionCode) {

-        isBoxUpdateChecked = true;

-        if(result){

-            view.showBoxUpgradeActivity(bpversion_str,versionCode);

-        }

     }

 }

@@ -450,12 +450,15 @@

                 <View

                     android:layout_width="match_parent"

                     android:layout_height="1px"

+                    android:visibility="gone"

                     android:background="@color/text_hint_grey_color" />

                 <LinearLayout

                     android:layout_width="match_parent"

                     android:layout_height="44dp"

-                    android:orientation="horizontal">

+                    android:orientation="horizontal"

+                    android:visibility="gone"

+                    >

                     <TextView

                         android:layout_width="wrap_content"

@@ -56,46 +56,6 @@

         android:layout_centerInParent="true"

         android:src="@drawable/no_photo_tip" />

-    <RelativeLayout

-        android:id="@+id/sync_time_view"

-        android:layout_width="match_parent"

-        android:layout_height="match_parent"

-        android:background="@color/half_transparent">

-

-        <com.android.views.loadingdrawable.LoadingView

-            android:id="@+id/loading_gear_view"

-            android:layout_width="180dp"

-            android:layout_height="180dp"

-            android:layout_centerInParent="true"

-            app:loading_renderer="GearLoadingRenderer"/>

-

-        <TextView

-            android:id="@+id/tv_sync_time_status"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:textSize="16sp"

-            android:text="@string/time_syncing"

-            android:layout_below="@id/loading_gear_view"

-            android:layout_marginTop="10dp"

-            android:layout_centerHorizontal="true"

-            android:textColor="@color/white"/>

-

-        <Button

-            android:id="@+id/btn_retry_sync"

-            android:layout_width="140dp"

-            android:layout_height="40dp"

-            android:layout_centerHorizontal="true"

-            android:layout_below="@id/tv_sync_time_status"

-            android:layout_marginTop="10dp"

-            android:background="@drawable/retry_sync_btn_rounded_rect_bg"

-            android:gravity="center"

-            android:text="@string/time_sync_retry"

-            android:textColor="@color/white"

-            android:visibility="gone"

-            android:textSize="18sp" />

-    </RelativeLayout>

-

-

     <android.support.v7.widget.RecyclerView

         android:id="@+id/recycler_view_sessions"

         android:layout_width="match_parent"

Home Explore Help

Register Sign In

Hanyuan

/

hanyuan

Watch 2

Star 0

Fork 0

Issues 0 Pull Requests 0 Commits 90 Releases 0

No Description

SSH HTTPS

ZIP TAR.GZ

• Branch: master

  Branches Tags

  master
• hanyuan

  /

  api

  /

  branch_campus_views.py

branch_campus_views.py 1.8KB

Permalink History Raw

# -*- coding: utf-8 -*- from __future__ import division from django_response import response from paginator import pagination from registration.models import (BranchCampusAdministratorInfo, BranchCampusInfo, CourseRegisterInfo, UserCourseRegisterInfo) def add_branch_campus(request): campus_name = request.POST.get('campus_name', '') campus = BranchCampusInfo.objects.create(campus_name=campus_name) return response(data={ 'campus_id': campus.campus_id, }) def update_branch_campus(request): campus_id = request.POST.get('campus_id', '') campus_name = request.POST.get('campus_name', '') BranchCampusInfo.objects.filter(campus_id=campus_id).update(campus_name=campus_name) BranchCampusAdministratorInfo.objects.filter(campus_id=campus_id).update(campus_name=campus_name) CourseRegisterInfo.objects.filter(campus_id=campus_id).update(campus_name=campus_name) UserCourseRegisterInfo.objects.filter(campus_id=campus_id).update(campus_name=campus_name) return response() def get_branch_campus_list(request): page = request.POST.get('page', 1) num = request.POST.get('num', 20) campus = BranchCampusInfo.objects.filter(status=True) count = campus.count() campus, left = pagination(campus, page, num) campus = [c.data for c in campus] return response(data={ 'logs': campus, 'count': count, 'left': left, }) def delete_branch_campus(request): campus_id = request.POST.get('campus_id', '') try: campus = BranchCampusInfo.objects.get(id=campus_id) except BranchCampusInfo.DoesNotExist: return response() if campus.campus_type == BranchCampusInfo.MAIN: return response(40001, '', '总院不可删除') BranchCampusInfo.objects.filter(campus_id=campus_id).update(status=False) return response()