class="add-code nl-17 ol-17">
+/**
+ * Created by chengzhenyu on 2017/4/22.
+ */
+
+public class BoxUpgradeActivity extends BaseActivity implements BoxUpgradeInteractor.BoxUpgradeListener{
+
+ @BindView(R.id.layout_choose_update) View chooseUpdateView;
+
+ BoxUpgradeInteractor upgradeInteractor;
+
+ private String bpversion_str;
+
+ public static void startBoxUpgradeActivity(Context context,String bpversion_str){
+ Intent intent = new Intent(context, BoxUpgradeActivity.class);
+ intent.putExtra("bpversion_str",bpversion_str);
+ context.startActivity(intent);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_box_upgrade);
+ unbinder = ButterKnife.bind(this);
+ bpversion_str = getIntent().getStringExtra("bpversion_str");
+ if(TextUtils.isEmpty(bpversion_str)){
+ finish();
+ }
+ }
+
+ @OnClick(R.id.btn_update_now)
+ public void updateNow(){
+ chooseUpdateView.setVisibility(View.GONE);
+ upgradeInteractor = new BoxUpgradeInteractor(bpversion_str,this);
+ upgradeInteractor.startJob();
+ }
+
+ @OnClick(R.id.btn_update_later)
+ public void UpdateLater(){
+ finish();
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if(event.getKeyCode()==KeyEvent.KEYCODE_BACK){
+ return true;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+
+ @Override
+ public void onBoxUpgrade(boolean result) {
+ if(result){
+
+ }else{
+
+ }
+ }
+}
@@ -0,0 +1,82 @@ |
||
| 1 |
+package ai.pai.lensman.upgrade; |
|
| 2 |
+ |
|
| 3 |
+import android.os.AsyncTask; |
|
| 4 |
+ |
|
| 5 |
+import com.android.common.executors.ThreadExecutor; |
|
| 6 |
+import com.android.common.utils.LogHelper; |
|
| 7 |
+ |
|
| 8 |
+import org.json.JSONObject; |
|
| 9 |
+ |
|
| 10 |
+import java.util.HashMap; |
|
| 11 |
+ |
|
| 12 |
+import ai.pai.lensman.base.BaseInteractor; |
|
| 13 |
+import ai.pai.lensman.utils.BoxUrlContainer; |
|
| 14 |
+import ai.pai.lensman.utils.HttpPostTask; |
|
| 15 |
+ |
|
| 16 |
+ |
|
| 17 |
+public class BoxUpgradeInteractor implements BaseInteractor {
|
|
| 18 |
+ private HttpPostTask upgradeTask; |
|
| 19 |
+ private String bpversion_str; |
|
| 20 |
+ private BoxUpgradeListener listener; |
|
| 21 |
+ |
|
| 22 |
+ public BoxUpgradeInteractor(String bpversion_str, BoxUpgradeListener listener) {
|
|
| 23 |
+ this.listener = listener; |
|
| 24 |
+ this.bpversion_str = bpversion_str; |
|
| 25 |
+ } |
|
| 26 |
+ |
|
| 27 |
+ @Override |
|
| 28 |
+ public void startJob() {
|
|
| 29 |
+ cancelJob(); |
|
| 30 |
+ HashMap<String, String> params = new HashMap<>(); |
|
| 31 |
+ params.put("bpversion_str", bpversion_str);
|
|
| 32 |
+ LogHelper.d("czy", "开始box升级任务");
|
|
| 33 |
+ upgradeTask = new HttpPostTask(params) {
|
|
| 34 |
+ |
|
| 35 |
+ @Override |
|
| 36 |
+ protected boolean parseResponse(String response) {
|
|
| 37 |
+ LogHelper.d("czy", "box升级任务 box应答=" + response);
|
|
| 38 |
+ try {
|
|
| 39 |
+ JSONObject json = new JSONObject(response); |
|
| 40 |
+ int status = json.getInt("status");
|
|
| 41 |
+ if (status == 200) {
|
|
| 42 |
+ return true; |
|
| 43 |
+ } |
|
| 44 |
+ } catch (Exception e) {
|
|
| 45 |
+ LogHelper.d("czy", "box升级任务 box应答异常 " + e);
|
|
| 46 |
+ } |
|
| 47 |
+ return false; |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ @Override |
|
| 51 |
+ protected void onPostFail() {
|
|
| 52 |
+ super.onPostFail(); |
|
| 53 |
+ listener.onBoxUpgrade(false); |
|
| 54 |
+ LogHelper.d("czy", "box升级任务失败");
|
|
| 55 |
+ } |
|
| 56 |
+ |
|
| 57 |
+ @Override |
|
| 58 |
+ protected void onPostSuccess() {
|
|
| 59 |
+ super.onPostSuccess(); |
|
| 60 |
+ listener.onBoxUpgrade(true); |
|
| 61 |
+ LogHelper.d("czy", "box升级任务成功");
|
|
| 62 |
+ } |
|
| 63 |
+ }; |
|
| 64 |
+ upgradeTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), BoxUrlContainer.SET_VERSION); |
|
| 65 |
+ } |
|
| 66 |
+ |
|
| 67 |
+ @Override |
|
| 68 |
+ public void cancelJob() {
|
|
| 69 |
+ if (upgradeTask == null) {
|
|
| 70 |
+ return; |
|
| 71 |
+ } |
|
| 72 |
+ if (upgradeTask.getStatus() == AsyncTask.Status.RUNNING) {
|
|
| 73 |
+ upgradeTask.cancel(true); |
|
| 74 |
+ } |
|
| 75 |
+ upgradeTask = null; |
|
| 76 |
+ } |
|
| 77 |
+ |
|
| 78 |
+ public interface BoxUpgradeListener {
|
|
| 79 |
+ void onBoxUpgrade(boolean result); |
|
| 80 |
+ } |
|
| 81 |
+ |
|
| 82 |
+} |
@@ -0,0 +1,98 @@ |
||
| 1 |
+package ai.pai.lensman.upgrade; |
|
| 2 |
+ |
|
| 3 |
+import android.os.AsyncTask; |
|
| 4 |
+import android.text.TextUtils; |
|
| 5 |
+ |
|
| 6 |
+import com.android.common.executors.ThreadExecutor; |
|
| 7 |
+import com.android.common.utils.LogHelper; |
|
| 8 |
+ |
|
| 9 |
+import org.json.JSONObject; |
|
| 10 |
+ |
|
| 11 |
+import java.util.HashMap; |
|
| 12 |
+ |
|
| 13 |
+import ai.pai.lensman.base.BaseInteractor; |
|
| 14 |
+import ai.pai.lensman.db.Preferences; |
|
| 15 |
+import ai.pai.lensman.utils.HttpPostTask; |
|
| 16 |
+import ai.pai.lensman.utils.UrlContainer; |
|
| 17 |
+ |
|
| 18 |
+ |
|
| 19 |
+public class CheckBoxUpgradeInfoInteractor implements BaseInteractor {
|
|
| 20 |
+ private HttpPostTask upgradeTask; |
|
| 21 |
+ private String lensmanId; |
|
| 22 |
+ private FetchUpgradeInfoListener listener; |
|
| 23 |
+ |
|
| 24 |
+ private static final String TAG = "CheckBoxUpgradeInfoInteractor"; |
|
| 25 |
+ |
|
| 26 |
+ public CheckBoxUpgradeInfoInteractor(String lensmanId, FetchUpgradeInfoListener listener) {
|
|
| 27 |
+ this.listener = listener; |
|
| 28 |
+ this.lensmanId = lensmanId; |
|
| 29 |
+ } |
|
| 30 |
+ |
|
| 31 |
+ @Override |
|
| 32 |
+ public void startJob() {
|
|
| 33 |
+ cancelJob(); |
|
| 34 |
+ HashMap<String, String> params = new HashMap<>(); |
|
| 35 |
+ params.put("user_id", lensmanId);
|
|
| 36 |
+ LogHelper.d(TAG, "开始box升级任务"); |
|
| 37 |
+ upgradeTask = new HttpPostTask(params) {
|
|
| 38 |
+ |
|
| 39 |
+ String bpversion_str =""; |
|
| 40 |
+ |
|
| 41 |
+ @Override |
|
| 42 |
+ protected boolean parseResponse(String response) {
|
|
| 43 |
+ LogHelper.d(TAG, "box升级任务 服务器应答=" + response); |
|
| 44 |
+ int latestVersionCode=0; |
|
| 45 |
+ try {
|
|
| 46 |
+ JSONObject json = new JSONObject(response); |
|
| 47 |
+ int status = json.getInt("status");
|
|
| 48 |
+ if (status == 200) {
|
|
| 49 |
+ JSONObject data = json.getJSONObject("data");
|
|
| 50 |
+ bpversion_str = data.getString("bpversion_str");
|
|
| 51 |
+ latestVersionCode = data.getJSONObject("bpversion").getInt("srv_version_code");
|
|
| 52 |
+ } |
|
| 53 |
+ } catch (Exception e) {
|
|
| 54 |
+ LogHelper.d(TAG, "box升级任务 服务器应答异常 " + e); |
|
| 55 |
+ } |
|
| 56 |
+ LogHelper.d(TAG,"box升级任务 服务器最新版本="+latestVersionCode+"\t客户端版本="+Preferences.getInstance().getBoxVersionCode()); |
|
| 57 |
+ if(latestVersionCode<= Preferences.getInstance().getBoxVersionCode()){
|
|
| 58 |
+ return false; |
|
| 59 |
+ } |
|
| 60 |
+ if(TextUtils.isEmpty(bpversion_str)){
|
|
| 61 |
+ return false; |
|
| 62 |
+ } |
|
| 63 |
+ return true; |
|
| 64 |
+ } |
|
| 65 |
+ |
|
| 66 |
+ @Override |
|
| 67 |
+ protected void onPostFail() {
|
|
| 68 |
+ super.onPostFail(); |
|
| 69 |
+ listener.onUpgradeInfoFetched(false, null); |
|
| 70 |
+ LogHelper.d(TAG, "box升级任务 获取更新失败或者无需更新"); |
|
| 71 |
+ } |
|
| 72 |
+ |
|
| 73 |
+ @Override |
|
| 74 |
+ protected void onPostSuccess() {
|
|
| 75 |
+ super.onPostSuccess(); |
|
| 76 |
+ listener.onUpgradeInfoFetched(true, bpversion_str); |
|
| 77 |
+ LogHelper.d(TAG, "box升级任务 需要更新"); |
|
| 78 |
+ } |
|
| 79 |
+ }; |
|
| 80 |
+ upgradeTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.BOX_VERSION_URL); |
|
| 81 |
+ } |
|
| 82 |
+ |
|
| 83 |
+ @Override |
|
| 84 |
+ public void cancelJob() {
|
|
| 85 |
+ if (upgradeTask == null) {
|
|
| 86 |
+ return; |
|
| 87 |
+ } |
|
| 88 |
+ if (upgradeTask.getStatus() == AsyncTask.Status.RUNNING) {
|
|
| 89 |
+ upgradeTask.cancel(true); |
|
| 90 |
+ } |
|
| 91 |
+ upgradeTask = null; |
|
| 92 |
+ } |
|
| 93 |
+ |
|
| 94 |
+ public interface FetchUpgradeInfoListener {
|
|
| 95 |
+ void onUpgradeInfoFetched(boolean result, String bpversion_str); |
|
| 96 |
+ } |
|
| 97 |
+ |
|
| 98 |
+} |
@@ -29,6 +29,8 @@ public class BoxUrlContainer {
|
||
| 29 | 29 |
|
| 30 | 30 |
public static String BOX_TIME_URL = BASE_URL+"box_time"; |
| 31 | 31 |
|
| 32 |
+ public static String SET_VERSION = BASE_URL+"set_version"; |
|
| 33 |
+ |
|
| 32 | 34 |
public static void resetIPHost(String ip) {
|
| 33 | 35 |
BOX_IP = ip; |
| 34 | 36 |
|
@@ -51,6 +53,8 @@ public class BoxUrlContainer {
|
||
| 51 | 53 |
SET_TIME_URL = BASE_URL+"set_time"; |
| 52 | 54 |
|
| 53 | 55 |
BOX_TIME_URL = BASE_URL+"box_time"; |
| 56 |
+ |
|
| 57 |
+ SET_VERSION = BASE_URL+"set_version"; |
|
| 54 | 58 |
} |
| 55 | 59 |
|
| 56 | 60 |
|
@@ -71,4 +71,9 @@ public class UrlContainer {
|
||
| 71 | 71 |
|
| 72 | 72 |
public static final String SERVER_TIME_URL=HOST_URL+"s/server_time"; |
| 73 | 73 |
|
| 74 |
+ /** |
|
| 75 |
+ * 盒子程序版本信息 |
|
| 76 |
+ */ |
|
| 77 |
+ public static final String BOX_VERSION_URL = HOST_URL+"op/bpversion"; |
|
| 78 |
+ |
|
| 74 | 79 |
} |
@@ -0,0 +1,12 @@ |
||
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
+<shape xmlns:android="http://schemas.android.com/apk/res/android" |
|
| 3 |
+ android:shape="rectangle" > |
|
| 4 |
+ |
|
| 5 |
+ <solid android:color="@color/half_transparent" /> |
|
| 6 |
+ |
|
| 7 |
+ <corners |
|
| 8 |
+ android:radius="4dp"/> |
|
| 9 |
+ |
|
| 10 |
+ <stroke android:width="1dp" android:color="@color/white"/> |
|
| 11 |
+ |
|
| 12 |
+</shape> |
@@ -0,0 +1,49 @@ |
||
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
|
| 3 |
+ android:layout_width="match_parent" |
|
| 4 |
+ android:layout_height="match_parent" |
|
| 5 |
+ android:background="@color/half_transparent"> |
|
| 6 |
+ |
|
| 7 |
+<RelativeLayout |
|
| 8 |
+ android:id="@+id/layout_choose_update" |
|
| 9 |
+ android:layout_width="match_parent" |
|
| 10 |
+ android:layout_height="wrap_content" |
|
| 11 |
+ android:layout_centerInParent="true"> |
|
| 12 |
+ |
|
| 13 |
+ <TextView |
|
| 14 |
+ android:layout_width="wrap_content" |
|
| 15 |
+ android:layout_height="wrap_content" |
|
| 16 |
+ android:text="@string/box_upgrade_found" |
|
| 17 |
+ android:layout_centerInParent="true" |
|
| 18 |
+ android:textSize="18sp" |
|
| 19 |
+ android:textColor="@color/white" |
|
| 20 |
+ android:id="@+id/tv_box_upgrade_info"/> |
|
| 21 |
+ |
|
| 22 |
+ <Button |
|
| 23 |
+ android:id="@+id/btn_update_now" |
|
| 24 |
+ android:layout_width="match_parent" |
|
| 25 |
+ android:layout_height="40dp" |
|
| 26 |
+ android:layout_margin="12dp" |
|
| 27 |
+ android:text="@string/upgrade_now" |
|
| 28 |
+ android:gravity="center" |
|
| 29 |
+ android:textSize="18sp" |
|
| 30 |
+ android:textColor="@color/white" |
|
| 31 |
+ android:background="@drawable/print_rounded_rect_bg" |
|
| 32 |
+ android:layout_below="@+id/tv_box_upgrade_info" |
|
| 33 |
+ /> |
|
| 34 |
+ |
|
| 35 |
+ <Button |
|
| 36 |
+ android:id="@+id/btn_update_later" |
|
| 37 |
+ android:layout_width="match_parent" |
|
| 38 |
+ android:layout_height="40dp" |
|
| 39 |
+ android:text="@string/upgrade_later" |
|
| 40 |
+ android:layout_marginLeft="12dp" |
|
| 41 |
+ android:layout_marginRight="12dp" |
|
| 42 |
+ android:gravity="center" |
|
| 43 |
+ android:textSize="18sp" |
|
| 44 |
+ android:textColor="@color/white" |
|
| 45 |
+ android:background="@drawable/update_btn_rounded_rect_bg" |
|
| 46 |
+ android:layout_below="@+id/btn_update_now" |
|
| 47 |
+ /> |
|
| 48 |
+</RelativeLayout> |
|
| 49 |
+</RelativeLayout> |
@@ -181,4 +181,9 @@ |
||
| 181 | 181 |
|
| 182 | 182 |
<string name="time_sync_retry">重新同步</string> |
| 183 | 183 |
|
| 184 |
+ <string name="box_upgrade_found">发现可用的box软件更新</string> |
|
| 185 |
+ |
|
| 186 |
+ <string name="upgrade_now">立即更新</string> |
|
| 187 |
+ |
|
| 188 |
+ <string name="upgrade_later">下次再说</string> |
|
| 184 | 189 |
</resources> |