@BindView(R.id.layout_choose_update) View chooseUpdateView;

-

-    BoxUpgradeInteractor upgradeInteractor;

-

+    @BindView(R.id.layout_box_updating) View  boxUpdatingView;

+    @BindView(R.id.tv_updating_status) TextView updatingStatusTextView;

+    @BindView(R.id.btn_return_work) Button backBtn;

+    @BindView(R.id.loading_gear_view) LoadingView loadingView;

+    private BoxUpgradeInteractor upgradeInteractor;

+    private QueryBoxStatusInteractor boxStatusInteractor;

     private String bpversion_str;

+    private int updatingVersionCode;

+    private boolean isDestroyed;

-    public static void startBoxUpgradeActivity(Context context,String bpversion_str){

+    public static void startBoxUpgradeActivity(Context context,String bpversion_str,int updatingVersionCode){

         Intent intent = new Intent(context, BoxUpgradeActivity.class);

         intent.putExtra("bpversion_str",bpversion_str);

+        intent.putExtra("versionCode",updatingVersionCode);

         context.startActivity(intent);

     }

@@ -38,14 +51,22 @@ public class BoxUpgradeActivity extends BaseActivity implements BoxUpgradeIntera

         setContentView(R.layout.activity_box_upgrade);

         unbinder = ButterKnife.bind(this);

         bpversion_str = getIntent().getStringExtra("bpversion_str");

-        if(TextUtils.isEmpty(bpversion_str)){

+        updatingVersionCode = getIntent().getIntExtra("versionCode",0);

+        if(TextUtils.isEmpty(bpversion_str)||updatingVersionCode==0){

             finish();

         }

     }

+    @Override

+    protected void onDestroy() {

+        super.onDestroy();

+        isDestroyed = true;

+    }

+

     @OnClick(R.id.btn_update_now)

     public void updateNow(){

         chooseUpdateView.setVisibility(View.GONE);

+        boxUpdatingView.setVisibility(View.VISIBLE);

         upgradeInteractor = new BoxUpgradeInteractor(bpversion_str,this);

         upgradeInteractor.startJob();

     }

@@ -55,6 +76,18 @@ public class BoxUpgradeActivity extends BaseActivity implements BoxUpgradeIntera

         finish();

     }

+    @OnClick(R.id.btn_return_work)

+    public void back2work(){

+        if(boxStatusInteractor!=null){

+            boxStatusInteractor.cancelJob();

+            boxStatusInteractor = null;

+        }

+        if(upgradeInteractor!=null){

+            upgradeInteractor.cancelJob();

+            upgradeInteractor = null;

+        }

+        finish();

+    }

     @Override

     public boolean onKeyDown(int keyCode, KeyEvent event) {

         if(event.getKeyCode()==KeyEvent.KEYCODE_BACK){

@@ -65,10 +98,29 @@ public class BoxUpgradeActivity extends BaseActivity implements BoxUpgradeIntera

     @Override

     public void onBoxUpgrade(boolean result) {

+        if(isDestroyed){

+            return;

+        }

+        LogHelper.d("czy","box开始升级，开始轮询box状态");

         if(result){

-

+            boxStatusInteractor = new QueryBoxStatusInteractor(this);

+            boxStatusInteractor.startJob();

         }else{

+            boxUpdatingView.setVisibility(View.GONE);

+            chooseUpdateView.setVisibility(View.VISIBLE);

+            Toast.makeText(this,R.string.box_updating_fail,Toast.LENGTH_SHORT).show();

+        }

+    }

+    @Override

+    public void onBoxStatusFetched(String boxNo, String boxStatus, int boxStatusCode) {

+        if(isDestroyed){

+            return;

         }

+        Preferences.getInstance().setBoxVersionCode(updatingVersionCode);

+        updatingStatusTextView.setText(R.string.box_update_success);

+        loadingView.setVisibility(View.GONE);

+        backBtn.setVisibility(View.VISIBLE);

     }

+

 }

@@ -9,6 +9,7 @@ import org.json.JSONObject;

 import java.util.HashMap;

+import ai.pai.lensman.BuildConfig;

 import ai.pai.lensman.base.BaseInteractor;

 import ai.pai.lensman.utils.BoxUrlContainer;

 import ai.pai.lensman.utils.HttpPostTask;

@@ -29,12 +30,15 @@ public class BoxUpgradeInteractor implements BaseInteractor {

         cancelJob();

         HashMap<String, String> params = new HashMap<>();

         params.put("bpversion_str", bpversion_str);

-        LogHelper.d("czy", "开始box升级任务");

+        LogHelper.d("czy", "开始box设置升级任务");

         upgradeTask = new HttpPostTask(params) {

             @Override

             protected boolean parseResponse(String response) {

-                LogHelper.d("czy", "box升级任务 box应答=" + response);

+                LogHelper.d("czy", "box设置升级任务 box应答=" + response);

+                if(BuildConfig.isTestMode){

+                    return true;

+                }

                 try {

                     JSONObject json = new JSONObject(response);

                     int status = json.getInt("status");

@@ -42,7 +46,7 @@ public class BoxUpgradeInteractor implements BaseInteractor {

                         return true;

                     }

                 } catch (Exception e) {

-                    LogHelper.d("czy", "box升级任务 box应答异常 " + e);

+                    LogHelper.d("czy", "box设置升级任务 box应答异常 " + e);

                 }

                 return false;

             }

@@ -51,14 +55,14 @@ public class BoxUpgradeInteractor implements BaseInteractor {

             protected void onPostFail() {

                 super.onPostFail();

                 listener.onBoxUpgrade(false);

-                LogHelper.d("czy", "box升级任务失败");

+                LogHelper.d("czy", "box设置升级任务失败");

             }

             @Override

             protected void onPostSuccess() {

                 super.onPostSuccess();

                 listener.onBoxUpgrade(true);

-                LogHelper.d("czy", "box升级任务成功");

+                LogHelper.d("czy", "box设置升级任务成功");

             }

         };

         upgradeTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), BoxUrlContainer.SET_VERSION);

@@ -37,11 +37,11 @@ public class CheckBoxUpgradeInfoInteractor implements BaseInteractor {

         upgradeTask = new HttpPostTask(params) {

             String bpversion_str ="";

-            

+            int latestVersionCode=0;

             @Override

             protected boolean parseResponse(String response) {

                 LogHelper.d(TAG, "box升级任务 服务器应答=" + response);

-                int latestVersionCode=0;

+

                 try {

                     JSONObject json = new JSONObject(response);

                     int status = json.getInt("status");

@@ -66,14 +66,14 @@ public class CheckBoxUpgradeInfoInteractor implements BaseInteractor {

             @Override

             protected void onPostFail() {

                 super.onPostFail();

-                listener.onUpgradeInfoFetched(false, null);

+                listener.onUpgradeInfoFetched(false, bpversion_str,latestVersionCode);

                 LogHelper.d(TAG, "box升级任务 获取更新失败或者无需更新");

             }

             @Override

             protected void onPostSuccess() {

                 super.onPostSuccess();

-                listener.onUpgradeInfoFetched(true, bpversion_str);

+                listener.onUpgradeInfoFetched(true, bpversion_str,latestVersionCode);

                 LogHelper.d(TAG, "box升级任务 需要更新");

             }

         };

@@ -92,7 +92,7 @@ public class CheckBoxUpgradeInfoInteractor implements BaseInteractor {

     }

     public interface FetchUpgradeInfoListener {

-        void onUpgradeInfoFetched(boolean result, String bpversion_str);

+        void onUpgradeInfoFetched(boolean result, String bpversion_str,int versionCode);

     }

 }

@@ -2,6 +2,7 @@

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

     android:layout_width="match_parent"

     android:layout_height="match_parent"

+    xmlns:app="http://schemas.android.com/apk/res-auto"

     android:background="@color/half_transparent">

 <RelativeLayout

@@ -14,7 +15,7 @@

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:text="@string/box_upgrade_found"

-        android:layout_centerInParent="true"

+        android:layout_centerHorizontal="true"

         android:textSize="18sp"

         android:textColor="@color/white"

         android:id="@+id/tv_box_upgrade_info"/>

@@ -46,4 +47,46 @@

         android:layout_below="@+id/btn_update_now"

         />

 </RelativeLayout>

+

+    <RelativeLayout

+        android:id="@+id/layout_box_updating"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:layout_centerInParent="true"

+        android:visibility="gone">

+

+        <com.android.views.loadingdrawable.LoadingView

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

+            android:layout_width="180dp"

+            android:layout_height="180dp"

+            android:layout_centerHorizontal="true"

+            app:loading_renderer="GearLoadingRenderer"/>

+

+        <TextView

+            android:id="@+id/tv_updating_status"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:textSize="16sp"

+            android:text="@string/box_is_upgrading"

+            android:layout_below="@id/loading_gear_view"

+            android:layout_marginTop="10dp"

+            android:layout_centerHorizontal="true"

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

+

+        <Button

+            android:id="@+id/btn_return_work"

+            android:layout_width="match_parent"

+            android:layout_height="40dp"

+            android:layout_margin="12dp"

+            android:text="@string/back_to_work"

+            android:gravity="center"

+            android:textSize="18sp"

+            android:textColor="@color/white"

+            android:background="@drawable/print_rounded_rect_bg"

+            android:layout_below="@+id/tv_updating_status"

+            android:visibility="gone"

+            />

+

+    </RelativeLayout>

+

 </RelativeLayout>

@@ -186,4 +186,13 @@

     <string name="upgrade_now">立即更新</string>

     <string name="upgrade_later">下次再说</string>

+

+    <string name="box_is_upgrading">box软件更新中，约需要一分钟，请勿关闭电源...</string>

+

+    <string name="box_updating_fail">box软件更新失败，请检查box与手机是否处在同一网络</string>

+

+    <string name="box_update_success">box软件更新成功，欢迎使用</string>

+

+    <string name="back_to_work">返回</string>

+

 </resources>

Home Explore Help

Register Sign In

Sign In

Username or E-mail

Password

Remember Me

Sign In Forgot password?

Need an account? Sign up now.